fix two crashes that divVerent found and fixed but didn't commit

[xonotic/darkplaces.git] / gl_textures.c

diff --git a/gl_textures.c b/gl_textures.c
index 2302eef8abb7f9cdfffca58353dc125c71721936..00a9c33d7e9355257bf27ca78e1df05669a5e3b0 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -1941,7 +1941,7 @@ int R_SaveTextureDDSFile(rtexture_t *rt, const char *filename, qboolean skipunco
        mipinfo[0][0] = glt->tilewidth;
        mipinfo[0][1] = glt->tileheight;
        mipmaps = 1;
-       if (glt->flags & TEXF_MIPMAP)
+       if ((glt->flags & TEXF_MIPMAP) && !(glt->tilewidth == 1 && glt->tilewidth == 1))
        {
                for (mip = 1;mip < 16;mip++)
                {
@@ -2208,7 +2208,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen
                bytesperblock = 8;
                ddssize -= 128;
                ddssize /= 2;
-               for (i = 0;i < ddssize;i += bytesperblock)
+               for (i = 0;i < (int)ddssize;i += bytesperblock)
                        memcpy(&ddspixels[i], &ddspixels[(i<<1)+8], 8);
                ddssize += 128;
        }