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
|
--- src/png.c
+++ src/png.c
@@ -142,7 +142,7 @@
}
if (setjmp(png_jmpbuf(png_ptr))) {
if (png_image) {
- for (y = 0 ; y < info_ptr->height ; y++)
+ for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
free (png_image[y]);
free (png_image);
}
@@ -161,19 +161,19 @@
png_set_sig_bytes (png_ptr, SIG_CHECK_SIZE);
png_read_info (png_ptr, info_ptr);
- if (8 != info_ptr->bit_depth) {
+ if (8 != png_get_bit_depth(png_ptr, info_ptr)) {
fprintf(stderr, "bit depth type must be 8, not %d.\n",
- info_ptr->bit_depth);
+ png_get_bit_depth(png_ptr, info_ptr));
return 0;
}
- *width = info_ptr->width;
- *height = info_ptr->height;
+ *width = png_get_image_width(png_ptr, info_ptr);
+ *height = png_get_image_height(png_ptr, info_ptr);
p = q = malloc(4 * *width * *height);
- png_image = (png_byte **)malloc (info_ptr->height * sizeof (png_byte*));
+ png_image = (png_byte **)malloc (png_get_image_height(png_ptr, info_ptr) * sizeof (png_byte*));
- linesize = info_ptr->width;
- switch (info_ptr->color_type) {
+ linesize = png_get_image_width(png_ptr, info_ptr);
+ switch (png_get_color_type(png_ptr, info_ptr)) {
case PNG_COLOR_TYPE_RGB:
linesize *= 3;
break;
@@ -182,21 +182,21 @@
break;
default:
fprintf(stderr, "color type must be RGB or RGBA not %d.\n",
- info_ptr->color_type);
+ png_get_color_type(png_ptr, info_ptr));
return 0;
}
- for (y = 0 ; y < info_ptr->height ; y++) {
+ for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
png_image[y] = malloc (linesize);
}
png_read_image (png_ptr, png_image);
png_read_end (png_ptr, info_ptr);
- for (y = 0 ; y < info_ptr->height ; y++) {
+ for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
unsigned char *s = png_image[y];
- for (x = 0 ; x < info_ptr->width ; x++) {
+ for (x = 0 ; x < png_get_image_width(png_ptr, info_ptr) ; x++) {
- switch (info_ptr->color_type) {
+ switch (png_get_color_type(png_ptr, info_ptr)) {
case PNG_COLOR_TYPE_RGB:
p[0] = s[0];
p[1] = s[1];
@@ -217,7 +217,7 @@
}
}
- for (y = 0 ; y < info_ptr->height ; y++)
+ for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
free (png_image[y]);
free (png_image);
png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
|
