[Python-modules-commits] r11850 - in packages/gamera/trunk/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Monday, February 22, 2010 @ 14:00:27
  Author: jwilk
Revision: 11850

Replace patch fixing TIFF export with the one applied upstream.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/tiff-support-64bit.diff

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2010-02-22 13:43:11 UTC (rev 11849)
+++ packages/gamera/trunk/debian/changelog	2010-02-22 14:00:27 UTC (rev 11850)
@@ -3,8 +3,9 @@
   * Link _png_support.so with libpng on all Unix architectures (closes:
     #570809). (png-support-libpng.diff)
   * Really remove upstream-applied patches from the source package.
+  * Replace patch fixing TIFF export with the one applied upstream.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 22 Feb 2010 14:41:56 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 22 Feb 2010 14:58:31 +0100
 
 gamera (3.2.4-1) unstable; urgency=low
 

Modified: packages/gamera/trunk/debian/patches/tiff-support-64bit.diff
===================================================================
--- packages/gamera/trunk/debian/patches/tiff-support-64bit.diff	2010-02-22 13:43:11 UTC (rev 11849)
+++ packages/gamera/trunk/debian/patches/tiff-support-64bit.diff	2010-02-22 14:00:27 UTC (rev 11850)
@@ -1,18 +1,21 @@
 Description: Fix TIFF export on 64-bit machines.
-Author: Jakub Wilk <jwilk at debian.org>
+Origin: upstream, http://gamera.svn.sourceforge.net/viewvc/gamera?view=rev&revision=1199
 Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/1939
 Bug-Debian: http://bugs.debian.org/570559
 
 Index: gamera-3.2.4/include/plugins/tiff_support.hpp
 ===================================================================
 --- gamera-3.2.4.orig/include/plugins/tiff_support.hpp	2010-02-20 16:38:27.000000000 +0100
-+++ gamera-3.2.4/include/plugins/tiff_support.hpp	2010-02-20 19:11:55.000000000 +0100
-@@ -218,12 +218,12 @@
++++ gamera-3.2.4/include/plugins/tiff_support.hpp	2010-02-22 14:35:52.000000000 +0100
+@@ -218,12 +218,15 @@
      template<class T>
      void operator()(const T& matrix, TIFF* tif) {
        TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
 -      tdata_t buf = _TIFFmalloc(TIFFScanlineSize(tif));
-+      tdata_t buf = _TIFFmalloc(((TIFFScanlineSize(tif) - 1) | 3) + 1);
++      tsize_t scanline_size = TIFFScanlineSize(tif);
++      if (scanline_size % 4) // round up to multiple of 4
++        scanline_size += 4 - (scanline_size % 4);
++      tdata_t buf = _TIFFmalloc(scanline_size);
        if (!buf)
          throw std::runtime_error("Error allocating scanline");
        TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE);