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
|
$NetBSD: patch-bd,v 1.2 2002/03/15 03:25:57 fredb Exp $
--- src/png.c.orig Sat Nov 21 08:55:13 1998
+++ src/png.c
@@ -78,8 +78,8 @@
Pixmap do_png(char *data, long len, long *wp, long *hp)
{
- png_struct p_str;
- png_info p_info;
+ png_struct *p_str = NULL;
+ png_info *p_info = NULL;
Pixmap pixmap;
FILE *volatile vol_fp = NULL;
void *volatile vol_pic = NULL;
@@ -98,7 +98,11 @@
return None;
}
- if (setjmp(p_str.jmpbuf))
+ if ((p_str = (png_struct *) png_create_read_struct(PNG_LIBPNG_VER_STRING,
+ NULL, NULL, NULL)))
+ p_info = (png_info *) png_create_info_struct(p_str);
+
+ if (p_str && p_info && setjmp(png_jmpbuf(p_str)))
ArtTextAddLine(main_widgets.text, "[knews: png error.]",
ascii_font->body_font, global.alert_pixel);
else {
@@ -108,58 +112,55 @@
unsigned int per_line = 0;
unsigned int i, j, pass;
- png_read_init(&p_str);
- png_info_init(&p_info);
-
- png_init_io(&p_str, vol_fp);
- png_read_info(&p_str, &p_info);
+ png_init_io(p_str, vol_fp);
+ png_read_info(p_str, p_info);
- vol_w = w = p_info.width;
- vol_h = h = p_info.height;
+ vol_w = w = p_info->width;
+ vol_h = h = p_info->height;
- if (p_info.bit_depth == 16)
- png_set_strip_16(&p_str);
- else if (p_info.bit_depth < 8)
- png_set_packing(&p_str);
+ if (p_info->bit_depth == 16)
+ png_set_strip_16(p_str);
+ else if (p_info->bit_depth < 8)
+ png_set_packing(p_str);
- if (p_info.valid & PNG_INFO_bKGD)
- png_set_background(&p_str, &p_info.background,
+ if (p_info->valid & PNG_INFO_bKGD)
+ png_set_background(p_str, &p_info->background,
PNG_BACKGROUND_GAMMA_FILE, True, 1.0);
else {
static png_color_16 bg = {0, };
- png_set_background(&p_str, &bg,
+ png_set_background(p_str, &bg,
PNG_BACKGROUND_GAMMA_SCREEN, False, 1.0);
}
per_line = w;
- if (!(p_info.color_type & PNG_COLOR_MASK_COLOR)) { /* grey image */
+ if (!(p_info->color_type & PNG_COLOR_MASK_COLOR)) { /* grey image */
grey = True;
- png_set_expand(&p_str);
+ png_set_expand(p_str);
} else if (!p_cmap) { /* true color visual */
- if (p_info.color_type == PNG_COLOR_TYPE_PALETTE)
- png_set_expand(&p_str);
+ if (p_info->color_type == PNG_COLOR_TYPE_PALETTE)
+ png_set_expand(p_str);
per_line *= 3;
- } else if (p_info.color_type & PNG_COLOR_MASK_PALETTE) {
+ } else if (p_info->color_type & PNG_COLOR_MASK_PALETTE) {
CMAP_ENTRY *pal;
int i, pn;
- pn = p_info.num_palette;
+ pn = p_info->num_palette;
pal = (CMAP_ENTRY *)XtMalloc(pn * sizeof *pal);
for (i = 0 ; i < pn ; i++) {
- pal[i].r = p_info.palette[i].red;
- pal[i].g = p_info.palette[i].green;
- pal[i].b = p_info.palette[i].blue;
+ pal[i].r = p_info->palette[i].red;
+ pal[i].g = p_info->palette[i].green;
+ pal[i].b = p_info->palette[i].blue;
}
vol_pal = pal;
vol_pn = pn;
} else {
- png_set_dither(&p_str, p_cmap, cmap_size,
+ png_set_dither(p_str, p_cmap, cmap_size,
cmap_size, NULL, True);
}
- pass = png_set_interlace_handling(&p_str);
- png_start_read_image(&p_str);
+ pass = png_set_interlace_handling(p_str);
+ png_start_read_image(p_str);
vol_pic = pic = (unsigned char *)XtMalloc(h * per_line);
@@ -167,14 +168,14 @@
for (i = 0 ; i < pass ; i++) {
row = pic;
for (j = 0 ; j < h ; j++) {
- png_read_row(&p_str, NULL, row);
+ png_read_row(p_str, NULL, row);
if (!did)
vol_did = did = True;
row += per_line;
}
}
- png_read_end(&p_str, NULL);
+ png_read_end(p_str, NULL);
}
if (!vol_did)
@@ -204,7 +205,10 @@
}
}
- png_read_destroy(&p_str, &p_info, NULL);
+ if (p_info)
+ png_destroy_read_struct(&p_str, &p_info, NULL);
+ else
+ png_destroy_read_struct(&p_str, NULL, NULL);
fclose((FILE *)vol_fp);
XtFree((char *)vol_pic);
XtFree((char *)vol_pal);
|
