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/cineonlib.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/cineonlib.c')
| -rw-r--r-- | source/blender/imbuf/intern/cineon/cineonlib.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index 92a984378db..9a90160125f 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -132,8 +132,8 @@ static void fillCineonMainHeader(LogImageFile *cineon, CineonMainHeader *header, LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t bufferSize) { CineonMainHeader header; - LogImageFile *cineon = (LogImageFile*)MEM_mallocN(sizeof(LogImageFile), __func__); - char *filename = (char*)byteStuff; + LogImageFile *cineon = (LogImageFile *)MEM_mallocN(sizeof(LogImageFile), __func__); + char *filename = (char *)byteStuff; int i; unsigned int dataOffset; @@ -160,9 +160,10 @@ LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t cineon->memBuffer = 0; cineon->memCursor = 0; cineon->memBufferSize = 0; - } else { - cineon->memBuffer = (unsigned char*)byteStuff; - cineon->memCursor = (unsigned char*)byteStuff; + } + else { + cineon->memBuffer = (unsigned char *)byteStuff; + cineon->memCursor = (unsigned char *)byteStuff; cineon->memBufferSize = bufferSize; } @@ -176,12 +177,14 @@ LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t if (header.fileHeader.magic_num == swap_uint(CINEON_FILE_MAGIC, 1)) { cineon->isMSB = 1; if (verbose) printf("Cineon: File is MSB.\n"); - } else if (header.fileHeader.magic_num == CINEON_FILE_MAGIC) { + } + else if (header.fileHeader.magic_num == CINEON_FILE_MAGIC) { cineon->isMSB = 0; if (verbose) printf("Cineon: File is LSB.\n"); - } else { + } + else { if (verbose) printf("Cineon: Bad magic number %lu in \"%s\".\n", - (uintptr_t)header.fileHeader.magic_num, byteStuff); + (uintptr_t)header.fileHeader.magic_num, byteStuff); logImageClose(cineon); return 0; } @@ -314,7 +317,7 @@ LogImageFile *cineonCreate(const char *filename, int width, int height, int bits const char *shortFilename = 0; /* unsigned char pad[6044]; */ - LogImageFile *cineon = (LogImageFile*)MEM_mallocN(sizeof(LogImageFile), __func__); + LogImageFile *cineon = (LogImageFile *)MEM_mallocN(sizeof(LogImageFile), __func__); if (cineon == 0) { if (verbose) printf("cineon: Failed to malloc cineon file structure.\n"); return 0; |