[med-svn] r20625 - trunk/packages/insighttoolkit/trunk/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2015-12-03 23:31:54 +0000 (Thu, 03 Dec 2015)
New Revision: 20625

Modified:
   trunk/packages/insighttoolkit/trunk/debian/patches/itk-4.8.2-find-doubleconversion.patch
Log:
Update double-conversion patch 

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/itk-4.8.2-find-doubleconversion.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk-4.8.2-find-doubleconversion.patch	2015-12-03 22:13:27 UTC (rev 20624)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk-4.8.2-find-doubleconversion.patch	2015-12-03 23:31:54 UTC (rev 20625)
@@ -1,13 +1,82 @@
-Description: Inject a simple approch to find libdouble-conversion
+Description: Clean up use of double-conversion library 
  The original code searches for libdouble-conversion by using 
  find_package, but no according cmake module exists. Required 
  for #733629
+ In addition this patch removes the double-conversion header 
+ files from the public interface and ensures that the ITK version 
+ is not build. 
 Author: Gert Wollny <gw.fossdev at gmail.com>
 Forwarded: No 
 
-diff -ru InsightToolkit-4.8.2.orig/Modules/ThirdParty/DoubleConversion/CMakeLists.txt InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/CMakeLists.txt
---- InsightToolkit-4.8.2.orig/Modules/ThirdParty/DoubleConversion/CMakeLists.txt	2015-11-12 17:21:07.000000000 +0100
-+++ InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/CMakeLists.txt	2015-12-03 22:00:01.771653734 +0100
+diff -ru InsightToolkit-4.8.2.old/Modules/Core/Common/include/itkNumberToString.h InsightToolkit-4.8.2/Modules/Core/Common/include/itkNumberToString.h
+--- InsightToolkit-4.8.2.old/Modules/Core/Common/include/itkNumberToString.h	2015-12-03 23:30:51.699038707 +0100
++++ InsightToolkit-4.8.2/Modules/Core/Common/include/itkNumberToString.h	2015-12-03 23:58:47.699157097 +0100
+@@ -18,7 +18,6 @@
+ #ifndef itkNumberToString_h
+ #define itkNumberToString_h
+ 
+-#include "double-conversion.h"
+ #include "itkMacro.h"
+ #include <string>
+ 
+@@ -43,15 +42,10 @@
+ class NumberToString
+ {
+ public:
+-  NumberToString() :
+-    m_DoubleToStringConverter(double_conversion::DoubleToStringConverter::EcmaScriptConverter())
+-    {
+-    }
+   std::string operator() (TValue val);
+ 
+ private:
+   NumberToString & operator=(const NumberToString &); // not defined
+-  const double_conversion::DoubleToStringConverter &m_DoubleToStringConverter;
+ };
+ 
+ // declaration of specialization
+diff -ru InsightToolkit-4.8.2.old/Modules/Core/Common/src/itkNumberToString.cxx InsightToolkit-4.8.2/Modules/Core/Common/src/itkNumberToString.cxx
+--- InsightToolkit-4.8.2.old/Modules/Core/Common/src/itkNumberToString.cxx	2015-12-03 23:30:51.705038707 +0100
++++ InsightToolkit-4.8.2/Modules/Core/Common/src/itkNumberToString.cxx	2015-12-03 23:36:52.962064226 +0100
+@@ -17,6 +17,7 @@
+  *=========================================================================*/
+ #include "itkNumberToString.h"
+ #include "itkNumericTraits.h"
++#include "double-conversion.h"
+ 
+ #include <sstream>
+ 
+@@ -27,9 +28,11 @@
+ std::string NumberToString<double>::operator() (double val)
+ {
+   char buf[256];
++  const double_conversion::DoubleToStringConverter& converter = 
++          double_conversion::DoubleToStringConverter::EcmaScriptConverter(); 
+   double_conversion::StringBuilder builder(buf,sizeof(buf));
+   builder.Reset();
+-  if(!m_DoubleToStringConverter.ToShortest(val,&builder))
++  if(!converter.ToShortest(val,&builder))
+     {
+     itkGenericExceptionMacro(<< "Conversion failed for " << val);
+     }
+@@ -40,9 +43,12 @@
+ std::string NumberToString<float>::operator() (float val)
+ {
+   char buf[256];
++  const double_conversion::DoubleToStringConverter& converter = 
++          double_conversion::DoubleToStringConverter::EcmaScriptConverter(); 
++  
+   double_conversion::StringBuilder builder(buf,sizeof(buf));
+   builder.Reset();
+-  if(!m_DoubleToStringConverter.ToShortestSingle(val,&builder))
++  if(!converter.ToShortestSingle(val,&builder))
+     {
+     itkGenericExceptionMacro(<< "Conversion failed for " << val);
+     }
+Only in InsightToolkit-4.8.2/Modules/Core/Common/src: itkNumberToString.cxx~
+diff -ru InsightToolkit-4.8.2.old/Modules/ThirdParty/DoubleConversion/CMakeLists.txt InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/CMakeLists.txt
+--- InsightToolkit-4.8.2.old/Modules/ThirdParty/DoubleConversion/CMakeLists.txt	2015-12-03 23:30:51.870038719 +0100
++++ InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/CMakeLists.txt	2015-12-03 23:37:22.369066303 +0100
 @@ -7,11 +7,19 @@
  mark_as_advanced(ITK_USE_SYSTEM_DOUBLECONVERSION)
  
@@ -33,3 +102,12 @@
  else()
    set(ITKDoubleConversion_INCLUDE_DIRS
      ${ITKDoubleConversion_SOURCE_DIR}/src/double-conversion
+diff -ru InsightToolkit-4.8.2.old/Modules/ThirdParty/DoubleConversion/src/CMakeLists.txt InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/src/CMakeLists.txt
+--- InsightToolkit-4.8.2.old/Modules/ThirdParty/DoubleConversion/src/CMakeLists.txt	2015-12-03 23:30:51.870038719 +0100
++++ InsightToolkit-4.8.2/Modules/ThirdParty/DoubleConversion/src/CMakeLists.txt	2015-12-04 00:11:24.311210542 +0100
+@@ -1 +1,4 @@
+-add_subdirectory(double-conversion)
++if(NOT ITK_USE_SYSTEM_DOUBLECONVERSION)
++  add_subdirectory(double-conversion)
++endif()
++