Cleaned up alot more memory leaks. (still get 720 leaks just running demo1.dem)

[xonotic/darkplaces.git] / image.h

diff --git a/image.h b/image.h
index 2d26d29ed1368e32fea6620e0c3e820e1695e340..6a49f5a29a4f6aad6ceaa54c11b0e54830c981d1 100644 (file)
--- a/image.h
+++ b/image.h
@@ -2,6 +2,16 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
+
+extern int image_width, image_height;
+
+
+// swizzle components (even converting number of components) and flip images
+// (warning: input must be different than output due to non-linear read/write)
+// (tip: component indices can contain values | 0x80000000 to tell it to
+// store them directly into output, so 255 | 0x80000000 would write 255)
+void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices);
+
 // applies gamma correction to RGB pixels, in can be the same as out
 void Image_GammaRemapRGB(const qbyte *in, qbyte *out, int pixels, const qbyte *gammar, const qbyte *gammag, const qbyte *gammab);
 
@@ -31,7 +41,7 @@ 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);
 
 // writes a RGB TGA that is already upside down (which TGA wants)
-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);
 
 // writes a RGB TGA
 void Image_WriteTGARGB (const char *filename, int width, int height, const qbyte *data);
@@ -49,9 +59,24 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth,
 void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel);
 
 // only used by menuplyr coloring
-qbyte *LoadLMPAs8Bit (const qbyte *f, int matchwidth, int matchheight);
+qbyte *LoadLMPAs8Bit (qbyte *f, int matchwidth, int matchheight);
 
 void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale);
 
+typedef struct imageskin_s
+{
+       qbyte *basepixels;int basepixels_width;int basepixels_height;
+       qbyte *nmappixels;int nmappixels_width;int nmappixels_height;
+       qbyte *glowpixels;int glowpixels_width;int glowpixels_height;
+       qbyte *glosspixels;int glosspixels_width;int glosspixels_height;
+       qbyte *pantspixels;int pantspixels_width;int pantspixels_height;
+       qbyte *shirtpixels;int shirtpixels_width;int shirtpixels_height;
+       qbyte *maskpixels;int maskpixels_width;int maskpixels_height;
+}
+imageskin_t;
+
+int image_loadskin(imageskin_t *s, char *name);
+void image_freeskin(imageskin_t *s);
+
 #endif