Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

diff --git a/tools/clitkDicom2Image.cxx b/tools/clitkDicom2Image.cxx
index 0ad79ef645d9ed6843be00ce10f15c6e15477c27..6410714293c69e769b12eceae618f9c26a5abf94 100644 (file)
--- a/tools/clitkDicom2Image.cxx
+++ b/tools/clitkDicom2Image.cxx
@@ -158,7 +158,7 @@ int main(int argc, char * argv[])
     theorigin[0] = -spacing[0]*size[0]/2.0;
     theorigin[1] = -spacing[1]*size[1]/2.0;
     modifier->SetInput(vtk_image);
-    modifier->SetOutputOrigin(theorigin[0], theorigin[1], theorigin[2]);
+    modifier->SetOutputOrigin(theorigin[0], theorigin[1], sliceLocations[sliceIndex[0]]);
     modifier->Update();
     vvImage::Pointer focal_image = vvImage::New();
     focal_image->AddVtkImage(modifier->GetOutput());

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index e9d4e8d8435ff075614b1de0cc49e5cc0f791214..bbbb2d8f4d89979c1f42bdd1a91eb306cfdc0174 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -2804,7 +2804,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget)
 
     // Video
     vtkGenericMovieWriter *vidwriter = NULL;
-#ifdef CLITK_EXPERIMENTAL
+#if CLITK_EXPERIMENTAL == 1
     if (!strcmp(ext, ".gif")) {
       vvAnimatedGIFWriter *gif = vvAnimatedGIFWriter::New();
       vidwriter = gif;