X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=image.c;h=ebed474304d363f9e75d7af9a7d5169247d0dea2;hb=e88a73794afa1f0fe65fc70d318f4e288cabc0d1;hp=86c3d9eeb15c108480be03a124fd130e988bc444;hpb=8bd9d978b4c3c249c7adf0b7f645e61b0f4ec513;p=xonotic%2Fdarkplaces.git

diff --git a/image.c b/image.c
index 86c3d9ee..ebed4743 100644
--- a/image.c
+++ b/image.c
@@ -311,7 +311,7 @@ LoadTGA
 */
 qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 {
-	int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex;
+	int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex, alphabits;
 	qbyte *pixbuf, *image_rgba;
 	const qbyte *fin, *enddata;
 	TargaHeader targa_header;
@@ -344,26 +344,17 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 	targa_header.pixel_size = f[16];
 	targa_header.attributes = f[17];
 
+	// advance to end of header
 	fin = f + 18;
-	if (targa_header.id_length != 0)
-		fin += targa_header.id_length;  // skip TARGA image comment
-	if (targa_header.image_type == 2 || targa_header.image_type == 10)
-	{
-		if (targa_header.pixel_size != 24 && targa_header.pixel_size != 32)
-		{
-			Con_Print("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n");
-			PrintTargaHeader(&targa_header);
-			return NULL;
-		}
-	}
-	else if (targa_header.image_type == 1 || targa_header.image_type == 9)
+
+	// skip TARGA image comment (usually 0 bytes)
+	fin += targa_header.id_length;
+
+	// read/skip the colormap if present (note: according to the TARGA spec it
+	// can be present even on truecolor or greyscale images, just not used by
+	// the image data)
+	if (targa_header.colormap_type)
 	{
-		if (targa_header.pixel_size != 8)
-		{
-			Con_Print("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
-			PrintTargaHeader(&targa_header);
-			return NULL;
-		}
 		if (targa_header.colormap_length > 256)
 		{
 			Con_Print("LoadTGA: only up to 256 colormap_length supported\n");
@@ -403,6 +394,26 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 			return NULL;
 		}
 	}
+
+	// check our pixel_size restrictions according to image_type
+	if (targa_header.image_type == 2 || targa_header.image_type == 10)
+	{
+		if (targa_header.pixel_size != 24 && targa_header.pixel_size != 32)
+		{
+			Con_Print("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n");
+			PrintTargaHeader(&targa_header);
+			return NULL;
+		}
+	}
+	else if (targa_header.image_type == 1 || targa_header.image_type == 9)
+	{
+		if (targa_header.pixel_size != 8)
+		{
+			Con_Print("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
+			PrintTargaHeader(&targa_header);
+			return NULL;
+		}
+	}
 	else if (targa_header.image_type == 3 || targa_header.image_type == 11)
 	{
 		if (targa_header.pixel_size != 8)
@@ -444,6 +455,14 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 		row_inc = 0;
 	}
 
+	// number of attribute bits per pixel, we only support 0 or 8
+	alphabits = targa_header.attributes & 0x0F;
+	if (alphabits != 8 && alphabits != 0)
+	{
+		Con_Print("LoadTGA: only 0 or 8 attribute (alpha) bits supported\n");
+		return NULL;
+	}
+
 	compressed = targa_header.image_type == 9 || targa_header.image_type == 10 || targa_header.image_type == 11;
 	x = 0;
 	y = 0;
@@ -501,6 +520,8 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 						red = green = blue = *fin++;
 						break;
 					}
+					if (!alphabits)
+						alpha = 255;
 				}
 			}
 			*pixbuf++ = red;
@@ -571,11 +592,6 @@ static qbyte *LoadLMPRGBA (const qbyte *f, int matchwidth, int matchheight)
 	return LoadLMP(f, matchwidth, matchheight, false);
 }
 
-qbyte *LoadLMPAs8Bit (const qbyte *f, int matchwidth, int matchheight)
-{
-	return LoadLMP(f, matchwidth, matchheight, true);
-}
-
 
 typedef struct
 {
@@ -674,7 +690,10 @@ qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth,
 	char basename[MAX_QPATH], name[MAX_QPATH], *c;
 	if (developer_memorydebug.integer)
 		Mem_CheckSentinelsGlobal();
-	Image_StripImageExtension(filename, basename); // strip filename extensions to allow replacement by other types
+	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
 	// replace *'s with #, so commandline utils don't get confused when dealing with the external files
 	for (c = basename;*c;c++)
 		if (*c == '*')
@@ -1003,20 +1022,20 @@ static void Image_Resample24LerpLine (const qbyte *in, qbyte *out, int inwidth,
 	}
 }
 
-int resamplerowsize = 0;
-qbyte *resamplerow1 = NULL;
-qbyte *resamplerow2 = NULL;
-mempool_t *resamplemempool = NULL;
-
 #define LERPBYTE(i) r = resamplerow1[i];out[i] = (qbyte) ((((resamplerow2[i] - r) * lerp) >> 16) + r)
 void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
 {
 	int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth4 = inwidth*4, outwidth4 = outwidth*4;
 	qbyte *out;
 	const qbyte *inrow;
+	qbyte *resamplerow1;
+	qbyte *resamplerow2;
 	out = outdata;
 	fstep = (int) (inheight*65536.0f/outheight);
 
+	resamplerow1 = Mem_Alloc(tempmempool, outwidth*4*2);
+	resamplerow2 = resamplerow1 + outwidth*4;
+
 	inrow = indata;
 	oldy = 0;
 	Image_Resample32LerpLine (inrow, resamplerow1, inwidth, outwidth);
@@ -1102,9 +1121,13 @@ void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *o
 			memcpy(out, resamplerow1, outwidth4);
 		}
 	}
+
+	Mem_Free(resamplerow1);
+	resamplerow1 = NULL;
+	resamplerow2 = NULL;
 }
 
-void Image_Resample32Nearest(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+void Image_Resample32Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
 {
 	int i, j;
 	unsigned frac, fracstep;
@@ -1146,9 +1169,14 @@ void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *o
 	int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3;
 	qbyte *out;
 	const qbyte *inrow;
+	qbyte *resamplerow1;
+	qbyte *resamplerow2;
 	out = outdata;
 	fstep = (int) (inheight*65536.0f/outheight);
 
+	resamplerow1 = Mem_Alloc(tempmempool, outwidth*3*2);
+	resamplerow2 = resamplerow1 + outwidth*3;
+
 	inrow = indata;
 	oldy = 0;
 	Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
@@ -1227,6 +1255,9 @@ void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *o
 			memcpy(out, resamplerow1, outwidth3);
 		}
 	}
+	Mem_Free(resamplerow1);
+	resamplerow1 = NULL;
+	resamplerow2 = NULL;
 }
 
 void Image_Resample24Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
@@ -1273,22 +1304,12 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth,
 {
 	if (indepth != 1 || outdepth != 1)
 		Sys_Error("Image_Resample: 3D resampling not supported\n");
-	if (resamplerowsize < outwidth*4)
-	{
-		if (resamplerow1)
-			Mem_Free(resamplerow1);
-		resamplerowsize = outwidth*4;
-		if (!resamplemempool)
-			resamplemempool = Mem_AllocPool("Image Scaling Buffer", 0, NULL);
-		resamplerow1 = Mem_Alloc(resamplemempool, resamplerowsize*2);
-		resamplerow2 = resamplerow1 + resamplerowsize;
-	}
 	if (bytesperpixel == 4)
 	{
 		if (quality)
 			Image_Resample32Lerp(indata, inwidth, inheight, outdata, outwidth, outheight);
 		else
-			Image_Resample32Nearest(indata, inwidth, inheight, outdata, outwidth, outheight);
+			Image_Resample32Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
 	}
 	else if (bytesperpixel == 3)
 	{
@@ -1474,8 +1495,8 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou
 			n[1] = dv[0][2]*dv[1][0]-dv[0][0]*dv[1][2];
 			n[2] = dv[0][0]*dv[1][1]-dv[0][1]*dv[1][0];
 			*/
-			n[0] = ((p1[0] + p1[1] + p1[2]) - (p0[0] + p0[1] + p0[2]));
-			n[1] = ((p0[0] + p0[1] + p0[2]) - (p2[0] + p2[1] + p2[2]));
+			n[0] = ((p0[0] + p0[1] + p0[2]) - (p1[0] + p1[1] + p1[2]));
+			n[1] = ((p2[0] + p2[1] + p2[2]) - (p0[0] + p0[1] + p0[2]));
 			n[2] = ibumpscale;
 			VectorNormalize(n);
 			/*
@@ -1501,7 +1522,8 @@ int image_loadskin(imageskin_t *s, char *shadername)
 	qbyte *bumppixels;
 	int bumppixels_width, bumppixels_height;
 	char name[MAX_QPATH];
-	Image_StripImageExtension(shadername, name);
+	strlcpy(name, shadername, sizeof(name));
+	Image_StripImageExtension(name, name);
 	memset(s, 0, sizeof(*s));
 	s->basepixels = loadimagepixels(name, false, 0, 0);
 	if (s->basepixels == NULL)