made CL_SetInfo check for more forbidden characters (key now refuses any form of...

[xonotic/darkplaces.git] / image.c

diff --git a/image.c b/image.c
index 1bc4a85d91ed4d0b9e560404023a7fa2d682a35d..fa2252d628eca0caed6c9ad00514fb799ecbfe59 100644 (file)
--- a/image.c
+++ b/image.c
@@ -712,11 +712,6 @@ unsigned char *LoadLMP (const unsigned char *f, int filesize, int matchwidth, in
        return image_buffer;
 }
 
-static unsigned char *LoadLMPRGBA (const unsigned char *f, int filesize, int matchwidth, int matchheight)
-{
-       return LoadLMP(f, filesize, matchwidth, matchheight, false);
-}
-
 
 typedef struct q2wal_s
 {
@@ -767,9 +762,13 @@ unsigned char *LoadWAL (const unsigned char *f, int filesize, int matchwidth, in
 }
 
 
-void Image_StripImageExtension (const char *in, char *out)
+static void Image_StripImageExtension (const char *in, char *out, size_t size_out)
 {
        const char *end, *temp;
+
+       if (size_out == 0)
+               return;
+
        end = in + strlen(in);
        if ((end - in) >= 4)
        {
@@ -780,12 +779,15 @@ void Image_StripImageExtension (const char *in, char *out)
                 || strcmp(temp, ".png") == 0
                 || strcmp(temp, ".jpg") == 0)
                        end = temp;
-               while (in < end)
+               while (in < end && size_out > 1)
+               {
                        *out++ = *in++;
+                       size_out--;
+               }
                *out++ = 0;
        }
        else
-               strcpy(out, in);
+               strlcpy(out, in, size_out);
 }
 
 typedef struct imageformat_s
@@ -801,17 +803,22 @@ imageformat_t imageformats_tenebrae[] =
        {"override/%s.tga", LoadTGA},
        {"override/%s.png", PNG_LoadImage},
        {"override/%s.jpg", JPEG_LoadImage},
+       {"override/%s.pcx", LoadPCX},
        {NULL, NULL}
 };
 
 imageformat_t imageformats_nopath[] =
 {
+       {"override/%s.tga", LoadTGA},
+       {"override/%s.png", PNG_LoadImage},
+       {"override/%s.jpg", JPEG_LoadImage},
        {"textures/%s.tga", LoadTGA},
        {"textures/%s.png", PNG_LoadImage},
        {"textures/%s.jpg", JPEG_LoadImage},
        {"%s.tga", LoadTGA},
        {"%s.png", PNG_LoadImage},
        {"%s.jpg", JPEG_LoadImage},
+       {"%s.pcx", LoadPCX},
        {NULL, NULL}
 };
 
@@ -831,7 +838,6 @@ imageformat_t imageformats_gfx[] =
        {"%s.png", PNG_LoadImage},
        {"%s.jpg", JPEG_LoadImage},
        {"%s.pcx", LoadPCX},
-       {"%s.lmp", LoadLMPRGBA},
        {NULL, NULL}
 };
 
@@ -854,8 +860,7 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
                Mem_CheckSentinelsGlobal();
        if (developer_texturelogging.integer)
                Log_Printf("textures.log", "%s\n", filename);
-       strlcpy(basename, filename, sizeof(basename));
-       Image_StripImageExtension(basename, basename); // strip filename extensions to allow replacement by other types
+       Image_StripImageExtension(filename, basename, sizeof(basename)); // strip filename extensions to allow replacement by other types
        // replace *'s with #, so commandline utils don't get confused when dealing with the external files
        for (c = basename;*c;c++)
                if (*c == '*')
@@ -1353,6 +1358,7 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth,
 // in can be the same as out
 void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel)
 {
+       const unsigned char *inrow;
        int x, y, nextrow;
        if (*depth != 1 || destdepth != 1)
        {
@@ -1365,6 +1371,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                        *depth >>= 1;
                return;
        }
+       // note: if given odd width/height this discards the last row/column of
+       // pixels, rather than doing a proper box-filter scale down
+       inrow = in;
        nextrow = *width * bytesperpixel;
        if (*width > destwidth)
        {
@@ -1375,9 +1384,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                        *height >>= 1;
                        if (bytesperpixel == 4)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow * 2)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[4] + in[nextrow  ] + in[nextrow+4]) >> 2);
                                                out[1] = (unsigned char) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
@@ -1386,14 +1395,13 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                                                out += 4;
                                                in += 8;
                                        }
-                                       in += nextrow; // skip a line
                                }
                        }
                        else if (bytesperpixel == 3)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow * 2)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[3] + in[nextrow  ] + in[nextrow+3]) >> 2);
                                                out[1] = (unsigned char) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
@@ -1401,7 +1409,6 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                                                out += 3;
                                                in += 6;
                                        }
-                                       in += nextrow; // skip a line
                                }
                        }
                        else
@@ -1412,9 +1419,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                        // reduce width
                        if (bytesperpixel == 4)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[4]) >> 1);
                                                out[1] = (unsigned char) ((in[1] + in[5]) >> 1);
@@ -1427,9 +1434,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                        }
                        else if (bytesperpixel == 3)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[3]) >> 1);
                                                out[1] = (unsigned char) ((in[1] + in[4]) >> 1);
@@ -1451,9 +1458,9 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                        *height >>= 1;
                        if (bytesperpixel == 4)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow * 2)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
                                                out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
@@ -1462,14 +1469,13 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                                                out += 4;
                                                in += 4;
                                        }
-                                       in += nextrow; // skip a line
                                }
                        }
                        else if (bytesperpixel == 3)
                        {
-                               for (y = 0;y < *height;y++)
+                               for (y = 0;y < *height;y++, inrow += nextrow * 2)
                                {
-                                       for (x = 0;x < *width;x++)
+                                       for (in = inrow, x = 0;x < *width;x++)
                                        {
                                                out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
                                                out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
@@ -1477,7 +1483,6 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
                                                out += 3;
                                                in += 3;
                                        }
-                                       in += nextrow; // skip a line
                                }
                        }
                        else
@@ -1559,8 +1564,7 @@ int image_loadskin(imageskin_t *s, const char *shadername)
        unsigned char *bumppixels;
        int bumppixels_width, bumppixels_height;
        char name[MAX_QPATH];
-       strlcpy(name, shadername, sizeof(name));
-       Image_StripImageExtension(name, name);
+       Image_StripImageExtension(shadername, name, sizeof(name));
        memset(s, 0, sizeof(*s));
        s->basepixels = loadimagepixels(name, false, 0, 0);
        if (s->basepixels == NULL)