forked from bartvdbraak/blender
- fix some minor typing/redefinition errors, should
not be misconstrued as "working" by myself
This commit is contained in:
parent
04a7653412
commit
1d5cca805b
@ -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__)
|
||||
|
@ -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");
|
||||
|
||||
|
@ -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");
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user