diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_utildefines.h | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenpluginapi/iff.h | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/cineon_dpx.c | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index f784973708d..4c143e3293a 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -116,8 +116,10 @@ /* this weirdo pops up in two places ... */ #if !defined(WIN32) && !defined(__BeOS) +#ifndef O_BINARY #define O_BINARY 0 #endif +#endif /* INTEGER CODES */ #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f710651c38d..2c7386ac45d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -859,7 +859,7 @@ static int fd_read_from_memfile(FileData *filedata, void *buffer, int size) static FileData *filedata_new(void) { - extern char DNAstr[]; /* DNA.c */ + extern unsigned char DNAstr[]; /* DNA.c */ extern int DNAlen; FileData *fd = MEM_callocN(sizeof(FileData), "FileData"); diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index c1d8eda9007..4a12991c461 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -189,7 +189,7 @@ typedef struct { static WriteData *writedata_new(int file) { - extern char DNAstr[]; /* DNA.c */ + extern unsigned char DNAstr[]; /* DNA.c */ extern int DNAlen; WriteData *wd= MEM_callocN(sizeof(*wd), "writedata"); diff --git a/source/blender/blenpluginapi/iff.h b/source/blender/blenpluginapi/iff.h index f0d7a76f0f4..6ff84b11c39 100644 --- a/source/blender/blenpluginapi/iff.h +++ b/source/blender/blenpluginapi/iff.h @@ -146,12 +146,14 @@ typedef struct ImBuf{ char namenull; int userflags; int *zbuf; + float *zbuf_float; /**< z buffer data, camera coordinates */ void *userdata; unsigned char *encodedbuffer; unsigned int encodedsize; unsigned int encodedbuffersize; float *rect_float; + float dither; /**< random dither value, for conversion from float -> byte rect */ struct MEM_CacheLimiterHandle_s * c_handle; int refcounter; diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c index 020449897a5..4058f27b929 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.c +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c @@ -182,7 +182,7 @@ short imb_save_dpx(struct ImBuf *buf, char *myfile, int flags) return imb_save_dpx_cineon(buf, myfile, 0, flags); } -short imb_is_dpx(void *buf) +int imb_is_dpx(void *buf) { return dpxIsMemFileCineon(buf); } |