int image_width;
int image_height;
-void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int width, int height, int flipx, int flipy, int flipdiagonal, int numincomponents, int numoutcomponents, int *inputcomponentindices)
+#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)
{
- int c, x, y;
+ int index, c, x, y;
+ const qbyte *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);
+
+ for (c = 0; c < numoutputcomponents; c++)
+ if (outputinputcomponentindices[c] & 0x80000000)
+ break;
+ if (c < numoutputcomponents)
+ {
+ // special indices used
+ 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 (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 (c = 0; c < numoutputcomponents; c++)
+ outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index];
+ }
+ }
+ else
+ {
+ // special indices not used
+ 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 (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 (c = 0; c < numoutputcomponents; c++)
+ outpixels[c] = in[outputinputcomponentindices[c]];
+ }
+ }
+}
+#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)
+{
+ int index, c, x, y;
const qbyte *in, *inrow, *incolumn;
- if (flipdiagonal)
+ if (inputflipdiagonal)
{
- for (y = 0;y < height;y++)
+ for (x = 0;x < inputwidth;x++)
{
- incolumn = inpixels + (flipx ? width - 1 - y : y) * numincomponents;
- for (x = 0;x < width;x++)
+ for (y = 0;y < inputheight;y++)
{
- in = incolumn + (flipy ? height - 1 - x : x) * width * numincomponents;
- for (c = 0;c < numoutcomponents;c++)
- *outpixels++ = in[inputcomponentindices[c]];
+ in = inpixels + ((inputflipy ? inputheight - 1 - y : y) * inputwidth + (inputflipx ? inputwidth - 1 - x : x)) * numinputcomponents;
+ for (c = 0;c < numoutputcomponents;c++)
+ {
+ index = outputinputcomponentindices[c];
+ if (index & 0x80000000)
+ *outpixels++ = index;
+ else
+ *outpixels++ = in[index];
+ }
}
}
}
else
{
- for (y = 0;y < height;y++)
+ for (y = 0;y < inputheight;y++)
{
- inrow = inpixels + (flipy ? height - 1 - y : y) * width * numincomponents;
- for (x = 0;x < width;x++)
+ for (x = 0;x < inputwidth;x++)
{
- in = inrow + (flipx ? width - 1 - x : x) * numincomponents;
- for (c = 0;c < numoutcomponents;c++)
- *outpixels++ = in[inputcomponentindices[c]];
+ in = inpixels + ((inputflipy ? inputheight - 1 - y : y) * inputwidth + (inputflipx ? inputwidth - 1 - x : x)) * numinputcomponents;
+ for (c = 0;c < numoutputcomponents;c++)
+ {
+ index = outputinputcomponentindices[c];
+ if (index & 0x80000000)
+ *outpixels++ = index;
+ else
+ *outpixels++ = in[index];
+ }
}
}
}
}
+#endif
void Image_GammaRemapRGB(const qbyte *in, qbyte *out, int pixels, const qbyte *gammar, const qbyte *gammag, const qbyte *gammab)
{
if (fs_filesize < (int)sizeof(pcx) + 768)
{
- Con_Printf ("Bad pcx file\n");
+ Con_Print("Bad pcx file\n");
return NULL;
}
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)
{
- Con_Printf ("Bad pcx file\n");
+ Con_Print("Bad pcx file\n");
return NULL;
}
if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
void PrintTargaHeader(TargaHeader *t)
{
- Con_Printf("TargaHeader:\n");
+ 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);
targa_header.height = image_height = f[14] + f[15] * 256;
if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
{
- Con_Printf("LoadTGA: invalid size\n");
+ Con_Print("LoadTGA: invalid size\n");
PrintTargaHeader(&targa_header);
return NULL;
}
{
if (targa_header.pixel_size != 24 && targa_header.pixel_size != 32)
{
- Con_Printf ("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n");
+ Con_Print("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n");
PrintTargaHeader(&targa_header);
return NULL;
}
{
if (targa_header.pixel_size != 8)
{
- Con_Printf ("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
+ 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_Printf ("LoadTGA: only up to 256 colormap_length supported\n");
+ Con_Print("LoadTGA: only up to 256 colormap_length supported\n");
PrintTargaHeader(&targa_header);
return NULL;
}
if (targa_header.colormap_index)
{
- Con_Printf ("LoadTGA: colormap_index not supported\n");
+ Con_Print("LoadTGA: colormap_index not supported\n");
PrintTargaHeader(&targa_header);
return NULL;
}
}
else
{
- Con_Printf ("LoadTGA: Only 32 and 24 bit colormap_size supported\n");
+ Con_Print("LoadTGA: Only 32 and 24 bit colormap_size supported\n");
PrintTargaHeader(&targa_header);
return NULL;
}
{
if (targa_header.pixel_size != 8)
{
- Con_Printf ("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
+ Con_Print("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
PrintTargaHeader(&targa_header);
return NULL;
}
}
else
{
- Con_Printf ("LoadTGA: Only type 1, 2, 3, 9, 10, and 11 targa RGB images supported, image_type = %i\n", targa_header.image_type);
+ Con_Printf("LoadTGA: Only type 1, 2, 3, 9, 10, and 11 targa RGB images supported, image_type = %i\n", targa_header.image_type);
PrintTargaHeader(&targa_header);
return NULL;
}
if (targa_header.attributes & 0x10)
{
- Con_Printf ("LoadTGA: origin must be in top left or bottom left, top right and bottom right are not supported\n");
+ Con_Print("LoadTGA: origin must be in top left or bottom left, top right and bottom right are not supported\n");
return NULL;
}
image_rgba = 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);
+ Con_Printf("LoadTGA: not enough memory for %i by %i image\n", image_width, image_height);
return NULL;
}
if (fs_filesize < 9)
{
- Con_Printf("LoadLMP: invalid LMP file\n");
+ Con_Print("LoadLMP: invalid LMP file\n");
return NULL;
}
if (fs_filesize < 8 + image_width * image_height)
{
- Con_Printf("LoadLMP: invalid LMP file\n");
+ Con_Print("LoadLMP: invalid LMP file\n");
return NULL;
}
if (fs_filesize < (int) sizeof(q2wal_t))
{
- Con_Printf("LoadWAL: invalid WAL file\n");
+ Con_Print("LoadWAL: invalid WAL file\n");
return NULL;
}
if ((int) fs_filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height)
{
- Con_Printf("LoadWAL: invalid WAL file\n");
+ Con_Print("LoadWAL: invalid WAL file\n");
return NULL;
}
if (fs_filesize < 9)
{
- Con_Printf("LoadLMPAs8Bit: invalid LMP file\n");
+ Con_Print("LoadLMPAs8Bit: invalid LMP file\n");
return NULL;
}
if (fs_filesize < 8 + image_width * image_height)
{
- Con_Printf("LoadLMPAs8Bit: invalid LMP file\n");
+ Con_Print("LoadLMPAs8Bit: invalid LMP file\n");
return NULL;
}
for (i = 0;imageformats[i].formatstring;i++)
{
sprintf (name, imageformats[i].formatstring, basename);
- if ((f = FS_LoadFile(name, true)) && (data = imageformats[i].loadfunc(f, matchwidth, matchheight)))
+ f = FS_LoadFile(name, tempmempool, true);
+ if (f)
{
+ data = imageformats[i].loadfunc(f, matchwidth, matchheight);
Mem_Free(f);
- Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height);
- if (developer_memorydebug.integer)
- Mem_CheckSentinelsGlobal();
- return data;
+ if (data)
+ {
+ Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height);
+ if (developer_memorydebug.integer)
+ Mem_CheckSentinelsGlobal();
+ return data;
+ }
}
}
if (complain)
{
- Con_Printf ("Couldn't load %s using ", filename);
+ Con_Printf("Couldn't load %s using ", filename);
for (i = 0;imageformats[i].formatstring;i++)
{
sprintf (name, imageformats[i].formatstring, basename);
- Con_Printf (i == 0 ? "\"%s\"" : (imageformats[i+1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), imageformats[i].formatstring);
+ Con_Printf(i == 0 ? "\"%s\"" : (imageformats[i+1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), imageformats[i].formatstring);
}
}
if (developer_memorydebug.integer)
return rt;
}
-qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const qbyte *data)
+qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const qbyte *data, qbyte *buffer)
{
qboolean ret;
- qbyte *buffer, *out;
+ qbyte *out;
const qbyte *in, *end;
- buffer = Mem_Alloc(tempmempool, width*height*3 + 18);
-
memset (buffer, 0, 18);
buffer[2] = 2; // uncompressed type
buffer[12] = (width >> 0) & 0xFF;
}
ret = FS_WriteFile (filename, buffer, width*height*3 + 18 );
- Mem_Free(buffer);
return ret;
}
projects / xonotic / darkplaces.git / blobdiff