X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=image.c;h=6bca15aa45ae45a73179c278d5e657b07b3524c7;hb=8b091b094f8361e295450b8eb5c0d7cdf28514e5;hp=71cacb6e0b7e25168e61fb647997f5d7114474a0;hpb=e77a0ac55f772695996f145d103bd8ffd81487fd;p=xonotic%2Fdarkplaces.git

diff --git a/image.c b/image.c
index 71cacb6e..6bca15aa 100644
--- a/image.c
+++ b/image.c
@@ -26,14 +26,14 @@ void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int
 		if (inputflipdiagonal)
 		{
 			for (x = 0, line = inpixels + col_ofs; x < inputwidth; x++, line += col_inc)
-				for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numinputcomponents)
+				for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numoutputcomponents)
 					for (c = 0; c < numoutputcomponents; c++)
 						outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index];
 		}
 		else
 		{
 			for (y = 0, line = inpixels + row_ofs; y < inputheight; y++, line += row_inc)
-				for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numinputcomponents)
+				for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numoutputcomponents)
 					for (c = 0; c < numoutputcomponents; c++)
 						outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index];
 		}
@@ -44,14 +44,14 @@ void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int
 		if (inputflipdiagonal)
 		{
 			for (x = 0, line = inpixels + col_ofs; x < inputwidth; x++, line += col_inc)
-				for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numinputcomponents)
+				for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numoutputcomponents)
 					for (c = 0; c < numoutputcomponents; c++)
 						outpixels[c] = in[outputinputcomponentindices[c]];
 		}
 		else
 		{
 			for (y = 0, line = inpixels + row_ofs; y < inputheight; y++, line += row_inc)
-				for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numinputcomponents)
+				for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numoutputcomponents)
 					for (c = 0; c < numoutputcomponents; c++)
 						outpixels[c] = in[outputinputcomponentindices[c]];
 		}
@@ -327,14 +327,15 @@ unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize)
 	targa_header.y_origin = f[10] + f[11] * 256;
 	targa_header.width = image_width = f[12] + f[13] * 256;
 	targa_header.height = image_height = f[14] + f[15] * 256;
+	targa_header.pixel_size = f[16];
+	targa_header.attributes = f[17];
+
 	if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
 	{
 		Con_Print("LoadTGA: invalid size\n");
 		PrintTargaHeader(&targa_header);
 		return NULL;
 	}
-	targa_header.pixel_size = f[16];
-	targa_header.attributes = f[17];
 
 	// advance to end of header
 	fin = f + 18;
@@ -702,6 +703,10 @@ imageformat_t imageformats_tenebrae[] =
 	{"override/%s.png", PNG_LoadImage_BGRA},
 	{"override/%s.jpg", JPEG_LoadImage_BGRA},
 	{"override/%s.pcx", LoadPCX_BGRA},
+	{"%s.tga", LoadTGA_BGRA},
+	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.pcx", LoadPCX_BGRA},
 	{NULL, NULL}
 };
 
@@ -801,7 +806,7 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
 	// now try all the formats in the selected list
 	for (format = firstformat;format->formatstring;format++)
 	{
-		sprintf (name, format->formatstring, basename);
+		dpsnprintf (name, sizeof(name), format->formatstring, basename);
 		f = FS_LoadFile(name, tempmempool, true, &filesize);
 		if (f)
 		{
@@ -832,10 +837,7 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
 				return data;
 			}
 			else
-			{
-				if (developer.integer >= 1)
-					Con_DPrintf("Error loading image %s (file loaded but decode failed)\n", name);
-			}
+				Con_DPrintf("Error loading image %s (file loaded but decode failed)\n", name);
 		}
 	}
 	if (complain)
@@ -843,7 +845,7 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
 		Con_Printf("Couldn't load %s using ", filename);
 		for (format = firstformat;format->formatstring;format++)
 		{
-			sprintf (name, format->formatstring, basename);
+			dpsnprintf (name, sizeof(name), format->formatstring, basename);
 			Con_Printf(format == firstformat ? "\"%s\"" : (format[1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), format->formatstring);
 		}
 	}