]> Creatis software - creaMaracasVisu.git/commitdiff
compila
authorJuan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Wed, 5 Nov 2008 15:26:56 +0000 (15:26 +0000)
committerJuan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Wed, 5 Nov 2008 15:26:56 +0000 (15:26 +0000)
lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.cxx
lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
lib/maracasVisuLib/src/kernel/marTypes.h

index cc4be761bc899092088f25fcdef271aa630b285f..df306e46add3773cbca0b55be6854a1605055cc5 100644 (file)
@@ -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
+}
index ac750b93cf5e4566bd0cb0358be96761f28cd8b2..a8cb92a041b6b2b300ba661a057d191a9fda8f05 100644 (file)
@@ -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);
index 998e7c9cb45cdb09b01c9d468ca07b3dcef0f924..d119451a5bffeb7d7f23db9dd1dd30c8b590b2c2 100644 (file)
@@ -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