From: David Sarrut <david.sarrut@gmail.com>
Date: Fri, 30 Mar 2012 13:19:25 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.3.0~52^2~7
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f6ec1c5f4f1c2105b428fe2d87e794417897a4e8;hp=9b0c1e68a5406bab48d7e4a6d5a22baa3a31d027;p=clitk.git

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

diff --git a/tools/clitkDicom2Image.cxx b/tools/clitkDicom2Image.cxx
index 0ad79ef..6410714 100644
--- 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 e9d4e8d..bbbb2d8 100644
--- 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;