From 24624501a473c13f6a6d9c4676cbdd33b4a88e73 Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Thu, 4 Dec 2003 18:18:05 +0000 Subject: This looks like a lot but its a few small changes. Summary: standardized imageformat functions(make function names similar, and parameters in same order where relavant), small code cleanups, and added a description of how to add an image format to blender. Kent Specifics: merged png_decode.c and png_encode.c to png.c and cleaned function calls. fixed some spacing in IMB_imbuf_types.h casting cleanups: intern/amiga.c intern/ham.c intern/iris.c Modified switch statements to have a default type to insure values are set: intern/antialias.c Initalization of some vars and make types similar. intern/bitplanes.c cleaned function calls, and changed if else to if's with return: intern/jpeg.c added {}'s in multidemensional arrays. intern/matrix.h Made a little cleaner to read, and matched above changes. intern/readimage.c intern/writeimage.c --- source/blender/imbuf/IMB_imbuf_types.h | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'source/blender/imbuf/IMB_imbuf_types.h') diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index bff0665aa71..8abb00d722d 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -136,10 +136,10 @@ typedef enum { * * The bit flag is stored in the ImBuf.ftype variable. */ -#define AMI (1 << 31) -#define PNG (1 << 30) -#define Anim (1 << 29) -#define TGA (1 << 28) +#define AMI (1 << 31) +#define PNG (1 << 30) +#define Anim (1 << 29) +#define TGA (1 << 28) #define JPG (1 << 27) #define BMP (1 << 26) #ifdef WITH_QUICKTIME @@ -152,16 +152,16 @@ typedef enum { #define IMAGEMAGICK (1 << 23) #endif -#define RAWTGA (TGA | 1) +#define RAWTGA (TGA | 1) -#define JPG_STD (JPG | (0 << 8)) -#define JPG_VID (JPG | (1 << 8)) -#define JPG_JST (JPG | (2 << 8)) -#define JPG_MAX (JPG | (3 << 8)) -#define JPG_MSK (0xffffff00) +#define JPG_STD (JPG | (0 << 8)) +#define JPG_VID (JPG | (1 << 8)) +#define JPG_JST (JPG | (2 << 8)) +#define JPG_MAX (JPG | (3 << 8)) +#define JPG_MSK (0xffffff00) -#define AM_ham (0x0800 | AMI) -#define AM_hbrite (0x0080 | AMI) +#define AM_ham (0x0800 | AMI) +#define AM_hbrite (0x0080 | AMI) #define C233 1 #define YUVX 2 @@ -201,6 +201,3 @@ typedef enum { #endif - - - -- cgit v1.2.3