summaryrefslogtreecommitdiff
blob: 201922e24e614c3240bf9fd90ed389737a48d250 (plain)
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
http://bugs.gentoo.org/show_bug.cgi?id=308667

--- a/src/MOGL/MOGL_Image.cpp
+++ b/src/MOGL/MOGL_Image.cpp
@@ -183,7 +183,7 @@ bool MOGL_Image::ChargerPNG(const char *
   info_ptr = png_create_info_struct(png_ptr);
   if (info_ptr == NULL)
   {
-    png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+    png_destroy_read_struct(&png_ptr, NULL, NULL);
     return false;
   }
 
@@ -191,7 +191,7 @@ bool MOGL_Image::ChargerPNG(const char *
   if (setjmp(png_jmpbuf(png_ptr)))
   {
     // On lib�re la m�moire
-    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
     return false;
   }
         
@@ -235,7 +235,7 @@ bool MOGL_Image::ChargerPNG(const char *
   /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
   {
-    png_set_gray_1_2_4_to_8(png_ptr);
+    png_set_expand_gray_1_2_4_to_8(png_ptr);
   }
   
   /* Expand paletted or RGB images with transparency to full alpha channels