Bug#400051: antigravitaattori: Segfault attempting to start; fail to load texture

[Pascal Giard]

Sorry, here's the patch...

-Pascal... who's going to bed
--
Homepage (http://organact.mine.nu)
Debian GNU/Linux (http://www.debian.org)
École de technologie supérieure (http://www.etsmtl.ca)

--- antigrav-0.0.2/src/m3dtexture.cpp   2006-12-01 23:12:39.000000000 -0500
+++ antigrav-0.0.2/src/m3dtexture.cpp.new       2006-12-01 23:14:08.000000000 
-0500
@@ -206,7 +206,7 @@
        @param height a pointer where to store the image width
        @return 0 on success, -1 on failure
 */
-int m3dTexture::loadPNG(const char *filename, unsigned char **data, unsigned 
int *width, unsigned int *height)
+int m3dTexture::loadPNG(const char *filename, unsigned char **data, 
png_uint_32 *width, png_uint_32 *height)
 {
        FILE *f;
        int result;
@@ -223,7 +223,7 @@
        return result;
 }
 
-int m3dTexture::loadPNG(unsigned char **data, unsigned int *width, unsigned 
int *height, void *handle, void (*pngReadCallback)(png_structp ctx, png_bytep 
area, png_size_t size))
+int m3dTexture::loadPNG(unsigned char **data, png_uint_32 *width, png_uint_32 
*height, void *handle, void (*pngReadCallback)(png_structp ctx, png_bytep area, 
png_size_t size))
 {
        png_structp pngPtr;
        png_infop pngInfoPtr;
@@ -260,7 +260,7 @@
        png_set_read_fn(pngPtr, handle, pngReadCallback);
 
        png_read_info(pngPtr, pngInfoPtr);
-       png_get_IHDR(pngPtr, pngInfoPtr, (png_uint_32*)width, 
(png_uint_32*)height, &bitDepth, &colorType, &interlaceType, NULL, NULL);
+       png_get_IHDR(pngPtr, pngInfoPtr, width, height, &bitDepth, &colorType, 
&interlaceType, NULL, NULL);
 
        png_set_strip_16(pngPtr);
 
@@ -281,7 +281,7 @@
        }
        
        png_read_update_info(pngPtr, pngInfoPtr);
-       png_get_IHDR(pngPtr, pngInfoPtr, (png_uint_32*)width, 
(png_uint_32*)height, &bitDepth, &colorType, &interlaceType, NULL, NULL);
+       png_get_IHDR(pngPtr, pngInfoPtr, width, height, &bitDepth, &colorType, 
&interlaceType, NULL, NULL);
        
        (*data) = new unsigned char[(*width) * (*height) * 
pngInfoPtr->channels];
        if((*data) == NULL)
@@ -314,7 +314,7 @@
        return 0;
 }
 
-int m3dTexture::savePNG(const char *filename, const unsigned char *data, 
unsigned int width, unsigned int height)
+int m3dTexture::savePNG(const char *filename, const unsigned char *data, 
png_uint_32 width, png_uint_32 height)
 {
        FILE *f;
        int result;
@@ -347,7 +347,7 @@
        fflush(f);
 }
 
-int m3dTexture::savePNG(const unsigned char *data, unsigned int width, 
unsigned int height, void *handle, void (*pngWriteCallback)(png_structp pngPtr, 
png_bytep data, png_size_t length), void (*pngFlushCallback)(png_structp 
pngPtr))
+int m3dTexture::savePNG(const unsigned char *data, png_uint_32 width, 
png_uint_32 height, void *handle, void (*pngWriteCallback)(png_structp pngPtr, 
png_bytep data, png_size_t length), void (*pngFlushCallback)(png_structp 
pngPtr))
 {
        png_structp pngPtr;
        png_infop pngInfoPtr;
@@ -437,7 +437,7 @@
 GLuint m3dTexture::loadTexture(const char *filename)
 {
        unsigned char *data;
-       unsigned int width, height;
+       png_uint_32 width, height;
        GLuint tex;
        
        glGenTextures(1, &tex);
--- antigrav-0.0.2/src/m3dtexture.h     2006-08-04 15:38:31.000000000 -0400
+++ antigrav-0.0.2/src/m3dtexture.h.new 2006-12-01 23:14:15.000000000 -0500
@@ -9,7 +9,7 @@
 {
        std::string filename;
        GLuint handle;
-       unsigned int width, height;
+       png_uint_32 width, height;
 };
 
 /// A texture
@@ -34,8 +34,8 @@
        
        m3dTexture &operator=(const m3dTexture &t);
 
-       static int loadPNG(const char *filename, unsigned char **data, unsigned 
int *width, unsigned int *height);
-       static int savePNG(const char *filename, const unsigned char *data, 
unsigned int width, unsigned int height);
+       static int loadPNG(const char *filename, unsigned char **data, 
png_uint_32 *width, png_uint_32 *height);
+       static int savePNG(const char *filename, const unsigned char *data, 
png_uint_32 width, png_uint_32 height);
        static int screenshot(const char *filename);
        
        static GLuint loadTexture(const char *filename);
@@ -48,8 +48,8 @@
        static void pngWriteCallbackSTDIO(png_structp pngPtr, png_bytep data, 
png_size_t length);
        static void pngFlushCallbackSTDIO(png_structp pngPtr);
        
-       static int loadPNG(unsigned char **data, unsigned int *width, unsigned 
int *height, void *handle, void (*pngReadCallback)(png_structp ctx, png_bytep 
area, png_size_t size));
-       static int savePNG(const unsigned char *data, unsigned int width, 
unsigned int height, void *handle, void (*pngWriteCallback)(png_structp pngPtr, 
png_bytep data, png_size_t length), void (*pngFlushCallback)(png_structp 
pngPtr));
+       static int loadPNG(unsigned char **data, png_uint_32 *width, 
png_uint_32 *height, void *handle, void (*pngReadCallback)(png_structp ctx, 
png_bytep area, png_size_t size));
+       static int savePNG(const unsigned char *data, png_uint_32 width, 
png_uint_32 height, void *handle, void (*pngWriteCallback)(png_structp pngPtr, 
png_bytep data, png_size_t length), void (*pngFlushCallback)(png_structp 
pngPtr));
 };
 
 #endif