1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Update to 0.14

Feature safe:	yes
This commit is contained in:
Ganael LAPLANCHE 2012-11-27 12:22:40 +00:00
parent 4285041354
commit e58a1393f3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=307838
3 changed files with 3 additions and 63 deletions

View File

@ -7,8 +7,7 @@
#
PORTNAME= tif22pnm
PORTVERSION= 0.12
PORTREVISION= 7
PORTVERSION= 0.14
CATEGORIES= graphics
MASTER_SITES= http://pts.szit.bme.hu/ \
GOOGLE_CODE

View File

@ -1,2 +1,2 @@
SHA256 (tif22pnm-0.12.tar.gz) = 4253f27d5578aeae8f88e75f41a205da8d2dc466d1efff39a3667a9ff55fb73a
SIZE (tif22pnm-0.12.tar.gz) = 107684
SHA256 (tif22pnm-0.14.tar.gz) = d59ea3f1fdd6802e66a44fbfa8979d4e61c9fd021de36675249a877392378e01
SIZE (tif22pnm-0.14.tar.gz) = 108047

View File

@ -1,59 +0,0 @@
--- png22pnm.c.orig 2003-03-18 17:14:51.000000000 +0100
+++ png22pnm.c 2012-05-04 07:36:40.000000000 +0200
@@ -40,6 +40,7 @@
#include <math.h>
#include <png.h> /* includes zlib.h and setjmp.h */
+#include <pngpriv.h>
#if 0
#define VERSION "p2.37.4 (5 December 1999) +netpbm"
#else
@@ -783,7 +784,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 +933,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 +1010,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 +1024,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 +1032,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;