← Back to branch summary

~ubuntu-branches/ubuntu/natty/tiff/natty

« back to all changes in this revision

Viewing changes to debian/patches/fix-64bit-flip.patch

  • Committer: Bazaar Package Importer
  • Author(s): Jay Berkenbilt
  • Date: 2010-06-18 21:28:11 UTC
  • mfrom: (10.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100618212811-3t5mffcr8gpfpuel
Tags: 3.9.4-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-64bit-flip.patch
1
 
Description: fixes a crash when flipping an image with invalid skew.
2
 
Bug: http://bugzilla.maptools.org/show_bug.cgi?id=2207
3
 
Origin: http://bugzilla.maptools.org/attachment.cgi?id=386
4
 
 
5
 
Index: tiff-3.9.2/libtiff/tif_getimage.c
6
 
===================================================================
7
 
--- tiff-3.9.2.orig/libtiff/tif_getimage.c      2010-06-14 12:30:53.384165703 -0700
8
 
+++ tiff-3.9.2/libtiff/tif_getimage.c   2010-06-14 12:31:04.934165987 -0700
9
 
@@ -1846,6 +1846,7 @@
10
 
 DECLAREContigPutFunc(putcontig8bitYCbCr22tile)
11
 
 {
12
 
        uint32* cp2;
13
 
+       int32 incr = 2*toskew+w;
14
 
        (void) y;
15
 
        fromskew = (fromskew / 2) * 6;
16
 
        cp2 = cp+w+toskew;
17
 
@@ -1872,8 +1873,8 @@
18
 
                        cp2 ++ ;
19
 
                        pp += 6;
20
 
                }
21
 
-               cp += toskew*2+w;
22
 
-               cp2 += toskew*2+w;
23
 
+               cp += incr;
24
 
+               cp2 += incr;
25
 
                pp += fromskew;
26
 
                h-=2;
27
 
        }
28
 
@@ -1939,6 +1940,7 @@
29
 
 DECLAREContigPutFunc(putcontig8bitYCbCr12tile)
30
 
 {
31
 
        uint32* cp2;
32
 
+       int32 incr = 2*toskew+w;
33
 
        (void) y;
34
 
        fromskew = (fromskew / 2) * 4;
35
 
        cp2 = cp+w+toskew;
36
 
@@ -1953,8 +1955,8 @@
37
 
                        cp2 ++;
38
 
                        pp += 4;
39
 
                } while (--x);
40
 
-               cp += toskew*2+w;
41
 
-               cp2 += toskew*2+w;
42
 
+               cp += incr;
43
 
+               cp2 += incr;
44
 
                pp += fromskew;
45
 
                h-=2;
46
 
        }