diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-05 23:27:21 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-05 23:27:21 +0400 |
commit | a6d9a5a972595c898e596deb95eb683430621188 (patch) | |
tree | 0d51b5391d831c16aa7108095e6b5b1380d918ff /source/blender/imbuf | |
parent | 76ddf6d2ee97bf51290492d4c692dd8ca031182c (diff) |
Code cleanup: warning fixes.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/cineon/cineonlib.c | 5 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/logImageCore.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index 922cfcf9629..b4da39ac41e 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -36,6 +36,9 @@ #include <netinet/in.h> /* htonl() */ #endif #include <string.h> /* memset */ + +#include "BLI_utildefines.h" + #include "cin_debug_stuff.h" #include "logmemfile.h" @@ -288,7 +291,7 @@ initCineonGenericHeader(CineonFile* cineon, CineonGenericHeader* header, const c } static void -dumpCineonGenericHeader(CineonGenericHeader* header) { +UNUSED_FUNCTION(dumpCineonGenericHeader)(CineonGenericHeader* header) { dumpCineonFileInfo(&header->fileInfo); dumpCineonImageInfo(&header->imageInfo); dumpCineonFormatInfo(&header->formatInfo); diff --git a/source/blender/imbuf/intern/cineon/logImageCore.h b/source/blender/imbuf/intern/cineon/logImageCore.h index f05c19c4f47..cbc7cb9d64a 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.h +++ b/source/blender/imbuf/intern/cineon/logImageCore.h @@ -38,8 +38,12 @@ extern "C" { #endif #include "BLO_sys_types.h" // for intptr_t support + +#ifdef _MSC_VER #undef ntohl #undef htonl +#endif + typedef int (GetRowFn)(LogImageFile* logImage, unsigned short* row, int lineNum); typedef int (SetRowFn)(LogImageFile* logImage, const unsigned short* row, int lineNum); typedef void (CloseFn)(LogImageFile* logImage); |