From: jfa <jfa@opencascade.com>
Date: Thu, 9 Aug 2012 11:22:19 +0000 (+0000)
Subject: Mantis issue 0021668: [CEA 564] MED2.1 to MED2.3
X-Git-Tag: before_mergefrom_V6_main_04Oct12~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a113fd1c09da925771652753ab2366bf86bc4030;p=modules%2Fvisu.git

Mantis issue 0021668: [CEA 564] MED2.1 to MED2.3
---

diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am
index c2a28f46..105565a7 100644
--- a/src/CONVERTOR/Makefile.am
+++ b/src/CONVERTOR/Makefile.am
@@ -15,12 +15,11 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 #  VISU OBJECT : interactive object for VISU entities implementation
 #  File   : Makefile.am
 #  Module : VISU
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES = libVisuConvertor.la
@@ -98,7 +97,7 @@ libVisuConvertor_la_LDFLAGS= \
 	$(KERNEL_LDFLAGS) -lSALOMEBasics \
 	$(CAS_KERNEL) \
 	$(CAS_MATH) \
-	$(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase \
+	$(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapperBase \
 	$(GUI_LDFLAGS) -lVTKViewer
 
 # Executables targets
@@ -106,4 +105,4 @@ bin_PROGRAMS= VISUConvertor
 dist_VISUConvertor_SOURCES= VISUConvertor.cxx
 VISUConvertor_CPPFLAGS=$(libVisuConvertor_la_CPPFLAGS)
 VISUConvertor_LDADD=$(libVisuConvertor_la_LDFLAGS) \
-	-lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lMEDWrapper -lVTKViewer -lsuit -lqtx libVisuConvertor.la
+	-lMEDWrapper_V2_2 -lMEDWrapperBase -lMEDWrapper -lVTKViewer -lsuit -lqtx libVisuConvertor.la
diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 9f82a50e..a8ee294e 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -1193,8 +1193,8 @@ namespace VISU
   MED::TInt
   GetPNOMLength(MED::EVersion theVersion)
   {
-    if(theVersion == MED::eV2_1)
-      return MED::GetPNOMLength<MED::eV2_1>();
+    //if(theVersion == MED::eV2_1)
+    //  return MED::GetPNOMLength<MED::eV2_1>();
     return MED::GetPNOMLength<MED::eV2_2>();
   }
 
diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am
index 55c0c695..ce858924 100644
--- a/src/PIPELINE/Makefile.am
+++ b/src/PIPELINE/Makefile.am
@@ -15,12 +15,11 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 #  VISU OBJECT : interactive object for VISU entities implementation
 #  File   : Makefile.in
 #  Module : VISU
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES= libVisuPipeLine.la
@@ -145,4 +144,4 @@ dist_VISU_img2vti_SOURCES= VISU_img2vti.cxx
 
 AM_CPPFLAGS+=$(libVisuPipeLine_la_CPPFLAGS)
 LDADD=$(libVisuPipeLine_la_LDFLAGS) libVisuPipeLine.la \
-	-lOpUtil -lMEDWrapper -lMEDWrapper_V2_2  -lMEDWrapper_V2_1 -lMEDWrapperBase -lsuit -lqtx -lSALOMEBasics -lvtkWidgets
+	-lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapperBase -lsuit -lqtx -lSALOMEBasics -lvtkWidgets
diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am
index eba2518d..851b7e56 100644
--- a/src/VISU_I/Makefile.am
+++ b/src/VISU_I/Makefile.am
@@ -15,12 +15,11 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 #  File   : Makefile.am
 #  Author : Alexey Petrov
 #  Module : VISU
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
@@ -215,6 +214,5 @@ VISU_I_LDADD=\
 	-lMEDWrapper \
 	-lMEDWrapperBase \
 	-lMEDWrapper_V2_2 \
-	-lMEDWrapper_V2_1 \
 	-lmedmem \
 	@CORBA_LIBS@