[med-svn] r15660 - trunk/packages/insighttoolkit/branches/3.20.1/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2013-12-29 18:30:35 +0000 (Sun, 29 Dec 2013)
New Revision: 15660

Modified:
   trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/tiff5.patch
Log:
minimal patch

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/tiff5.patch
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/tiff5.patch	2013-12-29 17:57:32 UTC (rev 15659)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/tiff5.patch	2013-12-29 18:30:35 UTC (rev 15660)
@@ -4,49 +4,9 @@
 
 Index: insighttoolkit-3.20.1+git20120521/Code/IO/itkTIFFImageIO.cxx
 ===================================================================
---- insighttoolkit-3.20.1+git20120521.orig/Code/IO/itkTIFFImageIO.cxx	2013-12-29 12:39:21.046971349 +0100
-+++ insighttoolkit-3.20.1+git20120521/Code/IO/itkTIFFImageIO.cxx	2013-12-29 12:39:26.394971467 +0100
-@@ -291,8 +291,8 @@
-                                                unsigned int width,
-                                                unsigned int height )
- {
--  unsigned int isize = TIFFScanlineSize(m_InternalImage->m_Image);
--  unsigned int cc;
-+  uint64 isize = TIFFScanlineSize64(m_InternalImage->m_Image);
-+  uint64 cc;
-   int row;
-   tdata_t buf = _TIFFmalloc(isize);
- 
-@@ -445,8 +445,8 @@
-                                     unsigned int width,
-                                     unsigned int height )
- {
--  unsigned int isize = TIFFScanlineSize(m_InternalImage->m_Image);
--  unsigned int cc;
-+  uint64 isize = TIFFScanlineSize64(m_InternalImage->m_Image);
-+  uint64 cc;
-   int row, inc;
-   tdata_t buf = _TIFFmalloc(isize);
- 
-@@ -1697,7 +1697,16 @@
- 
-   int predictor;
- 
--  TIFF *tif = TIFFOpen(m_FileName.c_str(), "w");
-+  const char *mode = "w";
-+  // if the size of the image if greater then 2GB then use big tiff
-+  if ( this->GetImageSizeInBytes() > SizeType( 1073741824u ) * 3 )
-+    {
-+    // adding the 8 enable big tiff
-+    mode = "w8";
-+    }
-+
-+
-+  TIFF *tif = TIFFOpen(m_FileName.c_str(), mode );
-   if ( !tif )
-     {
-     itkExceptionMacro("Error while trying to open file for writing: "
-@@ -1856,6 +1865,21 @@
+--- insighttoolkit-3.20.1+git20120521.orig/Code/IO/itkTIFFImageIO.cxx	2013-12-29 12:39:32.362971598 +0100
++++ insighttoolkit-3.20.1+git20120521/Code/IO/itkTIFFImageIO.cxx	2013-12-29 19:22:14.375503955 +0100
+@@ -1856,6 +1856,21 @@
    TIFFClose(tif);
  }
  
@@ -68,7 +28,7 @@
  bool TIFFImageIO::CanFindTIFFTag( unsigned int t )
  {
    // m_InternalImage needs to be valid
-@@ -1866,7 +1890,7 @@
+@@ -1866,7 +1881,7 @@
      }
  
    ttag_t tag = t; // 32bits integer
@@ -77,7 +37,7 @@
    if( fld == NULL )
      {
      return false;
-@@ -1884,7 +1908,7 @@
+@@ -1884,7 +1899,7 @@
      }
    ttag_t tag = t;
    void *raw_data = NULL;
@@ -86,7 +46,7 @@
    if( fld == NULL )
      {
      itkExceptionMacro( << "fld is NULL" );
-@@ -1892,21 +1916,10 @@
+@@ -1892,21 +1907,10 @@
      }
    else
      {