allow tga, wal and jpg images to be 32768x32768 rather than 4096x4096,

fixes minimap creation in steelstorm at 8064x1600 resolution

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10370 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e00d0a9f73ce876c5bedacba764c51d82802201e

diff --git a/image.c b/image.c
index 41055d7e6695bc2d391eb72e39c121f0b5bc47d8..8f6026ade56a899da13ac5d742850aca1342e497 100644 (file)
--- a/image.c
+++ b/image.c
@@ -416,7 +416,7 @@ unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize, int *miplevel
        targa_header.pixel_size = f[16];
        targa_header.attributes = f[17];
 
-       if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+       if (image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
        {
                Con_Print("LoadTGA: invalid size\n");
                PrintTargaHeader(&targa_header);
@@ -759,7 +759,7 @@ unsigned char *LoadWAL_BGRA (const unsigned char *f, int filesize, int *miplevel
 
        image_width = LittleLong(inwal->width);
        image_height = LittleLong(inwal->height);
-       if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+       if (image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
        {
                Con_Printf("LoadWAL: invalid size %ix%i\n", image_width, image_height);
                return NULL;

diff --git a/jpeg.c b/jpeg.c
index e69fe76867d6eb84a51442802d1a0aeb07bcd8b2..cc9952391d1359e9307f91766aa970aca068db08 100644 (file)
--- a/jpeg.c
+++ b/jpeg.c
@@ -626,7 +626,7 @@ unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize, int *m
        image_width = cinfo.output_width;
        image_height = cinfo.output_height;
 
-       if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+       if (image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
        {
                Con_Printf("JPEG_LoadImage: invalid image size %ix%i\n", image_width, image_height);
                return NULL;