From a8db76f00e9249534b8626fab7c1f5cf9293ac6d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 15 Sep 2010 08:00:19 +0000 Subject: fix for error in last commit. --- source/blender/imbuf/intern/dds/dds_api.cpp | 3 ++- source/blender/imbuf/intern/dds/dds_api.h | 2 +- source/blender/imbuf/intern/openexr/openexr_api.cpp | 4 ++-- source/blender/imbuf/intern/openexr/openexr_api.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp index 9a106253397..2e224893271 100644 --- a/source/blender/imbuf/intern/dds/dds_api.cpp +++ b/source/blender/imbuf/intern/dds/dds_api.cpp @@ -22,6 +22,7 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include #include #include #include @@ -64,7 +65,7 @@ int imb_is_a_dds(unsigned char *mem) // note: use at most first 32 bytes return(1); } -struct ImBuf *imb_load_dds(unsigned char *mem, int size, int flags) +struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags) { struct ImBuf * ibuf = 0; DirectDrawSurface dds(mem, size); /* reads header */ diff --git a/source/blender/imbuf/intern/dds/dds_api.h b/source/blender/imbuf/intern/dds/dds_api.h index 6d9fa0839dd..384570ceb72 100644 --- a/source/blender/imbuf/intern/dds/dds_api.h +++ b/source/blender/imbuf/intern/dds/dds_api.h @@ -31,7 +31,7 @@ extern "C" { int imb_save_dds(struct ImBuf *ibuf, char *name, int flags); int imb_is_a_dds(unsigned char *mem); /* use only first 32 bytes of mem */ -struct ImBuf *imb_load_dds(unsigned char *mem, int size, int flags); +struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags); #ifdef __cplusplus } diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 9b68e0e45eb..4107f051d73 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -93,7 +93,7 @@ class Mem_IStream: public IStream { public: - Mem_IStream (unsigned char *exrbuf, int exrsize): + Mem_IStream (unsigned char *exrbuf, size_t exrsize): IStream("dummy"), _exrpos (0), _exrsize(exrsize) { _exrbuf = exrbuf; } virtual bool read (char c[], int n); @@ -943,7 +943,7 @@ static int exr_is_renderresult(InputFile *file) return 0; } -struct ImBuf *imb_load_openexr(unsigned char *mem, int size, int flags) +struct ImBuf *imb_load_openexr(unsigned char *mem, size_t size, int flags) { struct ImBuf *ibuf = NULL; InputFile *file = NULL; diff --git a/source/blender/imbuf/intern/openexr/openexr_api.h b/source/blender/imbuf/intern/openexr/openexr_api.h index c23b47d1480..c7e4c7d2f57 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.h +++ b/source/blender/imbuf/intern/openexr/openexr_api.h @@ -48,7 +48,7 @@ int imb_is_a_openexr (unsigned char *mem); int imb_save_openexr (struct ImBuf *ibuf, char *name, int flags); -struct ImBuf *imb_load_openexr (unsigned char *mem, int size, int flags); +struct ImBuf *imb_load_openexr (unsigned char *mem, size_t size, int flags); #ifdef __cplusplus } -- cgit v1.2.3