Accepting request 126493 from home:msmeissn:branches:graphics

- RGBA is packed in host order, use the right macros to unpack
  and verify in raw_decode test.

OBS-URL: https://build.opensuse.org/request/show/126493
OBS-URL: https://build.opensuse.org/package/show/graphics/tiff?expand=0&rev=47
This commit is contained in:
Ismail Dönmez 2012-06-28 23:06:28 +00:00 committed by Git OBS Bridge
parent 94edbeabbc
commit 71da80349e
3 changed files with 23 additions and 0 deletions

15
tiff-bigendian.patch Normal file
View File

@ -0,0 +1,15 @@
--- tiff-4.0.2/test/raw_decode.c.xx 2012-06-28 11:48:43.000000000 +0200
+++ tiff-4.0.2/test/raw_decode.c 2012-06-28 12:15:46.000000000 +0200
@@ -85,9 +85,9 @@
static int check_rgba_pixel( int pixel, int red, int green, int blue, int alpha, unsigned char *buffer ) {
/* RGBA images are upside down - adjust for normal ordering */
int adjusted_pixel = pixel % 128 + (127 - (pixel/128)) * 128;
- unsigned char *rgba = buffer + 4 * adjusted_pixel;
-
- if( rgba[0] == red && rgba[1] == green && rgba[2] == blue && rgba[3] == alpha ) {
+ unsigned int *rgba = (unsigned int*)(buffer + 4 * adjusted_pixel);
+
+ if( TIFFGetR(*rgba) == red && TIFFGetG(*rgba) == green && TIFFGetB(*rgba) == blue && TIFFGetA(*rgba) == alpha ) {
return 0;
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 28 10:16:29 UTC 2012 - meissner@suse.com
- RGBA is packed in host order, use the right macros to unpack
and verify in raw_decode test.
-------------------------------------------------------------------
Wed Jun 20 09:29:37 UTC 2012 - pgajdos@suse.com

View File

@ -49,6 +49,7 @@ Source3: baselibs.conf
Patch2: tiff-%{version}-seek.patch
Patch3: tiff-%{version}-tiff2pdf-colors.patch
Patch9: tiff-%{version}-dont-fancy-upsampling.patch
Patch10: tiff-bigendian.patch
# FYI: this issue is solved another way
# http://bugzilla.maptools.org/show_bug.cgi?id=1985#c1
# Patch9: tiff-%{version}-lzw-CVE-2009-2285.patch
@ -95,6 +96,7 @@ the libtiff library.
%patch2 -p1
%patch3 -p1
%patch9 -p1
%patch10 -p1
%build
%configure --disable-static --with-pic