diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-22 17:00:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-22 17:00:02 +0400 |
| commit | 436bbdfd247f66a856b17e4e73db8f8fb3fe6d6d (patch) | |
| tree | c72eb1ce03d701a7a99ab0b039f89b20af28374c /source/blender/imbuf/intern/cineon/logmemfile.c | |
| parent | 4e11fe6c5aec1d609e3ecc2218138b838d253ebf (diff) | |
style cleanup: use more const's in BLI_heap & dpx/cineon style cleanup
Diffstat (limited to 'source/blender/imbuf/intern/cineon/logmemfile.c')
| -rw-r--r-- | source/blender/imbuf/intern/cineon/logmemfile.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/imbuf/intern/cineon/logmemfile.c b/source/blender/imbuf/intern/cineon/logmemfile.c index 54bc62276cf..3914f6dc633 100644 --- a/source/blender/imbuf/intern/cineon/logmemfile.c +++ b/source/blender/imbuf/intern/cineon/logmemfile.c @@ -42,11 +42,13 @@ int logimage_fseek(LogImageFile *logFile, intptr_t offset, int origin) if (offset > logFile->memBufferSize) return 1; logFile->memCursor = logFile->memBuffer + offset; - } else if (origin == SEEK_END) { + } + else if (origin == SEEK_END) { if (offset > logFile->memBufferSize) return 1; logFile->memCursor = (logFile->memBuffer + logFile->memBufferSize) - offset; - } else if (origin == SEEK_CUR) { + } + else if (origin == SEEK_CUR) { uintptr_t pos = (uintptr_t)logFile->memCursor - (uintptr_t)logFile->memBuffer; if (pos + offset > logFile->memBufferSize || pos < 0) return 1; @@ -57,12 +59,12 @@ int logimage_fseek(LogImageFile *logFile, intptr_t offset, int origin) return 0; } -int logimage_fwrite(void *buffer, size_t size, unsigned int count, LogImageFile* logFile) +int logimage_fwrite(void *buffer, size_t size, unsigned int count, LogImageFile *logFile) { if (logFile->file) return fwrite(buffer, size, count, logFile->file); - else { /*we're writing to memory*/ - /*do nothing as this isn't supported yet*/ + else { /* we're writing to memory */ + /* do nothing as this isn't supported yet */ return count; } } @@ -73,7 +75,7 @@ int logimage_fread(void *buffer, size_t size, unsigned int count, LogImageFile * return fread(buffer, size, count, logFile->file); } else { /* we're reading from memory */ - unsigned char *buf = (unsigned char*)buffer; + unsigned char *buf = (unsigned char *)buffer; uintptr_t pos = (uintptr_t)logFile->memCursor - (uintptr_t)logFile->memBuffer; size_t total_size = size * count; if (pos + total_size > logFile->memBufferSize) { @@ -96,7 +98,7 @@ int logimage_read_uchar(unsigned char *x, LogImageFile *logFile) if (pos + sizeof(unsigned char) > logFile->memBufferSize) return 1; - *x = *(unsigned char*)logFile->memCursor; + *x = *(unsigned char *)logFile->memCursor; logFile->memCursor += sizeof(unsigned char); return 0; } @@ -107,7 +109,7 @@ int logimage_read_ushort(unsigned short *x, LogImageFile *logFile) if (pos + sizeof(unsigned short) > logFile->memBufferSize) return 1; - *x = *(unsigned short*)logFile->memCursor; + *x = *(unsigned short *)logFile->memCursor; logFile->memCursor += sizeof(unsigned short); return 0; } @@ -118,7 +120,7 @@ int logimage_read_uint(unsigned int *x, LogImageFile *logFile) if (pos + sizeof(unsigned int) > logFile->memBufferSize) return 1; - *x = *(unsigned int*)logFile->memCursor; + *x = *(unsigned int *)logFile->memCursor; logFile->memCursor += sizeof(unsigned int); return 0; } |