From 8427f7edac0d0f21cbc78a7b52093733e28371a3 Mon Sep 17 00:00:00 2001 From: tma Date: Thu, 14 Feb 2008 13:16:13 +0000 Subject: * Consolidate tr_image_*.h headers into tr_local.h to more closely follow the Q3 coding style * Prefix image loaders with R_ now they're non-static git-svn-id: svn://svn.icculus.org/quake3/trunk@1261 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/renderer/tr_image.c | 19 ++++++------------- code/renderer/tr_image_bmp.c | 2 +- code/renderer/tr_image_bmp.h | 1 - code/renderer/tr_image_jpg.c | 2 +- code/renderer/tr_image_jpg.h | 1 - code/renderer/tr_image_pcx.c | 2 +- code/renderer/tr_image_pcx.h | 1 - code/renderer/tr_image_png.c | 2 +- code/renderer/tr_image_png.h | 1 - code/renderer/tr_image_tga.c | 2 +- code/renderer/tr_image_tga.h | 1 - code/renderer/tr_local.h | 14 ++++++++++++++ 12 files changed, 25 insertions(+), 23 deletions(-) delete mode 100644 code/renderer/tr_image_bmp.h delete mode 100644 code/renderer/tr_image_jpg.h delete mode 100644 code/renderer/tr_image_pcx.h delete mode 100644 code/renderer/tr_image_png.h delete mode 100644 code/renderer/tr_image_tga.h (limited to 'code/renderer') diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c index 81a478e..339d91c 100644 --- a/code/renderer/tr_image.c +++ b/code/renderer/tr_image.c @@ -22,13 +22,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // tr_image.c #include "tr_local.h" - -#include "tr_image_bmp.h" -#include "tr_image_jpg.h" -#include "tr_image_pcx.h" -#include "tr_image_png.h" -#include "tr_image_tga.h" - static byte s_intensitytable[256]; static unsigned char s_gammatable[256]; @@ -801,12 +794,12 @@ typedef struct // when there are multiple images of different formats available static imageExtToLoaderMap_t imageLoaders[ ] = { - { "tga", LoadTGA }, - { "jpg", LoadJPG }, - { "jpeg", LoadJPG }, - { "png", LoadPNG }, - { "pcx", LoadPCX }, - { "bmp", LoadBMP } + { "tga", R_LoadTGA }, + { "jpg", R_LoadJPG }, + { "jpeg", R_LoadJPG }, + { "png", R_LoadPNG }, + { "pcx", R_LoadPCX }, + { "bmp", R_LoadBMP } }; static int numImageLoaders = sizeof( imageLoaders ) / diff --git a/code/renderer/tr_image_bmp.c b/code/renderer/tr_image_bmp.c index 191843f..190b878 100644 --- a/code/renderer/tr_image_bmp.c +++ b/code/renderer/tr_image_bmp.c @@ -42,7 +42,7 @@ typedef struct unsigned char palette[256][4]; } BMPHeader_t; -void LoadBMP( const char *name, byte **pic, int *width, int *height ) +void R_LoadBMP( const char *name, byte **pic, int *width, int *height ) { int columns, rows; unsigned numPixels; diff --git a/code/renderer/tr_image_bmp.h b/code/renderer/tr_image_bmp.h deleted file mode 100644 index 98b16b9..0000000 --- a/code/renderer/tr_image_bmp.h +++ /dev/null @@ -1 +0,0 @@ -void LoadBMP( const char *name, byte **pic, int *width, int *height ); diff --git a/code/renderer/tr_image_jpg.c b/code/renderer/tr_image_jpg.c index 3c43cc7..8a9bbc4 100644 --- a/code/renderer/tr_image_jpg.c +++ b/code/renderer/tr_image_jpg.c @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define JPEG_INTERNALS #include "../jpeg-6/jpeglib.h" -void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) { +void R_LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) { /* This struct contains the JPEG decompression parameters and pointers to * working space (which is allocated as needed by the JPEG library). */ diff --git a/code/renderer/tr_image_jpg.h b/code/renderer/tr_image_jpg.h deleted file mode 100644 index 159c613..0000000 --- a/code/renderer/tr_image_jpg.h +++ /dev/null @@ -1 +0,0 @@ -void LoadJPG( const char *name, byte **pic, int *width, int *height ); diff --git a/code/renderer/tr_image_pcx.c b/code/renderer/tr_image_pcx.c index 216543e..2f062f2 100644 --- a/code/renderer/tr_image_pcx.c +++ b/code/renderer/tr_image_pcx.c @@ -48,7 +48,7 @@ typedef struct { unsigned char data[]; } pcx_t; -void LoadPCX ( const char *filename, byte **pic, int *width, int *height) +void R_LoadPCX ( const char *filename, byte **pic, int *width, int *height) { byte *raw; byte *end; diff --git a/code/renderer/tr_image_pcx.h b/code/renderer/tr_image_pcx.h deleted file mode 100644 index 0c8a5f7..0000000 --- a/code/renderer/tr_image_pcx.h +++ /dev/null @@ -1 +0,0 @@ -void LoadPCX( const char *name, byte **pic, int *width, int *height ); diff --git a/code/renderer/tr_image_png.c b/code/renderer/tr_image_png.c index 573ab12..0691408 100644 --- a/code/renderer/tr_image_png.c +++ b/code/renderer/tr_image_png.c @@ -1889,7 +1889,7 @@ static qboolean DecodeImageInterlaced(struct PNG_Chunk_IHDR *IHDR, * The PNG loader */ -void LoadPNG(const char *name, byte **pic, int *width, int *height) +void R_LoadPNG(const char *name, byte **pic, int *width, int *height) { struct BufferedFile *ThePNG; byte *OutBuffer; diff --git a/code/renderer/tr_image_png.h b/code/renderer/tr_image_png.h deleted file mode 100644 index a313e68..0000000 --- a/code/renderer/tr_image_png.h +++ /dev/null @@ -1 +0,0 @@ -void LoadPNG( const char *name, byte **pic, int *width, int *height ); diff --git a/code/renderer/tr_image_tga.c b/code/renderer/tr_image_tga.c index b375404..2147acd 100644 --- a/code/renderer/tr_image_tga.c +++ b/code/renderer/tr_image_tga.c @@ -38,7 +38,7 @@ typedef struct _TargaHeader { unsigned char pixel_size, attributes; } TargaHeader; -void LoadTGA ( const char *name, byte **pic, int *width, int *height) +void R_LoadTGA ( const char *name, byte **pic, int *width, int *height) { unsigned columns, rows, numPixels; byte *pixbuf; diff --git a/code/renderer/tr_image_tga.h b/code/renderer/tr_image_tga.h deleted file mode 100644 index 05e9916..0000000 --- a/code/renderer/tr_image_tga.h +++ /dev/null @@ -1 +0,0 @@ -void LoadTGA( const char *name, byte **pic, int *width, int *height ); diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h index 5354bc7..ec5ff91 100644 --- a/code/renderer/tr_local.h +++ b/code/renderer/tr_local.h @@ -1481,6 +1481,20 @@ void R_MDRAddAnimSurfaces( trRefEntity_t *ent ); void RB_MDRSurfaceAnim( md4Surface_t *surface ); #endif +/* +============================================================= + +IMAGE LOADERS + +============================================================= +*/ + +void R_LoadBMP( const char *name, byte **pic, int *width, int *height ); +void R_LoadJPG( const char *name, byte **pic, int *width, int *height ); +void R_LoadPCX( const char *name, byte **pic, int *width, int *height ); +void R_LoadPNG( const char *name, byte **pic, int *width, int *height ); +void R_LoadTGA( const char *name, byte **pic, int *width, int *height ); + /* ============================================================= ============================================================= -- cgit v1.2.3