Merge branch 'master' of /home/dsarrut/clitk3.server

diff --git a/common/vvImageReader.txx b/common/vvImageReader.txx
index fa111e200c06fbbc4e6ad07f682b8ecedccbc37c..aac9979fc330d265d9f14e7d7b346860cd6ffa5f 100644 (file)
--- a/common/vvImageReader.txx
+++ b/common/vvImageReader.txx
@@ -67,7 +67,7 @@ void vvImageReader::UpdateWithDim(std::string InputPixelType)
 template<class InputPixelType, unsigned int VImageDimension>
 void vvImageReader::UpdateWithDimAndInputPixelType()
 {
-  itk::AnalyzeImageIO *analyzeImageIO;
+  itk::AnalyzeImageIO *analyzeImageIO = NULL;
 
   if (mType == MERGEDWITHTIME)   // In this case we can load the images
     // one at the time to avoid excessive

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index 777f53ad0b75023fce170284a1d2d496fa1bac03..ca6152b39b91137024b6170d8cc69745c4bd1cb3 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -235,6 +235,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "2")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv")
+SET(CPACK_STRIP_FILES TRUE)
 
 IF(WIN32)
   # There is a bug in NSI that does not handle full unix paths properly. Make