55 lines
2 KiB
C
55 lines
2 KiB
C
--- converter/other/pnmtopng.c.orig 2011-09-25 20:51:44.000000000 +0200
|
|
+++ converter/other/pnmtopng.c 2012-04-23 20:23:10.000000000 +0200
|
|
@@ -61,7 +61,9 @@
|
|
#include <assert.h>
|
|
#include <string.h> /* strcat() */
|
|
#include <limits.h>
|
|
-#include <png.h> /* includes zlib.h and setjmp.h */
|
|
+#include <png.h>
|
|
+#include <zlib.h>
|
|
+#include <pngpriv.h>
|
|
#include "pnm.h"
|
|
#include "pngtxt.h"
|
|
#include "shhopt.h"
|
|
@@ -69,7 +71,7 @@
|
|
#include "nstring.h"
|
|
#include "version.h"
|
|
|
|
-#if PNG_LIBPNG_VER >= 10400
|
|
+#if 0
|
|
#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
|
|
#error You need either an older PNG library (older than 1.4)
|
|
#error newer Netpbm source code (at least 10.47.04)
|
|
@@ -2630,7 +2632,7 @@
|
|
info_ptr->num_palette = palette_size;
|
|
if (trans_size > 0) {
|
|
info_ptr->valid |= PNG_INFO_tRNS;
|
|
- info_ptr->trans = trans;
|
|
+ info_ptr->trans_alpha = trans;
|
|
info_ptr->num_trans = trans_size; /* omit opaque values */
|
|
}
|
|
/* creating hIST chunk */
|
|
@@ -2667,7 +2669,7 @@
|
|
info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
|
|
if (transparent > 0) {
|
|
info_ptr->valid |= PNG_INFO_tRNS;
|
|
- info_ptr->trans_values =
|
|
+ info_ptr->trans_color =
|
|
xelToPngColor_16(transcolor, maxval, png_maxval);
|
|
}
|
|
} else {
|
|
@@ -2679,10 +2681,10 @@
|
|
if (info_ptr->valid && PNG_INFO_tRNS)
|
|
pm_message("Transparent color {gray, red, green, blue} = "
|
|
"{%d, %d, %d, %d}",
|
|
- info_ptr->trans_values.gray,
|
|
- info_ptr->trans_values.red,
|
|
- info_ptr->trans_values.green,
|
|
- info_ptr->trans_values.blue);
|
|
+ info_ptr->trans_color.gray,
|
|
+ info_ptr->trans_color.red,
|
|
+ info_ptr->trans_color.green,
|
|
+ info_ptr->trans_color.blue);
|
|
else
|
|
pm_message("No transparent color");
|
|
}
|