- fix some minor typing/redefinition errors, should

   not be misconstrued as "working" by myself

diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h
index f784973708d402dc3175f7418b9676302947bbf1..4c143e3293a0d6211b42692556194e87964ad07e 100644 (file)
--- 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 f710651c38d306608b82684f22a9d6567fc58a38..2c7386ac45df8eb311925279c013384a34ff9124 100644 (file)
--- 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 c1d8eda900741a4df5b26f6e583d360832d5c07f..4a12991c4618f214c64ba5e4839aa18e3568673e 100644 (file)
--- 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 f0d7a76f0f4adabc7a4e0543b3ee0565d6665c0c..6ff84b11c3976d3b94874442f49b004de091b8fd 100644 (file)
--- 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 020449897a5c20a08f2be7785f32236a390d0f1b..4058f27b929878532dc1584151c5b88a7a36fe73 100644 (file)
--- 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);
 }