diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /source/blender/imbuf/intern/imbuf.h | |
parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'source/blender/imbuf/intern/imbuf.h')
-rw-r--r-- | source/blender/imbuf/intern/imbuf.h | 93 |
1 files changed, 3 insertions, 90 deletions
diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h index aba4784d7d7..1e2f3ec461a 100644 --- a/source/blender/imbuf/intern/imbuf.h +++ b/source/blender/imbuf/intern/imbuf.h @@ -72,97 +72,10 @@ #define BIG_LONG SWAP_LONG #endif -#define malloc(x) MEM_mallocN(x, __FILE__) -#define free(x) MEM_freeN(x) -#define calloc(x,y) MEM_callocN((x)*(y), __FILE__) -#define freelist(x) BLI_freelistN(x) +typedef unsigned char uchar; -#ifdef SHLIB -void *(*ib_calloc)(); -#define calloc(x,y) ib_calloc((x),(y)) -void *(*ib_malloc)(); -#define malloc(x) ib_malloc(x) -void (*ib_free)(); -#define free(x) ib_free(x) -void (*ib_memcpy)(); -#define memcpy(x,y,z) ib_memcpy((x),(y),(z)) -int (*ib_abs)(); -#define abs(x) ib_abs(x) -void (*ib_fprin_tf)(); -#define fprintf ib_fprin_tf -int (*ib_sprin_tf)(); -#define sprintf ib_sprin_tf -void (*ib_prin_tf)(); -#define printf ib_prin_tf -int (*ib_lseek)(); -#define lseek(x,y,z) ib_lseek((x),(y),(z)) -void *(*ib_mmap)(); -#define mmap(u,v,w,x,y,z) ib_mmap((u),(v),(w),(x),(y),(z)) -int (*ib_munmap)(); -#define munmap(x,y) ib_munmap((x),(y)) -int (*ib_open)(); -#define open(x,y) ib_open((x),(y)) -void (*ib_close)(); -#define close(x) ib_close(x) -int (*ib_write)(); -#define write(x,y,z) ib_write((x),(y),(z)) -int (*ib_read)(); -#define read(x,y,z) ib_read((x),(y),(z)) -int (*ib_fchmod)(); -#define fchmod(x,y) ib_fchmod((x),(y)) -int (*ib_remove)(); -#define remove(x) ib_remove(x) -size_t (*ib_strlen)(); -#define strlen(x) ib_strlen(x) -int (*ib_isdigit)(); -#define isdigit(x) ib_isdigit(x) -char *(*ib_strcpy)(); -#define strcpy(x,y) ib_strcpy((x),(y)) -int (*ib_atoi)(); -#define atoi(x) ib_atoi(x) -char *(*ib_strcat)(); -#define strcat(x,y) ib_strcat((x),(y)) -int (*ib_stat)(); -/* #define stat(x,y) ib_stat((x),(y)) */ -FILE *ib_iob; -#define _iob ib_iob - -#else - -#define ib_stat stat - -#endif /* SHLIB */ - - -#define WIDTHB(x) (((x+15)>>4)<<1) - -extern unsigned short *quadr; -extern float dyuvrgb[4][4]; -extern float rgbdyuv[4][4]; - - -typedef struct Adat -{ - unsigned short w, h; - unsigned short type; - unsigned short xorig, yorig; - unsigned short pad; - float gamma; - float distort; -}Adat; - -struct BitMapHeader -{ - unsigned short w, h; /* in pixels */ - unsigned short x, y; - char nPlanes; - char masking; - char compression; - char pad1; - unsigned short transparentColor; - char xAspect, yAspect; - short pageWidth, pageHeight; -}; +#define TRUE 1 +#define FALSE 0 #endif /* IMBUF_H */ |