*** empty log message ***

diff --git a/.project b/.project
new file mode 100644 (file)
index 0000000..f7abc1d
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>creaContours</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+       </buildSpec>
+       <natures>
+       </natures>
+</projectDescription>

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index e80ea04efae462a647b4697549e094097db81ebc..5ba7580971cc9cbb9ed1e092f52cfae4470f415f 100644 (file)
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -231,8 +231,7 @@ std::string GetExecutablePath()
     if (err) 
        {
                printf("Could not determine current executable path ?  ");  
-       }
-    
+       }    
     // remove the exe name
     char *slash;               
     slash = strrchr(name, CREACONTOUR_VALID_FILE_SEPARATOR_CHAR);
@@ -276,7 +275,10 @@ bool wxTheApplication :: OnInit()
        creaImageIO::WxGimmickReaderDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),min_image_type,max_image_type,output_dim,threads);
        w.ShowModal();
 
-       std::string datadir(  crea::wx2std(GetExecutablePath()) );
+//JCP
+       //std::string datadir(  crea::wx2std(GetExecutablePath()) );    
+       std::string datadir(  GetExecutablePath() );
+//JCP
        
                #ifdef MACOSX /* assume this is OSX */
                        datadir=datadir+"/../../..";

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index dde333b68011e0c931ca2f1a2a810574761fb5d2..80c5189a0f36bbb11ba78b9f1d655336f69f6e61 100644 (file)
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -12,7 +12,7 @@ void nDimensions::Process()
 
        std::vector< void * > vectortemp;
        std::vector<int> size;
-       vtkImageData *mask, *value;
+       vtkImageData **mask, **value;
 
        vtkImageData* img = bbGetInputIn();
 
@@ -37,8 +37,8 @@ void nDimensions::Process()
        bbSetOutputY(vecty);
        bbSetOutputZ(vectz);
        bbSetOutputSizeContour(size);
-       bbSetOutputMask(mask);
-       bbSetOutputValue(value);
+       bbSetOutputMask(*mask);
+       bbSetOutputValue(*value);
 }
 void nDimensions::CreateWidget(wxWindow* parent)
 {