X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=image.c;h=1f15a2fce253d4d330d7edb1e05d5935d800222d;hb=77af8a073b9006fbdf7aa2e7bc92dba2f22b25af;hp=ccc59f2eeff3e99dfd1c6473e28c5a779f4dfe86;hpb=c3edd749ac26c6322eafa8303e592df3c32ffd25;p=xonotic%2Fdarkplaces.git

diff --git a/image.c b/image.c
index ccc59f2e..1f15a2fc 100644
--- a/image.c
+++ b/image.c
@@ -8,7 +8,7 @@
 int		image_width;
 int		image_height;
 
-void Image_CopyAlphaFromBlueBGRA(unsigned char *outpixels, const unsigned char *inpixels, int w, int h)
+static void Image_CopyAlphaFromBlueBGRA(unsigned char *outpixels, const unsigned char *inpixels, int w, int h)
 {
 	int i, n;
 	n = w * h;
@@ -189,7 +189,7 @@ typedef struct pcx_s
 LoadPCX
 ============
 */
-unsigned char* LoadPCX_BGRA (const unsigned char *f, int filesize)
+static unsigned char* LoadPCX_BGRA (const unsigned char *f, int filesize, int *miplevel)
 {
 	pcx_t pcx;
 	unsigned char *a, *b, *image_buffer, *pbuf;
@@ -219,7 +219,7 @@ unsigned char* LoadPCX_BGRA (const unsigned char *f, int filesize)
 
 	image_width = pcx.xmax + 1 - pcx.xmin;
 	image_height = pcx.ymax + 1 - pcx.ymin;
-	if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 || pcx.bits_per_pixel != 8 || image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+	if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 || pcx.bits_per_pixel != 8 || image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
 	{
 		Con_Print("Bad pcx file\n");
 		return NULL;
@@ -354,6 +354,19 @@ qboolean LoadPCX_QWSkin(const unsigned char *f, int filesize, unsigned char *pix
 	return true;
 }
 
+/*
+============
+LoadPCX
+============
+*/
+qboolean LoadPCX_PaletteOnly(const unsigned char *f, int filesize, unsigned char *palette768b)
+{
+	if (filesize < 768)
+		return false;
+	memcpy(palette768b, f + filesize - 768, 768);
+	return true;
+}
+
 /*
 =========================================================
 
@@ -372,7 +385,7 @@ typedef struct _TargaHeader
 }
 TargaHeader;
 
-void PrintTargaHeader(TargaHeader *t)
+static void PrintTargaHeader(TargaHeader *t)
 {
 	Con_Printf("TargaHeader:\nuint8 id_length = %i;\nuint8 colormap_type = %i;\nuint8 image_type = %i;\nuint16 colormap_index = %i;\nuint16 colormap_length = %i;\nuint8 colormap_size = %i;\nuint16 x_origin = %i;\nuint16 y_origin = %i;\nuint16 width = %i;\nuint16 height = %i;\nuint8 pixel_size = %i;\nuint8 attributes = %i;\n", t->id_length, t->colormap_type, t->image_type, t->colormap_index, t->colormap_length, t->colormap_size, t->x_origin, t->y_origin, t->width, t->height, t->pixel_size, t->attributes);
 }
@@ -382,7 +395,7 @@ void PrintTargaHeader(TargaHeader *t)
 LoadTGA
 =============
 */
-unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize)
+unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize, int *miplevel)
 {
 	int x, y, pix_inc, row_inci, runlen, alphabits;
 	unsigned char *image_buffer;
@@ -416,13 +429,15 @@ unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize)
 	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);
 		return NULL;
 	}
 
+	memset(palettei, 0, sizeof(palettei));
+
 	// advance to end of header
 	fin = f + 18;
 
@@ -537,8 +552,6 @@ unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize)
 		row_inci = 0;
 	}
 
-	x = 0;
-	y = 0;
 	pix_inc = 1;
 	if ((targa_header.image_type & ~8) == 2)
 		pix_inc = (targa_header.pixel_size + 7) / 8;
@@ -609,6 +622,13 @@ unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize)
 						*pixbufi++ = palettei[*fin++];
 				}
 			}
+
+			if (x != image_width)
+			{
+				// pixbufi is useless now
+				Con_Printf("LoadTGA: corrupt file\n");
+				break;
+			}
 		}
 		break;
 	case 10:
@@ -657,6 +677,13 @@ unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize)
 						}
 					}
 				}
+
+				if (x != image_width)
+				{
+					// pixbufi is useless now
+					Con_Printf("LoadTGA: corrupt file\n");
+					break;
+				}
 			}
 		}
 		else
@@ -703,6 +730,13 @@ unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize)
 						}
 					}
 				}
+
+				if (x != image_width)
+				{
+					// pixbufi is useless now
+					Con_Printf("LoadTGA: corrupt file\n");
+					break;
+				}
 			}
 		}
 		break;
@@ -725,7 +759,7 @@ typedef struct q2wal_s
 	int			value;
 } q2wal_t;
 
-unsigned char *LoadWAL_BGRA (const unsigned char *f, int filesize)
+static unsigned char *LoadWAL_BGRA (const unsigned char *f, int filesize, int *miplevel)
 {
 	unsigned char *image_buffer;
 	const q2wal_t *inwal = (const q2wal_t *)f;
@@ -738,13 +772,13 @@ unsigned char *LoadWAL_BGRA (const unsigned char *f, int filesize)
 
 	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;
 	}
 
-	if (filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height)
+	if (filesize < (int) LittleLong(inwal->offsets[0]) + image_width * image_height)
 	{
 		Con_Print("LoadWAL: invalid WAL file\n");
 		return NULL;
@@ -756,10 +790,50 @@ unsigned char *LoadWAL_BGRA (const unsigned char *f, int filesize)
 		Con_Printf("LoadWAL: not enough memory for %i by %i image\n", image_width, image_height);
 		return NULL;
 	}
-	Image_Copy8bitBGRA(f + LittleLong(inwal->offsets[0]), image_buffer, image_width * image_height, palette_bgra_complete);
+	Image_Copy8bitBGRA(f + LittleLong(inwal->offsets[0]), image_buffer, image_width * image_height, q2palette_bgra_complete);
 	return image_buffer;
 }
 
+qboolean LoadWAL_GetMetadata(const unsigned char *f, int filesize, int *retwidth, int *retheight, int *retflags, int *retvalue, int *retcontents, char *retanimname32c)
+{
+	const q2wal_t *inwal = (const q2wal_t *)f;
+
+	if (filesize < (int) sizeof(q2wal_t))
+	{
+		Con_Print("LoadWAL: invalid WAL file\n");
+		if (retwidth)
+			*retwidth = 16;
+		if (retheight)
+			*retheight = 16;
+		if (retflags)
+			*retflags = 0;
+		if (retvalue)
+			*retvalue = 0;
+		if (retcontents)
+			*retcontents = 0;
+		if (retanimname32c)
+			memset(retanimname32c, 0, 32);
+		return false;
+	}
+
+	if (retwidth)
+		*retwidth = LittleLong(inwal->width);
+	if (retheight)
+		*retheight = LittleLong(inwal->height);
+	if (retflags)
+		*retflags = LittleLong(inwal->flags);
+	if (retvalue)
+		*retvalue = LittleLong(inwal->value);
+	if (retcontents)
+		*retcontents = LittleLong(inwal->contents);
+	if (retanimname32c)
+	{
+		memcpy(retanimname32c, inwal->animname, 32);
+		retanimname32c[31] = 0;
+	}
+	return true;
+}
+
 
 void Image_StripImageExtension (const char *in, char *out, size_t size_out)
 {
@@ -769,13 +843,14 @@ void Image_StripImageExtension (const char *in, char *out, size_t size_out)
 		return;
 
 	ext = FS_FileExtension(in);
-	if (ext && (!strcmp(ext, "tga") || !strcmp(ext, "pcx") || !strcmp(ext, "lmp") || !strcmp(ext, "png") || !strcmp(ext, "jpg")))
+	if (ext && (!strcmp(ext, "tga") || !strcmp(ext, "pcx") || !strcmp(ext, "lmp") || !strcmp(ext, "png") || !strcmp(ext, "jpg") || !strcmp(ext, "wal")))
 		FS_StripExtension(in, out, size_out);
 	else
 		strlcpy(out, in, size_out);
 }
 
 static unsigned char image_linearfromsrgb[256];
+static unsigned char image_srgbfromlinear_lightmap[256];
 
 void Image_MakeLinearColorsFromsRGB(unsigned char *pout, const unsigned char *pin, int numpixels)
 {
@@ -783,7 +858,7 @@ void Image_MakeLinearColorsFromsRGB(unsigned char *pout, const unsigned char *pi
 	// this math from http://www.opengl.org/registry/specs/EXT/texture_sRGB.txt
 	if (!image_linearfromsrgb[255])
 		for (i = 0;i < 256;i++)
-			image_linearfromsrgb[i] = i < 11 ? (int)(i / 12.92f) : (int)(pow((i/256.0f + 0.055f)/1.0555f, 2.4)*256.0f);
+			image_linearfromsrgb[i] = (unsigned char)floor(Image_LinearFloatFromsRGB(i) * 255.0f + 0.5f);
 	for (i = 0;i < numpixels;i++)
 	{
 		pout[i*4+0] = image_linearfromsrgb[pin[i*4+0]];
@@ -793,10 +868,26 @@ void Image_MakeLinearColorsFromsRGB(unsigned char *pout, const unsigned char *pi
 	}
 }
 
+void Image_MakesRGBColorsFromLinear_Lightmap(unsigned char *pout, const unsigned char *pin, int numpixels)
+{
+	int i;
+	// this math from http://www.opengl.org/registry/specs/EXT/texture_sRGB.txt
+	if (!image_srgbfromlinear_lightmap[255])
+		for (i = 0;i < 256;i++)
+			image_srgbfromlinear_lightmap[i] = (unsigned char)floor(bound(0.0f, Image_sRGBFloatFromLinear_Lightmap(i), 1.0f) * 255.0f + 0.5f);
+	for (i = 0;i < numpixels;i++)
+	{
+		pout[i*4+0] = image_srgbfromlinear_lightmap[pin[i*4+0]];
+		pout[i*4+1] = image_srgbfromlinear_lightmap[pin[i*4+1]];
+		pout[i*4+2] = image_srgbfromlinear_lightmap[pin[i*4+2]];
+		pout[i*4+3] = pin[i*4+3];
+	}
+}
+
 typedef struct imageformat_s
 {
 	const char *formatstring;
-	unsigned char *(*loadfunc)(const unsigned char *f, int filesize);
+	unsigned char *(*loadfunc)(const unsigned char *f, int filesize, int *miplevel);
 }
 imageformat_t;
 
@@ -872,12 +963,13 @@ imageformat_t imageformats_other[] =
 };
 
 int fixtransparentpixels(unsigned char *data, int w, int h);
-unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qboolean allowFixtrans, qboolean convertsRGB)
+unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qboolean allowFixtrans, qboolean convertsRGB, int *miplevel)
 {
 	fs_offset_t filesize;
 	imageformat_t *firstformat, *format;
 	unsigned char *f, *data = NULL, *data2 = NULL;
 	char basename[MAX_QPATH], name[MAX_QPATH], name2[MAX_QPATH], *c;
+	char vabuf[1024];
 	//if (developer_memorydebug.integer)
 	//	Mem_CheckSentinelsGlobal();
 	if (developer_texturelogging.integer)
@@ -914,24 +1006,38 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
 		f = FS_LoadFile(name, tempmempool, true, &filesize);
 		if (f)
 		{
-			data = format->loadfunc(f, (int)filesize);
+			int mymiplevel = miplevel ? *miplevel : 0;
+			image_width = 0;
+			image_height = 0;
+			data = format->loadfunc(f, (int)filesize, &mymiplevel);
 			Mem_Free(f);
-			if(format->loadfunc == JPEG_LoadImage_BGRA) // jpeg can't do alpha, so let's simulate it by loading another jpeg
+			if (data)
 			{
-				dpsnprintf (name2, sizeof(name2), format->formatstring, va("%s_alpha", basename));
-				f = FS_LoadFile(name2, tempmempool, true, &filesize);
-				if(f)
+				if(format->loadfunc == JPEG_LoadImage_BGRA) // jpeg can't do alpha, so let's simulate it by loading another jpeg
 				{
-					data2 = format->loadfunc(f, (int)filesize);
-					Mem_Free(f);
-					Image_CopyAlphaFromBlueBGRA(data, data2, image_width, image_height);
-					Mem_Free(data2);
+					dpsnprintf (name2, sizeof(name2), format->formatstring, va(vabuf, sizeof(vabuf), "%s_alpha", basename));
+					f = FS_LoadFile(name2, tempmempool, true, &filesize);
+					if(f)
+					{
+						int mymiplevel2 = miplevel ? *miplevel : 0;
+						int image_width_save = image_width;
+						int image_height_save = image_height;
+						data2 = format->loadfunc(f, (int)filesize, &mymiplevel2);
+						if(data2 && mymiplevel == mymiplevel2 && image_width == image_width_save && image_height == image_height_save)
+							Image_CopyAlphaFromBlueBGRA(data, data2, image_width, image_height);
+						else
+							Con_Printf("loadimagepixelsrgba: corrupt or invalid alpha image %s_alpha\n", basename);
+						image_width = image_width_save;
+						image_height = image_height_save;
+						if(data2)
+							Mem_Free(data2);
+						Mem_Free(f);
+					}
 				}
-			}
-			if (data)
-			{
 				if (developer_loading.integer)
 					Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height);
+				if(miplevel)
+					*miplevel = mymiplevel;
 				//if (developer_memorydebug.integer)
 				//	Mem_CheckSentinelsGlobal();
 				if(allowFixtrans && r_fixtrans_auto.integer)
@@ -976,13 +1082,15 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
 	return NULL;
 }
 
-rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, qboolean complain, int flags, qboolean allowFixtrans, qboolean convertsRGB)
+extern cvar_t gl_picmip;
+rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, qboolean complain, int flags, qboolean allowFixtrans, qboolean sRGB)
 {
 	unsigned char *data;
 	rtexture_t *rt;
-	if (!(data = loadimagepixelsbgra (filename, complain, allowFixtrans, convertsRGB)))
+	int miplevel = R_PicmipForFlags(flags);
+	if (!(data = loadimagepixelsbgra (filename, complain, allowFixtrans, false, &miplevel)))
 		return 0;
-	rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_BGRA, flags, NULL);
+	rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, sRGB ? TEXTYPE_SRGB_BGRA : TEXTYPE_BGRA, flags, miplevel, NULL);
 	Mem_Free(data);
 	return rt;
 }
@@ -1128,7 +1236,7 @@ void Image_FixTransparentPixels_f(void)
 		Con_Printf("Processing %s... ", filename);
 		Image_StripImageExtension(filename, buf, sizeof(buf));
 		dpsnprintf(outfilename, sizeof(outfilename), "fixtrans/%s.tga", buf);
-		if(!(data = loadimagepixelsbgra(filename, true, false, false)))
+		if(!(data = loadimagepixelsbgra(filename, true, false, false, NULL)))
 			return;
 		if((n = fixtransparentpixels(data, image_width, image_height)))
 		{
@@ -1259,7 +1367,7 @@ static void Image_Resample32LerpLine (const unsigned char *in, unsigned char *ou
 }
 
 #define LERPBYTE(i) r = resamplerow1[i];out[i] = (unsigned char) ((((resamplerow2[i] - r) * lerp) >> 16) + r)
-void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+static 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;
 	unsigned char *out;
@@ -1363,7 +1471,7 @@ void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *o
 	resamplerow2 = NULL;
 }
 
-void Image_Resample32Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+static void Image_Resample32Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
 {
 	int i, j;
 	unsigned frac, fracstep;