diff options
Diffstat (limited to 'source/blender/imbuf/intern/cineon/logmemfile.c')
-rw-r--r-- | source/blender/imbuf/intern/cineon/logmemfile.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/source/blender/imbuf/intern/cineon/logmemfile.c b/source/blender/imbuf/intern/cineon/logmemfile.c index d7ab2855ea3..91351d309de 100644 --- a/source/blender/imbuf/intern/cineon/logmemfile.c +++ b/source/blender/imbuf/intern/cineon/logmemfile.c @@ -31,23 +31,27 @@ int logimage_fseek(LogImageFile *logFile, intptr_t offset, int origin) { - if (logFile->file) + if (logFile->file) { fseek(logFile->file, offset, origin); + } else { /* we're seeking in memory */ if (origin == SEEK_SET) { - if (offset > logFile->memBufferSize) + if (offset > logFile->memBufferSize) { return 1; + } logFile->memCursor = logFile->memBuffer + offset; } else if (origin == SEEK_END) { - if (offset > logFile->memBufferSize) + if (offset > logFile->memBufferSize) { return 1; + } logFile->memCursor = (logFile->memBuffer + logFile->memBufferSize) - offset; } else if (origin == SEEK_CUR) { uintptr_t pos = (uintptr_t)logFile->memCursor - (uintptr_t)logFile->memBuffer; - if (pos + offset > logFile->memBufferSize) + if (pos + offset > logFile->memBufferSize) { return 1; + } logFile->memCursor += offset; } @@ -57,8 +61,9 @@ int logimage_fseek(LogImageFile *logFile, intptr_t offset, int origin) int logimage_fwrite(void *buffer, size_t size, unsigned int count, LogImageFile *logFile) { - if (logFile->file) + if (logFile->file) { return fwrite(buffer, size, count, logFile->file); + } else { /* we're writing to memory */ /* do nothing as this isn't supported yet */ return count; @@ -81,8 +86,9 @@ int logimage_fread(void *buffer, size_t size, unsigned int count, LogImageFile * total_size = size * count; } - if (total_size != 0) + if (total_size != 0) { memcpy(buf, logFile->memCursor, total_size); + } return count; } @@ -91,8 +97,9 @@ int logimage_fread(void *buffer, size_t size, unsigned int count, LogImageFile * int logimage_read_uchar(unsigned char *x, LogImageFile *logFile) { uintptr_t pos = (uintptr_t)logFile->memCursor - (uintptr_t)logFile->memBuffer; - if (pos + sizeof(unsigned char) > logFile->memBufferSize) + if (pos + sizeof(unsigned char) > logFile->memBufferSize) { return 1; + } *x = *(unsigned char *)logFile->memCursor; logFile->memCursor += sizeof(unsigned char); @@ -102,8 +109,9 @@ int logimage_read_uchar(unsigned char *x, LogImageFile *logFile) int logimage_read_ushort(unsigned short *x, LogImageFile *logFile) { uintptr_t pos = (uintptr_t)logFile->memCursor - (uintptr_t)logFile->memBuffer; - if (pos + sizeof(unsigned short) > logFile->memBufferSize) + if (pos + sizeof(unsigned short) > logFile->memBufferSize) { return 1; + } *x = *(unsigned short *)logFile->memCursor; logFile->memCursor += sizeof(unsigned short); @@ -113,8 +121,9 @@ int logimage_read_ushort(unsigned short *x, LogImageFile *logFile) int logimage_read_uint(unsigned int *x, LogImageFile *logFile) { uintptr_t pos = (uintptr_t)logFile->memCursor - (uintptr_t)logFile->memBuffer; - if (pos + sizeof(unsigned int) > logFile->memBufferSize) + if (pos + sizeof(unsigned int) > logFile->memBufferSize) { return 1; + } *x = *(unsigned int *)logFile->memCursor; logFile->memCursor += sizeof(unsigned int); |