DP code cleanup, stage one - all headers that can be protected by ifdef

[xonotic/darkplaces.git] / image.h

diff --git a/image.h b/image.h
index 0a1d73fd97bfcee28094a7f2bcdca24510406b2f..214d4dd162795d62a1a507ca0ca9c2b851a36dd8 100644 (file)
--- a/image.h
+++ b/image.h
@@ -1,15 +1,49 @@
 
-void Image_GammaRemapRGB(byte *in, byte *out, int pixels, byte *gammar, byte *gammag, byte *gammab);
-void Image_Copy8bitRGBA(byte *in, byte *out, int pixels, int *pal);
-void Image_CopyRGBAGamma(byte *in, byte *out, int pixels);
-int image_makemask (byte *in, byte *out, int size);
-byte* loadimagepixels (char* filename, qboolean complain, int matchwidth, int matchheight);
-rtexture_t *loadtextureimage (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
-byte* loadimagepixelsmask (char* filename, qboolean complain, int matchwidth, int matchheight);
-rtexture_t *loadtextureimagemask (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
+#ifndef IMAGE_H
+#define IMAGE_H
+
+// applies gamma correction to RGB pixels, in can be the same as out
+void Image_GammaRemapRGB(qbyte *in, qbyte *out, int pixels, qbyte *gammar, qbyte *gammag, qbyte *gammab);
+
+// converts 8bit image data to RGBA, in can not be the same as out
+void Image_Copy8bitRGBA(qbyte *in, qbyte *out, int pixels, int *pal);
+
+// makes a RGBA mask from RGBA input, in can be the same as out
+int image_makemask (qbyte *in, qbyte *out, int size);
+
+// loads a texture, as pixel data
+qbyte *loadimagepixels (char* filename, qboolean complain, int matchwidth, int matchheight);
+
+// loads a texture, as a texture
+rtexture_t *loadtextureimage (rtexturepool_t *pool, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
+
+// loads a texture's alpha mask, as pixel data
+qbyte *loadimagepixelsmask (char* filename, qboolean complain, int matchwidth, int matchheight);
+
+// loads a texture's alpha mask, as a texture
+rtexture_t *loadtextureimagemask (rtexturepool_t *pool, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
+
+// loads a texture and it's alpha mask at once (NULL if it has no translucent pixels)
 rtexture_t *image_masktex;
-rtexture_t *loadtextureimagewithmask (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
-void Image_WriteTGARGB_preflipped (char *filename, int width, int height, byte *data);
-void Image_WriteTGARGB (char *filename, int width, int height, byte *data);
-void Image_WriteTGARGBA (char *filename, int width, int height, byte *data);
-qboolean Image_CheckAlpha(byte *data, int size, qboolean rgba);
+rtexture_t *loadtextureimagewithmask (rtexturepool_t *pool, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
+
+// writes a RGB TGA that is already upside down (which TGA wants)
+qboolean Image_WriteTGARGB_preflipped (char *filename, int width, int height, qbyte *data);
+
+// writes a RGB TGA
+void Image_WriteTGARGB (char *filename, int width, int height, qbyte *data);
+
+// writes a RGBA TGA
+void Image_WriteTGARGBA (char *filename, int width, int height, qbyte *data);
+
+// returns true if the image has some translucent pixels
+qboolean Image_CheckAlpha(qbyte *data, int size, qboolean rgba);
+
+// resizes the image (in can not be the same as out)
+void Image_Resample (void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight, int bytesperpixel, int quality);
+
+// scales the image down by a power of 2 (in can be the same as out)
+void Image_MipReduce(qbyte *in, qbyte *out, int *width, int *height, int destwidth, int destheight, int bytesperpixel);
+
+#endif
+