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
|
--- ./images.c.orig 2004-04-13 02:46:24.000000000 +0200
+++ ./images.c 2014-08-15 19:11:07.000000000 +0200
@@ -835,7 +835,7 @@
panda_object * imageObj, char *filename)
{
FILE *image;
- unsigned long width, height;
+ png_uint_32 width, height;
int bitdepth, colourtype, outColourType;
png_uint_32 i, rowbytes;
png_structp png;
@@ -854,7 +854,7 @@
// Check that it really is a PNG file
fread (sig, 1, 8, image);
- if (!png_check_sig (sig, 8))
+ if (png_sig_cmp (sig, 0, 8))
panda_error (panda_true, "PNG file was invalid");
// Start decompressing
@@ -1399,7 +1399,7 @@
panda_imagesizePNG (int *width, int *height, char *filename)
{
FILE * image;
- unsigned long pwidth, pheight;
+ png_uint_32 pwidth, pheight;
int bitdepth, colourtype;
png_structp png;
png_infop info;
@@ -1411,7 +1411,7 @@
// Check that it really is a PNG file
fread (sig, 1, 8, image);
- if (!png_check_sig (sig, 8))
+ if (png_sig_cmp (sig, 0, 8))
panda_error (panda_true, "PNG file was invalid");
// Start decompressing
|
