X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=image.h;h=17b6149fdd6b0bccd73a4132186017b5b72a59d2;hb=17a6dfb7c9b37209272a4ea7e07b7dbccd5d0aa8;hp=60a9759cf0306394f1d80924d988a95572a2e1be;hpb=e4b3858e7aca0ead91be1d8f675db084d025abad;p=xonotic%2Fdarkplaces.git

diff --git a/image.h b/image.h
index 60a9759c..17b6149f 100644
--- a/image.h
+++ b/image.h
@@ -1,13 +1,49 @@
 
-extern void Image_Copy8bitRGBA(byte *in, byte *out, int pixels, int *pal);
-extern void Image_CopyRGBAGamma(byte *in, byte *out, int pixels);
-extern int image_makemask (byte *in, byte *out, int size);
-extern byte* loadimagepixels (char* filename, qboolean complain, int matchwidth, int matchheight);
-extern rtexture_t *loadtextureimage (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
-extern byte* loadimagepixelsmask (char* filename, qboolean complain, int matchwidth, int matchheight);
-extern rtexture_t *loadtextureimagemask (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
-extern rtexture_t *image_masktex;
-extern rtexture_t *loadtextureimagewithmask (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
-extern void Image_WriteTGARGB_preflipped (char *filename, int width, int height, byte *data);
-extern void Image_WriteTGARGB (char *filename, int width, int height, byte *data);
-extern void Image_WriteTGARGBA (char *filename, int width, int height, byte *data);
+#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(unsigned char *outpixels, const unsigned char *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 unsigned char *in, unsigned char *out, int pixels, const unsigned char *gammar, const unsigned char *gammag, const unsigned char *gammab);
+
+// converts 8bit image data to RGBA, in can not be the same as out
+void Image_Copy8bitRGBA(const unsigned char *in, unsigned char *out, int pixels, const unsigned int *pal);
+
+void Image_StripImageExtension (const char *in, char *out, size_t size_out);
+
+unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, int matchheight);
+
+// loads a texture, as pixel data
+unsigned char *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight);
+
+// loads a texture, as a texture
+rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags);
+
+// writes a RGB TGA that is already upside down (which TGA wants)
+qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const unsigned char *data, unsigned char *buffer);
+
+// writes a RGBA TGA
+void Image_WriteTGARGBA (const char *filename, int width, int height, const unsigned char *data);
+
+// resizes the image (in can not be the same as out)
+void Image_Resample (const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int bytesperpixel, int quality);
+
+// scales the image down by a power of 2 (in can be the same as out)
+void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel);
+
+// only used by menuplyr coloring
+unsigned char *LoadLMP (const unsigned char *f, int filesize, int matchwidth, int matchheight, qboolean loadAs8Bit);
+
+void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale);
+
+#endif
+