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
|
--- image.c.orig 2012-05-03 06:08:56.000000000 +0200
+++ image.c 2012-05-03 06:20:20.000000000 +0200
@@ -534,7 +534,7 @@
static void (*qpng_write_info)(png_structp, png_infop);
static void (*qpng_read_info)(png_structp, png_infop);
static void (*qpng_set_expand)(png_structp);
-static void (*qpng_set_gray_1_2_4_to_8)(png_structp);
+static void (*qpng_set_expand_gray_1_2_4_to_8)(png_structp);
static void (*qpng_set_palette_to_rgb)(png_structp);
static void (*qpng_set_tRNS_to_alpha)(png_structp);
static void (*qpng_set_gray_to_rgb)(png_structp);
@@ -570,7 +570,7 @@
{"png_write_info", (void **) &qpng_write_info},
{"png_read_info", (void **) &qpng_read_info},
{"png_set_expand", (void **) &qpng_set_expand},
- {"png_set_gray_1_2_4_to_8", (void **) &qpng_set_gray_1_2_4_to_8},
+ {"png_set_expand_gray_1_2_4_to_8", (void **) &qpng_set_gray_1_2_4_to_8},
{"png_set_palette_to_rgb", (void **) &qpng_set_palette_to_rgb},
{"png_set_tRNS_to_alpha", (void **) &qpng_set_tRNS_to_alpha},
{"png_set_gray_to_rgb", (void **) &qpng_set_gray_to_rgb},
@@ -734,7 +734,7 @@
return NULL;
}
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
qpng_destroy_read_struct(&png_ptr, &pnginfo, NULL);
#ifndef WITH_FTE_VFS
fclose(fin);
@@ -784,7 +784,7 @@
}
if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8)
- qpng_set_gray_1_2_4_to_8(png_ptr);
+ qpng_set_expand_gray_1_2_4_to_8(png_ptr);
if (qpng_get_valid(png_ptr, pnginfo, PNG_INFO_tRNS))
qpng_set_tRNS_to_alpha(png_ptr);
@@ -888,7 +888,7 @@
return false;
}
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
qpng_destroy_write_struct(&png_ptr, &info_ptr);
#ifndef WITH_FTE_VFS
fclose(fp);
@@ -983,7 +983,7 @@
return false;
}
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
qpng_destroy_write_struct(&png_ptr, &info_ptr);
#ifndef WITH_FTE_VFS
fclose(fp);
@@ -1158,7 +1158,7 @@
// Set the return adress that PNGLib should return to if
// an error occurs during reading.
- if (setjmp(png_ptr->jmpbuf))
+ if (setjmp(png_jmpbuf(png_ptr)))
{
png_destroy_read_struct(&png_ptr, &pnginfo, NULL);
#ifndef WITH_FTE_VFS
@@ -1233,7 +1233,7 @@
if (colortype == PNG_COLOR_TYPE_GRAY && bitdepth < 8)
{
- png_set_gray_1_2_4_to_8(png_ptr);
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
}
if (png_get_valid(png_ptr, pnginfo, PNG_INFO_tRNS))
@@ -1281,7 +1281,7 @@
if (!png_get_hIST(png_ptr, pnginfo, &histogram))
histogram = NULL;
- png_set_dither(png_ptr, quake_pal, 256, 256, histogram, true);
+ png_set_quantize(png_ptr, quake_pal, 256, 256, histogram, true);
}
#endif // !GLQUAKE
@@ -1507,7 +1507,7 @@
return false;
}
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_write_struct(&png_ptr, &info_ptr);
#ifndef WITH_FTE_VFS
fclose(fp);
@@ -1598,7 +1598,7 @@
return false;
}
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_write_struct(&png_ptr, &info_ptr);
#ifndef WITH_FTE_VFS
fclose(fp);
@@ -2360,7 +2360,7 @@
}
GLOBAL(void)
-jpeg_mem_src (j_decompress_ptr cinfo, byte * infile, int maxlen)
+local_jpeg_mem_src (j_decompress_ptr cinfo, byte * infile, int maxlen)
{
my_source_mgr *src;
@@ -2471,7 +2471,7 @@
jpeg_create_decompress(&cinfo);
- jpeg_mem_src(&cinfo, infile, length);
+ local_jpeg_mem_src(&cinfo, infile, length);
(void) jpeg_read_header(&cinfo, TRUE);
|
