Added an implementation of Lehmer random number generator with Lecuyer constant,...

[xonotic/darkplaces.git] / image.c

diff --git a/image.c b/image.c
index 470ea1795019df7a8c0f47e762e18120962f482b..1f15a2fce253d4d330d7edb1e05d5935d800222d 100644 (file)
--- a/image.c
+++ b/image.c
@@ -436,6 +436,8 @@ unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize, int *miplevel
                return NULL;
        }
 
+       memset(palettei, 0, sizeof(palettei));
+
        // advance to end of header
        fin = f + 18;
 
@@ -794,28 +796,41 @@ static unsigned char *LoadWAL_BGRA (const unsigned char *f, int filesize, int *m
 
 qboolean LoadWAL_GetMetadata(const unsigned char *f, int filesize, int *retwidth, int *retheight, int *retflags, int *retvalue, int *retcontents, char *retanimname32c)
 {
-       unsigned char *image_buffer;
        const q2wal_t *inwal = (const q2wal_t *)f;
 
        if (filesize < (int) sizeof(q2wal_t))
        {
                Con_Print("LoadWAL: invalid WAL file\n");
-               *retwidth = 16;
-               *retheight = 16;
-               *retflags = 0;
-               *retvalue = 0;
-               *retcontents = 0;
-               memset(retanimname32c, 0, 32);
+               if (retwidth)
+                       *retwidth = 16;
+               if (retheight)
+                       *retheight = 16;
+               if (retflags)
+                       *retflags = 0;
+               if (retvalue)
+                       *retvalue = 0;
+               if (retcontents)
+                       *retcontents = 0;
+               if (retanimname32c)
+                       memset(retanimname32c, 0, 32);
                return false;
        }
 
-       *retwidth = LittleLong(inwal->width);
-       *retheight = LittleLong(inwal->height);
-       *retflags = LittleLong(inwal->flags);
-       *retvalue = LittleLong(inwal->value);
-       *retcontents = LittleLong(inwal->contents);
-       memcpy(retanimname32c, inwal->animname, 32);
-       retanimname32c[31] = 0;
+       if (retwidth)
+               *retwidth = LittleLong(inwal->width);
+       if (retheight)
+               *retheight = LittleLong(inwal->height);
+       if (retflags)
+               *retflags = LittleLong(inwal->flags);
+       if (retvalue)
+               *retvalue = LittleLong(inwal->value);
+       if (retcontents)
+               *retcontents = LittleLong(inwal->contents);
+       if (retanimname32c)
+       {
+               memcpy(retanimname32c, inwal->animname, 32);
+               retanimname32c[31] = 0;
+       }
        return true;
 }
 
@@ -1005,11 +1020,15 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
                                        if(f)
                                        {
                                                int mymiplevel2 = miplevel ? *miplevel : 0;
+                                               int image_width_save = image_width;
+                                               int image_height_save = image_height;
                                                data2 = format->loadfunc(f, (int)filesize, &mymiplevel2);
-                                               if(data2 && mymiplevel == mymiplevel2)
+                                               if(data2 && mymiplevel == mymiplevel2 && image_width == image_width_save && image_height == image_height_save)
                                                        Image_CopyAlphaFromBlueBGRA(data, data2, image_width, image_height);
                                                else
                                                        Con_Printf("loadimagepixelsrgba: corrupt or invalid alpha image %s_alpha\n", basename);
+                                               image_width = image_width_save;
+                                               image_height = image_height_save;
                                                if(data2)
                                                        Mem_Free(data2);
                                                Mem_Free(f);