From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Wed, 5 Nov 2008 15:26:56 +0000 (+0000)
Subject: compila
X-Git-Tag: EED.02Oct2009~175
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=440530af88d75f48ca2a77cfd3904c5d376e69a3;p=creaMaracasVisu.git

compila
---

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.cxx
index cc4be76..df306e4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.cxx
@@ -1,4 +1,5 @@
 #include "vectorFunctions.h"
+#include <stdio.h>
 
 //Constructor
 vectorFunctions::vectorFunctions()
@@ -173,4 +174,4 @@ int vectorFunctions::findPointInLst(std::vector<double>*vecX, std::vector<double
 		return flag;
 	}
 	return -1;
-}
\ No newline at end of file
+}
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
index ac750b9..a8cb92a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
@@ -82,7 +82,7 @@ public:
 	void CopyAttributesTo( manualContourModel *cloneObject );
 	virtual void Open(FILE *ff);	// virtual
 	virtual void Save(FILE *ff);	// virtual
-	virtual GetTypeModel();			// virtual 
+	virtual int GetTypeModel();			// virtual 
 
 	int				AddPoint(double x,double y,double z);
 	int				InsertPoint(double x,double y,double z);
diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h
index 998e7c9..d119451 100644
--- a/lib/maracasVisuLib/src/kernel/marTypes.h
+++ b/lib/maracasVisuLib/src/kernel/marTypes.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: marTypes.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:56 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/05 15:27:03 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -39,6 +39,8 @@
 # else
 #   define MARACASVISULIB_EXPORTS //__declspec( dllimport )
 # endif //maracasvisulib_EXPORTS
+#else
+#   define MARACASVISULIB_EXPORTS 
 #endif
 //JHCL - End