From: tbaudier Date: Tue, 17 Jan 2017 10:13:25 +0000 (+0100) Subject: Remove experimental condition for .gif X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4815f905d913f3272ea1ac4ebd42656edb22966a;p=clitk.git Remove experimental condition for .gif --- diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index f43f41a..14b441e 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -309,12 +309,10 @@ endif() #========================================================= # Use CxImage to create animated gifs -if(CLITK_EXPERIMENTAL) - set(vvCxImage clitkCxImage) - set(vv_SRCS ${vv_SRCS} vvAnimatedGIFWriter.cxx) - include_directories(${CLITK_SOURCE_DIR}/utilities/CxImage) - add_subdirectory(${CLITK_SOURCE_DIR}/utilities/CxImage ${PROJECT_BINARY_DIR}/utilities/CxImage) -endif(CLITK_EXPERIMENTAL) +set(vvCxImage clitkCxImage) +set(vv_SRCS ${vv_SRCS} vvAnimatedGIFWriter.cxx) +include_directories(${CLITK_SOURCE_DIR}/utilities/CxImage) +add_subdirectory(${CLITK_SOURCE_DIR}/utilities/CxImage ${PROJECT_BINARY_DIR}/utilities/CxImage) #========================================================= #----------------------------------------------------------------------------- diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx index b8447c5..e70269c 100644 --- a/vv/vvMainWindow.cxx +++ b/vv/vvMainWindow.cxx @@ -82,9 +82,7 @@ It is distributed under dual licence #include #include #include -#ifdef CLITK_EXPERIMENTAL -# include -#endif +#include #ifdef VTK_USE_VIDEO_FOR_WINDOWS # include #endif @@ -3342,9 +3340,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget) #ifdef VTK_USE_MPEG2_ENCODER Extensions += ";;Video( *.mpg)"; #endif -#ifdef CLITK_EXPERIMENTAL Extensions += ";;Video( *.gif)"; -#endif int smIndex=GetSlicerIndexFromItem(DataTree->selectedItems()[0]); QString fileName = QFileDialog::getSaveFileName(this, @@ -3389,7 +3385,6 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget) // Video vtkGenericMovieWriter *vidwriter = NULL; -#if CLITK_EXPERIMENTAL == 1 if (ext==".gif") { vvAnimatedGIFWriter *gif = vvAnimatedGIFWriter::New(); vidwriter = gif; @@ -3414,7 +3409,6 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget) msgBox.addButton(tr("No"), QMessageBox::RejectRole); gif->SetDither(msgBox.exec() == QMessageBox::AcceptRole); } -#endif #ifdef VTK_USE_VIDEO_FOR_WINDOWS if (ext==".avi") { vtkAVIWriter *mpg = vtkAVIWriter::New();