// note: pal must be 32bit color
void Image_Copy8bitRGBA(const qbyte *in, qbyte *out, int pixels, const unsigned int *pal)
{
- int *iout = (void *)out;
+ int *iout = (int *)out;
while (pixels >= 8)
{
iout[0] = pal[in[0]];
=================================================================
*/
-typedef struct
+typedef struct pcx_s
{
char manufacturer;
char version;
palette = f + fs_filesize - 768;
- image_rgba = Mem_Alloc(tempmempool, image_width*image_height*4);
+ image_rgba = (qbyte *)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);
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);
}
/*
*/
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;
+ unsigned char *p;
TargaHeader targa_header;
- unsigned char palette[256*4], *p;
+ unsigned char palette[256*4];
if (fs_filesize < 19)
return NULL;
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");
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)
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 = (qbyte *)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);
red = green = blue = *fin++;
break;
}
+ if (!alphabits)
+ alpha = 255;
}
}
*pixbuf++ = red;
if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
return NULL;
- if (fs_filesize < 8 + image_width * image_height)
+ if (fs_filesize < (fs_offset_t)(8 + image_width * image_height))
{
Con_Print("LoadLMP: invalid LMP file\n");
return NULL;
if (loadAs8Bit)
{
- image_buffer = Mem_Alloc(tempmempool, image_width * image_height);
+ image_buffer = (qbyte *)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_buffer = (qbyte *)Mem_Alloc(tempmempool, image_width * image_height * 4);
Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_complete);
}
return image_buffer;
}
-typedef struct
+typedef struct q2wal_s
{
char name[32];
unsigned width, height;
qbyte *LoadWAL (const qbyte *f, int matchwidth, int matchheight)
{
qbyte *image_rgba;
- const q2wal_t *inwal = (const void *)f;
+ const q2wal_t *inwal = (const q2wal_t *)f;
if (fs_filesize < (int) sizeof(q2wal_t))
{
return NULL;
}
- image_rgba = Mem_Alloc(tempmempool, image_width * image_height * 4);
+ image_rgba = (qbyte *)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);
strcpy(out, in);
}
-struct
+struct imageformat_s
{
const char *formatstring;
qbyte *(*loadfunc)(const qbyte *f, int matchwidth, int matchheight);
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 == '*')
if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
return 0;
- data2 = Mem_Alloc(tempmempool, image_width * image_height * 4);
+ data2 = (qbyte *)Mem_Alloc(tempmempool, image_width * image_height * 4);
rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL);
rtexture_t *rt;
if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
return 0;
- data2 = Mem_Alloc(tempmempool, image_width * image_height * 4);
+ data2 = (qbyte *)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);
qbyte *buffer, *out;
const qbyte *in, *end;
- buffer = Mem_Alloc(tempmempool, width*height*3 + 18);
+ buffer = (qbyte *)Mem_Alloc(tempmempool, width*height*3 + 18);
memset (buffer, 0, 18);
buffer[2] = 2; // uncompressed type
qbyte *buffer, *out;
const qbyte *in, *end;
- buffer = Mem_Alloc(tempmempool, width*height*4 + 18);
+ buffer = (qbyte *)Mem_Alloc(tempmempool, width*height*4 + 18);
memset (buffer, 0, 18);
buffer[2] = 2; // uncompressed type
const qbyte *inrow;
qbyte *resamplerow1;
qbyte *resamplerow2;
- out = outdata;
+ out = (qbyte *)outdata;
fstep = (int) (inheight*65536.0f/outheight);
- resamplerow1 = Mem_Alloc(tempmempool, outwidth*4*2);
+ resamplerow1 = (qbyte *)Mem_Alloc(tempmempool, outwidth*4*2);
resamplerow2 = resamplerow1 + outwidth*4;
- inrow = indata;
+ inrow = (const qbyte *)indata;
oldy = 0;
Image_Resample32LerpLine (inrow, resamplerow1, inwidth, outwidth);
Image_Resample32LerpLine (inrow + inwidth4, resamplerow2, inwidth, outwidth);
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++)
const qbyte *inrow;
qbyte *resamplerow1;
qbyte *resamplerow2;
- out = outdata;
+ out = (qbyte *)outdata;
fstep = (int) (inheight*65536.0f/outheight);
- resamplerow1 = Mem_Alloc(tempmempool, outwidth*3*2);
+ resamplerow1 = (qbyte *)Mem_Alloc(tempmempool, outwidth*3*2);
resamplerow2 = resamplerow1 + outwidth*3;
- inrow = indata;
+ inrow = (const qbyte *)indata;
oldy = 0;
Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
Image_Resample24LerpLine (inrow + inwidth3, resamplerow2, inwidth, outwidth);
int i, j, f, inwidth3 = inwidth * 3;
unsigned frac, fracstep;
qbyte *inrow, *out;
- out = outdata;
+ out = (qbyte *)outdata;
fracstep = inwidth*0x10000/outwidth;
for (i = 0;i < outheight;i++)
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)
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
{
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)
{
}
}
else
- Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+ Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
}
else
{
}
}
else
- Sys_Error("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
+ Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
}
}
else
}
}
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");
}
}
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);
/*
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)
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 = (qbyte *)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);
{
if (r_shadow_bumpscale_bumpmap.value > 0)
{
- s->nmappixels = Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4);
+ s->nmappixels = (qbyte *)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);
{
if (r_shadow_bumpscale_basetexture.value > 0)
{
- s->nmappixels = Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4);
+ s->nmappixels = (qbyte *)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);