1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
|
diff -up libharu-2.2.1/src/hpdf_image_png.c.png15 libharu-2.2.1/src/hpdf_image_png.c
--- libharu-2.2.1/src/hpdf_image_png.c.png15 2012-07-31 15:15:22.369386483 -0400
+++ libharu-2.2.1/src/hpdf_image_png.c 2012-07-31 15:54:23.645540431 -0400
@@ -110,13 +110,22 @@ ReadPngData_Interlaced (HPDF_Dict im
{
png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
png_bytep* row_pointers = HPDF_GetMem (image->mmgr,
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ png_get_image_height(png_ptr, info_ptr) * sizeof (png_bytep));
+#else
info_ptr->height * sizeof (png_bytep));
+#endif
if (row_pointers) {
HPDF_UINT i;
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ HPDF_MemSet (row_pointers, 0, png_get_image_height(png_ptr, info_ptr) * sizeof (png_bytep));
+ for (i = 0; i < (HPDF_UINT)(png_get_image_height(png_ptr, info_ptr)); i++) {
+#else
HPDF_MemSet (row_pointers, 0, info_ptr->height * sizeof (png_bytep));
for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
+#endif
row_pointers[i] = HPDF_GetMem (image->mmgr, len);
if (image->error->error_no != HPDF_OK)
@@ -126,7 +135,11 @@ ReadPngData_Interlaced (HPDF_Dict im
if (image->error->error_no == HPDF_OK) {
png_read_image(png_ptr, row_pointers);
if (image->error->error_no == HPDF_OK) { /* add this line */
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ for (i = 0; i < (HPDF_UINT)(png_get_image_height(png_ptr, info_ptr)); i++) {
+#else
for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
+#endif
if (HPDF_Stream_Write (image->stream, row_pointers[i], len) !=
HPDF_OK)
break;
@@ -135,7 +148,11 @@ ReadPngData_Interlaced (HPDF_Dict im
}
/* clean up */
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ for (i = 0; i < (HPDF_UINT)(png_get_image_height(png_ptr, info_ptr)); i++) {
+#else
for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
+#endif
HPDF_FreeMem (image->mmgr, row_pointers[i]);
}
@@ -156,7 +173,11 @@ ReadPngData (HPDF_Dict image,
if (buf_ptr) {
HPDF_UINT i;
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ for (i = 0; i < (HPDF_UINT)(png_get_image_height(png_ptr, info_ptr)); i++) {
+#else
for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
+#endif
png_read_rows(png_ptr, (png_byte**)&buf_ptr, NULL, 1);
if (image->error->error_no != HPDF_OK)
break;
@@ -183,13 +204,21 @@ ReadTransparentPaletteData (HPDF_Dict
HPDF_UINT i, j;
png_bytep *row_ptr;
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ row_ptr = HPDF_GetMem (image->mmgr, png_get_image_height(png_ptr, info_ptr) * sizeof(png_bytep));
+#else
row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep));
+#endif
if (!row_ptr) {
return HPDF_FAILD_TO_ALLOC_MEM;
} else {
png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ for (i = 0; i < (HPDF_UINT)(png_get_image_height(png_ptr, info_ptr)); i++) {
+#else
for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
+#endif
row_ptr[i] = HPDF_GetMem(image->mmgr, len);
if (!row_ptr[i]) {
for (; i >= 0; i--) {
@@ -207,19 +236,32 @@ ReadTransparentPaletteData (HPDF_Dict
goto Error;
}
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ for (j = 0; j < png_get_image_height(png_ptr, info_ptr); j++) {
+ for (i = 0; i < png_get_image_width(png_ptr, info_ptr); i++) {
+ smask_data[png_get_image_width(png_ptr, info_ptr) * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF;
+ }
+
+ if (HPDF_Stream_Write (image->stream, row_ptr[j], png_get_image_width(png_ptr, info_ptr)) != HPDF_OK) {
+#else
for (j = 0; j < info_ptr->height; j++) {
for (i = 0; i < info_ptr->width; i++) {
smask_data[info_ptr->width * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF;
}
if (HPDF_Stream_Write (image->stream, row_ptr[j], info_ptr->width) != HPDF_OK) {
+#endif
ret = HPDF_FILE_IO_ERROR;
goto Error;
}
}
Error:
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ for (i = 0; i < (HPDF_UINT)(png_get_image_height(png_ptr, info_ptr)); i++) {
+#else
for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
+#endif
HPDF_FreeMem (image->mmgr, row_ptr[i]);
}
@@ -245,13 +287,21 @@ ReadTransparentPngData (HPDF_Dict im
return HPDF_INVALID_PNG_IMAGE;
}
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ row_ptr = HPDF_GetMem (image->mmgr, png_get_image_height(png_ptr, info_ptr) * sizeof(png_bytep));
+#else
row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep));
+#endif
if (!row_ptr) {
return HPDF_FAILD_TO_ALLOC_MEM;
} else {
png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ for (i = 0; i < (HPDF_UINT)(png_get_image_height(png_ptr, info_ptr)); i++) {
+#else
for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
+#endif
row_ptr[i] = HPDF_GetMem(image->mmgr, len);
if (!row_ptr[i]) {
for (; i >= 0; i--) {
@@ -271,12 +321,21 @@ ReadTransparentPngData (HPDF_Dict im
switch (color_type) {
case PNG_COLOR_TYPE_RGB_ALPHA:
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ row_len = 3 * png_get_image_width(png_ptr, info_ptr) * sizeof(png_byte);
+ for (j = 0; j < png_get_image_height(png_ptr, info_ptr); j++) {
+ for (i = 0; i < png_get_image_width(png_ptr, info_ptr); i++) {
+ row = row_ptr[j];
+ memmove(row + (3 * i), row + (4*i), 3);
+ smask_data[png_get_image_width(png_ptr, info_ptr) * j + i] = row[4 * i + 3];
+#else
row_len = 3 * info_ptr->width * sizeof(png_byte);
for (j = 0; j < info_ptr->height; j++) {
for (i = 0; i < info_ptr->width; i++) {
row = row_ptr[j];
memmove(row + (3 * i), row + (4*i), 3);
smask_data[info_ptr->width * j + i] = row[4 * i + 3];
+#endif
}
if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) {
@@ -286,12 +345,21 @@ ReadTransparentPngData (HPDF_Dict im
}
break;
case PNG_COLOR_TYPE_GRAY_ALPHA:
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ row_len = png_get_image_width(png_ptr, info_ptr) * sizeof(png_byte);
+ for (j = 0; j < png_get_image_height(png_ptr, info_ptr); j++) {
+ for (i = 0; i < png_get_image_width(png_ptr, info_ptr); i++) {
+ row = row_ptr[j];
+ row[i] = row[2 * i];
+ smask_data[png_get_image_width(png_ptr, info_ptr) * j + i] = row[2 * i + 1];
+#else
row_len = info_ptr->width * sizeof(png_byte);
for (j = 0; j < info_ptr->height; j++) {
for (i = 0; i < info_ptr->width; i++) {
row = row_ptr[j];
row[i] = row[2 * i];
smask_data[info_ptr->width * j + i] = row[2 * i + 1];
+#endif
}
if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) {
@@ -306,7 +374,11 @@ ReadTransparentPngData (HPDF_Dict im
}
Error:
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ for (i = 0; i < (HPDF_UINT)(png_get_image_height(png_ptr, info_ptr)); i++) {
+#else
for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
+#endif
HPDF_FreeMem (image->mmgr, row_ptr[i]);
}
@@ -448,7 +520,11 @@ LoadPngData (HPDF_Dict image,
}
/* 16bit images are not supported. */
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ if (png_get_bit_depth(png_ptr, info_ptr) == 16) {
+#else
if (info_ptr->bit_depth == 16) {
+#endif
png_set_strip_16(png_ptr);
}
@@ -458,7 +534,11 @@ LoadPngData (HPDF_Dict image,
}
/* check palette-based images for transparent areas and load them immediately if found */
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ if (xref && PNG_COLOR_TYPE_PALETTE & png_get_color_type(png_ptr, info_ptr)) {
+#else
if (xref && PNG_COLOR_TYPE_PALETTE & info_ptr->color_type) {
+#endif
png_bytep trans;
int num_trans;
HPDF_Dict smask;
@@ -478,10 +558,20 @@ LoadPngData (HPDF_Dict image,
smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
ret = HPDF_Dict_AddName (smask, "Type", "XObject");
ret += HPDF_Dict_AddName (smask, "Subtype", "Image");
+
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_get_image_width(png_ptr, info_ptr));
+ ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_get_image_height(png_ptr, info_ptr));
+#else
ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width);
ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height);
+#endif
ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
+#else
ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
+#endif
if (ret != HPDF_OK) {
HPDF_Dict_Free(smask);
@@ -489,7 +579,11 @@ LoadPngData (HPDF_Dict image,
goto Exit;
}
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ smask_data = HPDF_GetMem(image->mmgr, png_get_image_width(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr));
+#else
smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height);
+#endif
if (!smask_data) {
HPDF_Dict_Free(smask);
ret = HPDF_FAILD_TO_ALLOC_MEM;
@@ -503,7 +597,11 @@ LoadPngData (HPDF_Dict image,
goto Exit;
}
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ if (HPDF_Stream_Write(smask->stream, smask_data, png_get_image_width(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr)) != HPDF_OK) {
+#else
if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) {
+#endif
HPDF_FreeMem(image->mmgr, smask_data);
HPDF_Dict_Free(smask);
ret = HPDF_FILE_IO_ERROR;
@@ -513,9 +611,15 @@ LoadPngData (HPDF_Dict image,
ret += CreatePallet(image, png_ptr, info_ptr);
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_get_image_width(png_ptr, info_ptr));
+ ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_get_image_height(png_ptr, info_ptr));
+ ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
+#else
ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width);
ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height);
ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
+#endif
ret += HPDF_Dict_Add (image, "SMask", smask);
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -526,7 +630,11 @@ no_transparent_color_in_palette:
/* read images with alpha channel right away
we have to do this because image transparent mask must be added to the Xref */
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ if (xref && PNG_COLOR_MASK_ALPHA & png_get_color_type(png_ptr, info_ptr)) {
+#else
if (xref && PNG_COLOR_MASK_ALPHA & info_ptr->color_type) {
+#endif
HPDF_Dict smask;
png_bytep smask_data;
@@ -539,10 +647,17 @@ no_transparent_color_in_palette:
smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
ret = HPDF_Dict_AddName (smask, "Type", "XObject");
ret += HPDF_Dict_AddName (smask, "Subtype", "Image");
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_get_image_width(png_ptr, info_ptr));
+ ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_get_image_height(png_ptr, info_ptr));
+ ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
+ ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
+#else
ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width);
ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height);
ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
+#endif
if (ret != HPDF_OK) {
HPDF_Dict_Free(smask);
@@ -550,7 +665,11 @@ no_transparent_color_in_palette:
goto Exit;
}
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ smask_data = HPDF_GetMem(image->mmgr, png_get_image_width(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr));
+#else
smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height);
+#endif
if (!smask_data) {
HPDF_Dict_Free(smask);
ret = HPDF_FAILD_TO_ALLOC_MEM;
@@ -564,7 +683,11 @@ no_transparent_color_in_palette:
goto Exit;
}
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ if (HPDF_Stream_Write(smask->stream, smask_data, png_get_image_width(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr)) != HPDF_OK) {
+#else
if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) {
+#endif
HPDF_FreeMem(image->mmgr, smask_data);
HPDF_Dict_Free(smask);
ret = HPDF_FILE_IO_ERROR;
@@ -572,14 +695,24 @@ no_transparent_color_in_palette:
}
HPDF_FreeMem(image->mmgr, smask_data);
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) {
+#else
if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+#endif
ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray");
} else {
ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB");
}
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_get_image_width(png_ptr, info_ptr));
+ ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_get_image_height(png_ptr, info_ptr));
+ ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
+#else
ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width);
ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height);
ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
+#endif
ret += HPDF_Dict_Add (image, "SMask", smask);
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -589,9 +722,15 @@ no_transparent_color_in_palette:
/* if the image has color palette, copy the pallet of the image to
* create color map.
*/
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
+ ret = CreatePallet(image, png_ptr, info_ptr);
+ else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY)
+#else
if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
- ret = CreatePallet(image, png_ptr, info_ptr);
+ ret = CreatePallet(image, png_ptr, info_ptr);
else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+#endif
ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray");
else
ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB");
@@ -617,6 +756,18 @@ no_transparent_color_in_palette:
}
/* setting the info of the image. */
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_get_image_width(png_ptr, info_ptr))
+ != HPDF_OK)
+ goto Exit;
+
+ if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_get_image_height(png_ptr, info_ptr))
+ != HPDF_OK)
+ goto Exit;
+
+ if (HPDF_Dict_AddNumber (image, "BitsPerComponent",
+ (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)) != HPDF_OK)
+#else
if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width)
!= HPDF_OK)
goto Exit;
@@ -627,6 +778,7 @@ no_transparent_color_in_palette:
if (HPDF_Dict_AddNumber (image, "BitsPerComponent",
(HPDF_UINT)info_ptr->bit_depth) != HPDF_OK)
+#endif
goto Exit;
/* clean up */
|
