renamed byte to qbyte throughout engine to eliminate a mingw conflict

[xonotic/darkplaces.git] / image.h

diff --git a/image.h b/image.h
index 9fc65f0db855bfeb257ff018675dd50594ff2bcc..f8d4608ce034740978cb185d31e87e52ca62f0bd 100644 (file)
--- a/image.h
+++ b/image.h
@@ -1,14 +1,14 @@
 
-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);
+void Image_GammaRemapRGB(qbyte *in, qbyte *out, int pixels, qbyte *gammar, qbyte *gammag, qbyte *gammab);
+void Image_Copy8bitRGBA(qbyte *in, qbyte *out, int pixels, int *pal);
+int image_makemask (qbyte *in, qbyte *out, int size);
+qbyte *loadimagepixels (char* filename, qboolean complain, int matchwidth, int matchheight);
+rtexture_t *loadtextureimage (rtexturepool_t *pool, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
+qbyte *loadimagepixelsmask (char* filename, qboolean complain, int matchwidth, int matchheight);
+rtexture_t *loadtextureimagemask (rtexturepool_t *pool, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
 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);
+void Image_WriteTGARGB_preflipped (char *filename, int width, int height, qbyte *data);
+void Image_WriteTGARGB (char *filename, int width, int height, qbyte *data);
+void Image_WriteTGARGBA (char *filename, int width, int height, qbyte *data);
+qboolean Image_CheckAlpha(qbyte *data, int size, qboolean rgba);