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
|
--- plugins/loader/png/png.c.orig 2010-10-06 14:47:32.000000000 +0200
+++ plugins/loader/png/png.c 2012-05-04 07:30:47.000000000 +0200
@@ -34,6 +34,7 @@
#error Install libpng
#endif
#endif
+# include <pngpriv.h>
#include "enfle/loader-plugin.h"
#include "utils/libstring.h"
@@ -156,7 +157,7 @@
int try_when_error;
unsigned int i, num_text;
int num_trans;
- png_color_16p trans_values;
+ png_color_16p trans_color;
png_bytep trans;
//debug_message("png loader: load() called\n");
@@ -260,7 +261,7 @@
color_type = png_get_color_type(png_ptr, info_ptr);
/* Set the transparent color */
- if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values)) {
+ if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_color)) {
//p->transparent_disposal = info->transparent_disposal;
switch (color_type) {
case PNG_COLOR_TYPE_PALETTE:
@@ -273,13 +274,13 @@
break;
case PNG_COLOR_TYPE_RGB:
case PNG_COLOR_TYPE_RGB_ALPHA:
- p->transparent_color.red = info_ptr->trans_values.red >> 8;
- p->transparent_color.green = info_ptr->trans_values.green >> 8;
- p->transparent_color.blue = info_ptr->trans_values.blue >> 8;
+ p->transparent_color.red = info_ptr->trans_color.red >> 8;
+ p->transparent_color.green = info_ptr->trans_color.green >> 8;
+ p->transparent_color.blue = info_ptr->trans_color.blue >> 8;
break;
case PNG_COLOR_TYPE_GRAY:
case PNG_COLOR_TYPE_GRAY_ALPHA:
- p->transparent_color.gray = info_ptr->trans_values.gray;
+ p->transparent_color.gray = info_ptr->trans_color.gray;
break;
default:
break;
|
