X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=image.c;h=fc73fd1bbbb15b697f61d38bcdf6cc8269cce808;hb=9cc276c2e36a6fc6cfafd8a0fb6df85e2f644c07;hp=185c66d360732d772053180d35344fc60c8b50e4;hpb=f716f8f488d519c27082826c81b7420e7dbe1743;p=xonotic%2Fdarkplaces.git

diff --git a/image.c b/image.c
index 185c66d3..fc73fd1b 100644
--- a/image.c
+++ b/image.c
@@ -2,6 +2,7 @@
 #include "quakedef.h"
 #include "image.h"
 #include "jpeg.h"
+#include "image_png.h"
 #include "r_shadow.h"
 
 int		image_width;
@@ -9,10 +10,10 @@ int		image_height;
 
 #if 1
 // written by LordHavoc in a readable way, optimized by Vic, further optimized by LordHavoc (the non-special index case), readable version preserved below this
-void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices)
+void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices)
 {
 	int index, c, x, y;
-	const qbyte *in, *line;
+	const unsigned char *in, *line;
 	int row_inc = (inputflipy ? -inputwidth : inputwidth) * numinputcomponents, col_inc = (inputflipx ? -1 : 1) * numinputcomponents;
 	int row_ofs = (inputflipy ? (inputheight - 1) * inputwidth * numinputcomponents : 0), col_ofs = (inputflipx ? (inputwidth - 1) * numinputcomponents : 0);
 
@@ -58,10 +59,10 @@ void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int inputwidth, int
 }
 #else
 // intentionally readable version
-void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices)
+void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices)
 {
 	int index, c, x, y;
-	const qbyte *in, *inrow, *incolumn;
+	const unsigned char *in, *inrow, *incolumn;
 	if (inputflipdiagonal)
 	{
 		for (x = 0;x < inputwidth;x++)
@@ -101,7 +102,7 @@ void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int inputwidth, int
 }
 #endif
 
-void Image_GammaRemapRGB(const qbyte *in, qbyte *out, int pixels, const qbyte *gammar, const qbyte *gammag, const qbyte *gammab)
+void Image_GammaRemapRGB(const unsigned char *in, unsigned char *out, int pixels, const unsigned char *gammar, const unsigned char *gammag, const unsigned char *gammab)
 {
 	while (pixels--)
 	{
@@ -114,9 +115,9 @@ void Image_GammaRemapRGB(const qbyte *in, qbyte *out, int pixels, const qbyte *g
 }
 
 // note: pal must be 32bit color
-void Image_Copy8bitRGBA(const qbyte *in, qbyte *out, int pixels, const unsigned int *pal)
+void Image_Copy8bitRGBA(const unsigned char *in, unsigned char *out, int pixels, const unsigned int *pal)
 {
-	int *iout = (void *)out;
+	int *iout = (int *)out;
 	while (pixels >= 8)
 	{
 		iout[0] = pal[in[0]];
@@ -159,7 +160,7 @@ void Image_Copy8bitRGBA(const qbyte *in, qbyte *out, int pixels, const unsigned
 =================================================================
 */
 
-typedef struct
+typedef struct pcx_s
 {
     char	manufacturer;
     char	version;
@@ -180,14 +181,14 @@ typedef struct
 LoadPCX
 ============
 */
-qbyte* LoadPCX (const qbyte *f, int matchwidth, int matchheight)
+unsigned char* LoadPCX (const unsigned char *f, int filesize, int matchwidth, int matchheight)
 {
 	pcx_t pcx;
-	qbyte *a, *b, *image_rgba, *pbuf;
-	const qbyte *palette, *fin, *enddata;
+	unsigned char *a, *b, *image_rgba, *pbuf;
+	const unsigned char *palette, *fin, *enddata;
 	int x, y, x2, dataByte;
 
-	if (fs_filesize < (int)sizeof(pcx) + 768)
+	if (filesize < (int)sizeof(pcx) + 768)
 	{
 		Con_Print("Bad pcx file\n");
 		return NULL;
@@ -218,9 +219,9 @@ qbyte* LoadPCX (const qbyte *f, int matchwidth, int matchheight)
 	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
 		return NULL;
 
-	palette = f + fs_filesize - 768;
+	palette = f + filesize - 768;
 
-	image_rgba = Mem_Alloc(tempmempool, image_width*image_height*4);
+	image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width*image_height*4);
 	if (!image_rgba)
 	{
 		Con_Printf("LoadPCX: not enough memory for %i by %i image\n", image_width, image_height);
@@ -289,19 +290,7 @@ TargaHeader;
 
 void PrintTargaHeader(TargaHeader *t)
 {
-	Con_Print("TargaHeader:\n");
-	Con_Printf("uint8 id_length = %i;\n", t->id_length);
-	Con_Printf("uint8 colormap_type = %i;\n", t->colormap_type);
-	Con_Printf("uint8 image_type = %i;\n", t->image_type);
-	Con_Printf("uint16 colormap_index = %i;\n", t->colormap_index);
-	Con_Printf("uint16 colormap_length = %i;\n", t->colormap_length);
-	Con_Printf("uint8 colormap_size = %i;\n", t->colormap_size);
-	Con_Printf("uint16 x_origin = %i;\n", t->x_origin);
-	Con_Printf("uint16 y_origin = %i;\n", t->y_origin);
-	Con_Printf("uint16 width = %i;\n", t->width);
-	Con_Printf("uint16 height = %i;\n", t->height);
-	Con_Printf("uint8 pixel_size = %i;\n", t->pixel_size);
-	Con_Printf("uint8 attributes = %i;\n", t->attributes);
+	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);
 }
 
 /*
@@ -309,18 +298,19 @@ void PrintTargaHeader(TargaHeader *t)
 LoadTGA
 =============
 */
-qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
+unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, int matchheight)
 {
 	int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex, alphabits;
-	qbyte *pixbuf, *image_rgba;
-	const qbyte *fin, *enddata;
+	unsigned char *pixbuf, *image_rgba;
+	const unsigned char *fin, *enddata;
+	unsigned char *p;
 	TargaHeader targa_header;
-	unsigned char palette[256*4], *p;
+	unsigned char palette[256*4];
 
-	if (fs_filesize < 19)
+	if (filesize < 19)
 		return NULL;
 
-	enddata = f + fs_filesize;
+	enddata = f + filesize;
 
 	targa_header.id_length = f[0];
 	targa_header.colormap_type = f[1];
@@ -436,7 +426,15 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 		return NULL;
 	}
 
-	image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4);
+	// 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;
+	}
+
+	image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
 	if (!image_rgba)
 	{
 		Con_Printf("LoadTGA: not enough memory for %i by %i image\n", image_width, image_height);
@@ -455,14 +453,6 @@ 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;
@@ -547,11 +537,11 @@ qbyte *LoadTGA (const qbyte *f, int matchwidth, int matchheight)
 LoadLMP
 ============
 */
-qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight, qboolean loadAs8Bit)
+unsigned char *LoadLMP (const unsigned char *f, int filesize, int matchwidth, int matchheight, qboolean loadAs8Bit)
 {
-	qbyte *image_buffer;
+	unsigned char *image_buffer;
 
-	if (fs_filesize < 9)
+	if (filesize < 9)
 	{
 		Con_Print("LoadLMP: invalid LMP file\n");
 		return NULL;
@@ -568,7 +558,7 @@ qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight, qboolean loadAs
 	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
 		return NULL;
 
-	if (fs_filesize < 8 + image_width * image_height)
+	if (filesize < (8 + image_width * image_height))
 	{
 		Con_Print("LoadLMP: invalid LMP file\n");
 		return NULL;
@@ -576,24 +566,24 @@ qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight, qboolean loadAs
 
 	if (loadAs8Bit)
 	{
-		image_buffer = Mem_Alloc(tempmempool, image_width * image_height);
+		image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height);
 		memcpy(image_buffer, f + 8, image_width * image_height);
 	}
 	else
 	{
-		image_buffer = Mem_Alloc(tempmempool, image_width * image_height * 4);
-		Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_complete);
+		image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
+		Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_transparent);
 	}
 	return image_buffer;
 }
 
-static qbyte *LoadLMPRGBA (const qbyte *f, int matchwidth, int matchheight)
+static unsigned char *LoadLMPRGBA (const unsigned char *f, int filesize, int matchwidth, int matchheight)
 {
-	return LoadLMP(f, matchwidth, matchheight, false);
+	return LoadLMP(f, filesize, matchwidth, matchheight, false);
 }
 
 
-typedef struct
+typedef struct q2wal_s
 {
 	char		name[32];
 	unsigned	width, height;
@@ -604,12 +594,12 @@ typedef struct
 	int			value;
 } q2wal_t;
 
-qbyte *LoadWAL (const qbyte *f, int matchwidth, int matchheight)
+unsigned char *LoadWAL (const unsigned char *f, int filesize, int matchwidth, int matchheight)
 {
-	qbyte *image_rgba;
-	const q2wal_t *inwal = (const void *)f;
+	unsigned char *image_rgba;
+	const q2wal_t *inwal = (const q2wal_t *)f;
 
-	if (fs_filesize < (int) sizeof(q2wal_t))
+	if (filesize < (int) sizeof(q2wal_t))
 	{
 		Con_Print("LoadWAL: invalid WAL file\n");
 		return NULL;
@@ -625,13 +615,13 @@ qbyte *LoadWAL (const qbyte *f, int matchwidth, int matchheight)
 	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
 		return NULL;
 
-	if ((int) fs_filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height)
+	if (filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height)
 	{
 		Con_Print("LoadWAL: invalid WAL file\n");
 		return NULL;
 	}
 
-	image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4);
+	image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
 	if (!image_rgba)
 	{
 		Con_Printf("LoadLMP: not enough memory for %i by %i image\n", image_width, image_height);
@@ -663,34 +653,41 @@ void Image_StripImageExtension (const char *in, char *out)
 		strcpy(out, in);
 }
 
-struct
+struct imageformat_s
 {
 	const char *formatstring;
-	qbyte *(*loadfunc)(const qbyte *f, int matchwidth, int matchheight);
+	unsigned char *(*loadfunc)(const unsigned char *f, int filesize, int matchwidth, int matchheight);
 }
 imageformats[] =
 {
 	{"override/%s.tga", LoadTGA},
+	{"override/%s.png", PNG_LoadImage},
 	{"override/%s.jpg", JPEG_LoadImage},
 	{"textures/%s.tga", LoadTGA},
+	{"textures/%s.png", PNG_LoadImage},
 	{"textures/%s.jpg", JPEG_LoadImage},
 	{"textures/%s.pcx", LoadPCX},
 	{"textures/%s.wal", LoadWAL},
 	{"%s.tga", LoadTGA},
+	{"%s.png", PNG_LoadImage},
 	{"%s.jpg", JPEG_LoadImage},
 	{"%s.pcx", LoadPCX},
 	{"%s.lmp", LoadLMPRGBA},
 	{NULL, NULL}
 };
 
-qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight)
+unsigned char *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight)
 {
 	int i;
-	qbyte *f, *data = NULL;
+	fs_offset_t filesize;
+	unsigned char *f, *data = NULL;
 	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 == '*')
@@ -698,10 +695,10 @@ qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth,
 	for (i = 0;imageformats[i].formatstring;i++)
 	{
 		sprintf (name, imageformats[i].formatstring, basename);
-		f = FS_LoadFile(name, tempmempool, true);
+		f = FS_LoadFile(name, tempmempool, true, &filesize);
 		if (f)
 		{
-			data = imageformats[i].loadfunc(f, matchwidth, matchheight);
+			data = imageformats[i].loadfunc(f, filesize, matchwidth, matchheight);
 			Mem_Free(f);
 			if (data)
 			{
@@ -726,7 +723,7 @@ qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth,
 	return NULL;
 }
 
-int image_makemask (const qbyte *in, qbyte *out, int size)
+int image_makemask (const unsigned char *in, unsigned char *out, int size)
 {
 	int i, count;
 	count = 0;
@@ -742,9 +739,9 @@ int image_makemask (const qbyte *in, qbyte *out, int size)
 	return count;
 }
 
-qbyte* loadimagepixelsmask (const char *filename, qboolean complain, int matchwidth, int matchheight)
+unsigned char* loadimagepixelsmask (const char *filename, qboolean complain, int matchwidth, int matchheight)
 {
-	qbyte *in, *data;
+	unsigned char *in, *data;
 	in = data = loadimagepixels(filename, complain, matchwidth, matchheight);
 	if (!data)
 		return NULL;
@@ -759,7 +756,7 @@ qbyte* loadimagepixelsmask (const char *filename, qboolean complain, int matchwi
 
 rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
 {
-	qbyte *data;
+	unsigned char *data;
 	rtexture_t *rt;
 	if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
 		return 0;
@@ -770,7 +767,7 @@ rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int ma
 
 rtexture_t *loadtextureimagemask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
 {
-	qbyte *data;
+	unsigned char *data;
 	rtexture_t *rt;
 	if (!(data = loadimagepixelsmask (filename, complain, matchwidth, matchheight)))
 		return 0;
@@ -783,7 +780,7 @@ rtexture_t *image_masktex;
 rtexture_t *image_nmaptex;
 rtexture_t *loadtextureimagewithmask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
 {
-	qbyte *data;
+	unsigned char *data;
 	rtexture_t *rt;
 	image_masktex = NULL;
 	image_nmaptex = NULL;
@@ -801,14 +798,14 @@ rtexture_t *loadtextureimagewithmask (rtexturepool_t *pool, const char *filename
 
 rtexture_t *loadtextureimagewithmaskandnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale)
 {
-	qbyte *data, *data2;
+	unsigned char *data, *data2;
 	rtexture_t *rt;
 	image_masktex = NULL;
 	image_nmaptex = NULL;
 	if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
 		return 0;
 
-	data2 = Mem_Alloc(tempmempool, image_width * image_height * 4);
+	data2 = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
 
 	rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL);
 
@@ -826,11 +823,11 @@ rtexture_t *loadtextureimagewithmaskandnmap (rtexturepool_t *pool, const char *f
 
 rtexture_t *loadtextureimagebumpasnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale)
 {
-	qbyte *data, *data2;
+	unsigned char *data, *data2;
 	rtexture_t *rt;
 	if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
 		return 0;
-	data2 = Mem_Alloc(tempmempool, image_width * image_height * 4);
+	data2 = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
 
 	Image_HeightmapToNormalmap(data, data2, image_width, image_height, (flags & TEXF_CLAMP) != 0, bumpscale);
 	rt = R_LoadTexture2D(pool, filename, image_width, image_height, data2, TEXTYPE_RGBA, flags, NULL);
@@ -840,11 +837,11 @@ rtexture_t *loadtextureimagebumpasnmap (rtexturepool_t *pool, const char *filena
 	return rt;
 }
 
-qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const qbyte *data, qbyte *buffer)
+qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const unsigned char *data, unsigned char *buffer)
 {
 	qboolean ret;
-	qbyte *out;
-	const qbyte *in, *end;
+	unsigned char *out;
+	const unsigned char *in, *end;
 
 	memset (buffer, 0, 18);
 	buffer[2] = 2;		// uncompressed type
@@ -869,13 +866,13 @@ qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int heig
 	return ret;
 }
 
-void Image_WriteTGARGB (const char *filename, int width, int height, const qbyte *data)
+void Image_WriteTGARGB (const char *filename, int width, int height, const unsigned char *data)
 {
 	int y;
-	qbyte *buffer, *out;
-	const qbyte *in, *end;
+	unsigned char *buffer, *out;
+	const unsigned char *in, *end;
 
-	buffer = Mem_Alloc(tempmempool, width*height*3 + 18);
+	buffer = (unsigned char *)Mem_Alloc(tempmempool, width*height*3 + 18);
 
 	memset (buffer, 0, 18);
 	buffer[2] = 2;		// uncompressed type
@@ -903,13 +900,13 @@ void Image_WriteTGARGB (const char *filename, int width, int height, const qbyte
 	Mem_Free(buffer);
 }
 
-void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyte *data)
+void Image_WriteTGARGBA (const char *filename, int width, int height, const unsigned char *data)
 {
 	int y;
-	qbyte *buffer, *out;
-	const qbyte *in, *end;
+	unsigned char *buffer, *out;
+	const unsigned char *in, *end;
 
-	buffer = Mem_Alloc(tempmempool, width*height*4 + 18);
+	buffer = (unsigned char *)Mem_Alloc(tempmempool, width*height*4 + 18);
 
 	memset (buffer, 0, 18);
 	buffer[2] = 2;		// uncompressed type
@@ -939,9 +936,9 @@ void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyt
 	Mem_Free(buffer);
 }
 
-qboolean Image_CheckAlpha(const qbyte *data, int size, qboolean rgba)
+qboolean Image_CheckAlpha(const unsigned char *data, int size, qboolean rgba)
 {
-	const qbyte *end;
+	const unsigned char *end;
 	if (rgba)
 	{
 		// check alpha bytes
@@ -959,7 +956,7 @@ qboolean Image_CheckAlpha(const qbyte *data, int size, qboolean rgba)
 	return 0;
 }
 
-static void Image_Resample32LerpLine (const qbyte *in, qbyte *out, int inwidth, int outwidth)
+static void Image_Resample32LerpLine (const unsigned char *in, unsigned char *out, int inwidth, int outwidth)
 {
 	int		j, xi, oldx = 0, f, fstep, endx, lerp;
 	fstep = (int) (inwidth*65536.0f/outwidth);
@@ -975,10 +972,10 @@ static void Image_Resample32LerpLine (const qbyte *in, qbyte *out, int inwidth,
 		if (xi < endx)
 		{
 			lerp = f & 0xFFFF;
-			*out++ = (qbyte) ((((in[4] - in[0]) * lerp) >> 16) + in[0]);
-			*out++ = (qbyte) ((((in[5] - in[1]) * lerp) >> 16) + in[1]);
-			*out++ = (qbyte) ((((in[6] - in[2]) * lerp) >> 16) + in[2]);
-			*out++ = (qbyte) ((((in[7] - in[3]) * lerp) >> 16) + in[3]);
+			*out++ = (unsigned char) ((((in[4] - in[0]) * lerp) >> 16) + in[0]);
+			*out++ = (unsigned char) ((((in[5] - in[1]) * lerp) >> 16) + in[1]);
+			*out++ = (unsigned char) ((((in[6] - in[2]) * lerp) >> 16) + in[2]);
+			*out++ = (unsigned char) ((((in[7] - in[3]) * lerp) >> 16) + in[3]);
 		}
 		else // last pixel of the line has no pixel to lerp to
 		{
@@ -990,7 +987,7 @@ static void Image_Resample32LerpLine (const qbyte *in, qbyte *out, int inwidth,
 	}
 }
 
-static void Image_Resample24LerpLine (const qbyte *in, qbyte *out, int inwidth, int outwidth)
+static void Image_Resample24LerpLine (const unsigned char *in, unsigned char *out, int inwidth, int outwidth)
 {
 	int		j, xi, oldx = 0, f, fstep, endx, lerp;
 	fstep = (int) (inwidth*65536.0f/outwidth);
@@ -1006,9 +1003,9 @@ static void Image_Resample24LerpLine (const qbyte *in, qbyte *out, int inwidth,
 		if (xi < endx)
 		{
 			lerp = f & 0xFFFF;
-			*out++ = (qbyte) ((((in[3] - in[0]) * lerp) >> 16) + in[0]);
-			*out++ = (qbyte) ((((in[4] - in[1]) * lerp) >> 16) + in[1]);
-			*out++ = (qbyte) ((((in[5] - in[2]) * lerp) >> 16) + in[2]);
+			*out++ = (unsigned char) ((((in[3] - in[0]) * lerp) >> 16) + in[0]);
+			*out++ = (unsigned char) ((((in[4] - in[1]) * lerp) >> 16) + in[1]);
+			*out++ = (unsigned char) ((((in[5] - in[2]) * lerp) >> 16) + in[2]);
 		}
 		else // last pixel of the line has no pixel to lerp to
 		{
@@ -1019,21 +1016,21 @@ static void Image_Resample24LerpLine (const qbyte *in, qbyte *out, int inwidth,
 	}
 }
 
-#define LERPBYTE(i) r = resamplerow1[i];out[i] = (qbyte) ((((resamplerow2[i] - r) * lerp) >> 16) + r)
+#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)
 {
 	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;
+	unsigned char *out;
+	const unsigned char *inrow;
+	unsigned char *resamplerow1;
+	unsigned char *resamplerow2;
+	out = (unsigned char *)outdata;
 	fstep = (int) (inheight*65536.0f/outheight);
 
-	resamplerow1 = Mem_Alloc(tempmempool, outwidth*4*2);
+	resamplerow1 = (unsigned char *)Mem_Alloc(tempmempool, outwidth*4*2);
 	resamplerow2 = resamplerow1 + outwidth*4;
 
-	inrow = indata;
+	inrow = (const unsigned char *)indata;
 	oldy = 0;
 	Image_Resample32LerpLine (inrow, resamplerow1, inwidth, outwidth);
 	Image_Resample32LerpLine (inrow + inwidth4, resamplerow2, inwidth, outwidth);
@@ -1045,7 +1042,7 @@ void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *o
 			lerp = f & 0xFFFF;
 			if (yi != oldy)
 			{
-				inrow = (qbyte *)indata + inwidth4*yi;
+				inrow = (unsigned char *)indata + inwidth4*yi;
 				if (yi == oldy+1)
 					memcpy(resamplerow1, resamplerow2, outwidth4);
 				else
@@ -1108,7 +1105,7 @@ void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *o
 		{
 			if (yi != oldy)
 			{
-				inrow = (qbyte *)indata + inwidth4*yi;
+				inrow = (unsigned char *)indata + inwidth4*yi;
 				if (yi == oldy+1)
 					memcpy(resamplerow1, resamplerow2, outwidth4);
 				else
@@ -1130,7 +1127,7 @@ void Image_Resample32Nolerp(const void *indata, int inwidth, int inheight, void
 	unsigned frac, fracstep;
 	// relies on int being 4 bytes
 	int *inrow, *out;
-	out = outdata;
+	out = (int *)outdata;
 
 	fracstep = inwidth*0x10000/outwidth;
 	for (i = 0;i < outheight;i++)
@@ -1164,17 +1161,17 @@ void Image_Resample32Nolerp(const void *indata, int inwidth, int inheight, void
 void Image_Resample24Lerp(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), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3;
-	qbyte *out;
-	const qbyte *inrow;
-	qbyte *resamplerow1;
-	qbyte *resamplerow2;
-	out = outdata;
+	unsigned char *out;
+	const unsigned char *inrow;
+	unsigned char *resamplerow1;
+	unsigned char *resamplerow2;
+	out = (unsigned char *)outdata;
 	fstep = (int) (inheight*65536.0f/outheight);
 
-	resamplerow1 = Mem_Alloc(tempmempool, outwidth*3*2);
+	resamplerow1 = (unsigned char *)Mem_Alloc(tempmempool, outwidth*3*2);
 	resamplerow2 = resamplerow1 + outwidth*3;
 
-	inrow = indata;
+	inrow = (const unsigned char *)indata;
 	oldy = 0;
 	Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
 	Image_Resample24LerpLine (inrow + inwidth3, resamplerow2, inwidth, outwidth);
@@ -1186,7 +1183,7 @@ void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *o
 			lerp = f & 0xFFFF;
 			if (yi != oldy)
 			{
-				inrow = (qbyte *)indata + inwidth3*yi;
+				inrow = (unsigned char *)indata + inwidth3*yi;
 				if (yi == oldy+1)
 					memcpy(resamplerow1, resamplerow2, outwidth3);
 				else
@@ -1242,7 +1239,7 @@ void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *o
 		{
 			if (yi != oldy)
 			{
-				inrow = (qbyte *)indata + inwidth3*yi;
+				inrow = (unsigned char *)indata + inwidth3*yi;
 				if (yi == oldy+1)
 					memcpy(resamplerow1, resamplerow2, outwidth3);
 				else
@@ -1261,13 +1258,13 @@ void Image_Resample24Nolerp(const void *indata, int inwidth, int inheight, void
 {
 	int i, j, f, inwidth3 = inwidth * 3;
 	unsigned frac, fracstep;
-	qbyte *inrow, *out;
-	out = outdata;
+	unsigned char *inrow, *out;
+	out = (unsigned char *)outdata;
 
 	fracstep = inwidth*0x10000/outwidth;
 	for (i = 0;i < outheight;i++)
 	{
-		inrow = (qbyte *)indata + inwidth3*(i*inheight/outheight);
+		inrow = (unsigned char *)indata + inwidth3*(i*inheight/outheight);
 		frac = fracstep >> 1;
 		j = outwidth - 4;
 		while (j >= 0)
@@ -1300,7 +1297,10 @@ Image_Resample
 void Image_Resample (const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int bytesperpixel, int quality)
 {
 	if (indepth != 1 || outdepth != 1)
-		Sys_Error("Image_Resample: 3D resampling not supported\n");
+	{
+		Con_Printf ("Image_Resample: 3D resampling not supported\n");
+		return;
+	}
 	if (bytesperpixel == 4)
 	{
 		if (quality)
@@ -1316,15 +1316,18 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth,
 			Image_Resample24Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
 	}
 	else
-		Sys_Error("Image_Resample: unsupported bytesperpixel %i\n", bytesperpixel);
+		Con_Printf ("Image_Resample: unsupported bytesperpixel %i\n", bytesperpixel);
 }
 
 // in can be the same as out
-void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel)
+void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel)
 {
 	int x, y, nextrow;
 	if (*depth != 1 || destdepth != 1)
-		Sys_Error("Image_Resample: 3D resampling not supported\n");
+	{
+		Con_Printf ("Image_Resample: 3D resampling not supported\n");
+		return;
+	}
 	nextrow = *width * bytesperpixel;
 	if (*width > destwidth)
 	{
@@ -1339,10 +1342,10 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				{
 					for (x = 0;x < *width;x++)
 					{
-						out[0] = (qbyte) ((in[0] + in[4] + in[nextrow  ] + in[nextrow+4]) >> 2);
-						out[1] = (qbyte) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
-						out[2] = (qbyte) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2);
-						out[3] = (qbyte) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2);
+						out[0] = (unsigned char) ((in[0] + in[4] + in[nextrow  ] + in[nextrow+4]) >> 2);
+						out[1] = (unsigned char) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
+						out[2] = (unsigned char) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2);
+						out[3] = (unsigned char) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2);
 						out += 4;
 						in += 8;
 					}
@@ -1355,9 +1358,9 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				{
 					for (x = 0;x < *width;x++)
 					{
-						out[0] = (qbyte) ((in[0] + in[3] + in[nextrow  ] + in[nextrow+3]) >> 2);
-						out[1] = (qbyte) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
-						out[2] = (qbyte) ((in[2] + in[5] + in[nextrow+2] + in[nextrow+5]) >> 2);
+						out[0] = (unsigned char) ((in[0] + in[3] + in[nextrow  ] + in[nextrow+3]) >> 2);
+						out[1] = (unsigned char) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
+						out[2] = (unsigned char) ((in[2] + in[5] + in[nextrow+2] + in[nextrow+5]) >> 2);
 						out += 3;
 						in += 6;
 					}
@@ -1365,7 +1368,7 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				}
 			}
 			else
-				Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+				Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
 		}
 		else
 		{
@@ -1376,10 +1379,10 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				{
 					for (x = 0;x < *width;x++)
 					{
-						out[0] = (qbyte) ((in[0] + in[4]) >> 1);
-						out[1] = (qbyte) ((in[1] + in[5]) >> 1);
-						out[2] = (qbyte) ((in[2] + in[6]) >> 1);
-						out[3] = (qbyte) ((in[3] + in[7]) >> 1);
+						out[0] = (unsigned char) ((in[0] + in[4]) >> 1);
+						out[1] = (unsigned char) ((in[1] + in[5]) >> 1);
+						out[2] = (unsigned char) ((in[2] + in[6]) >> 1);
+						out[3] = (unsigned char) ((in[3] + in[7]) >> 1);
 						out += 4;
 						in += 8;
 					}
@@ -1391,16 +1394,16 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				{
 					for (x = 0;x < *width;x++)
 					{
-						out[0] = (qbyte) ((in[0] + in[3]) >> 1);
-						out[1] = (qbyte) ((in[1] + in[4]) >> 1);
-						out[2] = (qbyte) ((in[2] + in[5]) >> 1);
+						out[0] = (unsigned char) ((in[0] + in[3]) >> 1);
+						out[1] = (unsigned char) ((in[1] + in[4]) >> 1);
+						out[2] = (unsigned char) ((in[2] + in[5]) >> 1);
 						out += 3;
 						in += 6;
 					}
 				}
 			}
 			else
-				Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+				Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
 		}
 	}
 	else
@@ -1415,10 +1418,10 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				{
 					for (x = 0;x < *width;x++)
 					{
-						out[0] = (qbyte) ((in[0] + in[nextrow  ]) >> 1);
-						out[1] = (qbyte) ((in[1] + in[nextrow+1]) >> 1);
-						out[2] = (qbyte) ((in[2] + in[nextrow+2]) >> 1);
-						out[3] = (qbyte) ((in[3] + in[nextrow+3]) >> 1);
+						out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
+						out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
+						out[2] = (unsigned char) ((in[2] + in[nextrow+2]) >> 1);
+						out[3] = (unsigned char) ((in[3] + in[nextrow+3]) >> 1);
 						out += 4;
 						in += 4;
 					}
@@ -1431,9 +1434,9 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				{
 					for (x = 0;x < *width;x++)
 					{
-						out[0] = (qbyte) ((in[0] + in[nextrow  ]) >> 1);
-						out[1] = (qbyte) ((in[1] + in[nextrow+1]) >> 1);
-						out[2] = (qbyte) ((in[2] + in[nextrow+2]) >> 1);
+						out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
+						out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
+						out[2] = (unsigned char) ((in[2] + in[nextrow+2]) >> 1);
 						out += 3;
 						in += 3;
 					}
@@ -1441,10 +1444,10 @@ void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *
 				}
 			}
 			else
-				Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+				Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
 		}
 		else
-			Sys_Error("Image_MipReduce: desired size already achieved\n");
+			Con_Printf ("Image_MipReduce: desired size already achieved\n");
 	}
 }
 
@@ -1492,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);
 			/*
@@ -1513,13 +1516,14 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou
 	}
 }
 
-int image_loadskin(imageskin_t *s, char *shadername)
+int image_loadskin(imageskin_t *s, const char *shadername)
 {
 	int j;
-	qbyte *bumppixels;
+	unsigned char *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)
@@ -1530,7 +1534,7 @@ int image_loadskin(imageskin_t *s, char *shadername)
 	bumppixels = NULL;bumppixels_width = 0;bumppixels_height = 0;
 	if (Image_CheckAlpha(s->basepixels, s->basepixels_width * s->basepixels_height, true))
 	{
-		s->maskpixels = Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4);
+		s->maskpixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4);
 		s->maskpixels_width = s->basepixels_width;
 		s->maskpixels_height = s->basepixels_height;
 		memcpy(s->maskpixels, s->basepixels, s->maskpixels_width * s->maskpixels_height * 4);
@@ -1584,7 +1588,7 @@ int image_loadskin(imageskin_t *s, char *shadername)
 		{
 			if (r_shadow_bumpscale_bumpmap.value > 0)
 			{
-				s->nmappixels = Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4);
+				s->nmappixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4);
 				s->nmappixels_width = bumppixels_width;
 				s->nmappixels_height = bumppixels_height;
 				Image_HeightmapToNormalmap(bumppixels, s->nmappixels, s->nmappixels_width, s->nmappixels_height, false, r_shadow_bumpscale_bumpmap.value);
@@ -1594,7 +1598,7 @@ int image_loadskin(imageskin_t *s, char *shadername)
 		{
 			if (r_shadow_bumpscale_basetexture.value > 0)
 			{
-				s->nmappixels = Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4);
+				s->nmappixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4);
 				s->nmappixels_width = s->basepixels_width;
 				s->nmappixels_height = s->basepixels_height;
 				Image_HeightmapToNormalmap(s->basepixels, s->nmappixels, s->nmappixels_width, s->nmappixels_height, false, r_shadow_bumpscale_basetexture.value);