summaryrefslogtreecommitdiff
path: root/graphics/tif22pnm
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2010-03-29 06:27:57 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2010-03-29 06:27:57 +0000
commit02246fee5153077bc98bbc6929d4f9538488c94c (patch)
tree5b68a40daf090eebf3f503faf338e7c13e02335a /graphics/tif22pnm
parent- fix build for png-1.4.1 (diff)
- fix build for png-1.4.1
Notes
Notes: svn path=/head/; revision=251682
Diffstat (limited to 'graphics/tif22pnm')
-rw-r--r--graphics/tif22pnm/files/patch-png22pnm.c51
1 files changed, 51 insertions, 0 deletions
diff --git a/graphics/tif22pnm/files/patch-png22pnm.c b/graphics/tif22pnm/files/patch-png22pnm.c
new file mode 100644
index 000000000000..dc9378f22e29
--- /dev/null
+++ b/graphics/tif22pnm/files/patch-png22pnm.c
@@ -0,0 +1,51 @@
+--- png22pnm.c.orig 2003-03-18 17:14:51.000000000 +0100
++++ png22pnm.c 2010-03-29 08:27:57.000000000 +0200
+@@ -783,7 +783,7 @@
+ (info_ptr->valid & PNG_INFO_tRNS)) {
+ trans_mix = TRUE;
+ for (i = 0 ; i < info_ptr->num_trans ; i++)
+- if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) {
++ if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) {
+ trans_mix = FALSE;
+ break;
+ }
+@@ -932,7 +932,7 @@
+ pnm_type = PBM_TYPE;
+ if (info_ptr->valid & PNG_INFO_tRNS) {
+ for (i = 0 ; i < info_ptr->num_trans ; i++) {
+- if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != maxval) {
++ if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != maxval) {
+ pnm_type = PGM_TYPE;
+ break;
+ }
+@@ -1009,7 +1009,7 @@
+ case PNG_COLOR_TYPE_GRAY:
+ store_pixel (pnm_pixel, c, c, c,
+ ((info_ptr->valid & PNG_INFO_tRNS) &&
+- (c == gamma_correct (info_ptr->trans_values.gray, totalgamma))) ?
++ (c == gamma_correct (info_ptr->trans_color.gray, totalgamma))) ?
+ 0 : maxval);
+ break;
+
+@@ -1023,7 +1023,7 @@
+ info_ptr->palette[c].green, info_ptr->palette[c].blue,
+ (info_ptr->valid & PNG_INFO_tRNS) &&
+ c<info_ptr->num_trans ?
+- info_ptr->trans[c] : maxval);
++ info_ptr->trans_alpha[c] : maxval);
+ break;
+
+ case PNG_COLOR_TYPE_RGB:
+@@ -1031,9 +1031,9 @@
+ c3 = get_png_val (png_pixel);
+ store_pixel (pnm_pixel, c, c2, c3,
+ ((info_ptr->valid & PNG_INFO_tRNS) &&
+- (c == gamma_correct (info_ptr->trans_values.red, totalgamma)) &&
+- (c2 == gamma_correct (info_ptr->trans_values.green, totalgamma)) &&
+- (c3 == gamma_correct (info_ptr->trans_values.blue, totalgamma))) ?
++ (c == gamma_correct (info_ptr->trans_color.red, totalgamma)) &&
++ (c2 == gamma_correct (info_ptr->trans_color.green, totalgamma)) &&
++ (c3 == gamma_correct (info_ptr->trans_color.blue, totalgamma))) ?
+ 0 : maxval);
+ break;
+