[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31937] trunk/blender/source/blender/imbuf /intern: fix for error in last commit.

[Campbell Barton]

Revision: 31937
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31937
Author:   campbellbarton
Date:     2010-09-15 10:00:19 +0200 (Wed, 15 Sep 2010)

Log Message:
-----------
fix for error in last commit.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp
    trunk/blender/source/blender/imbuf/intern/dds/dds_api.h
    trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
    trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.h

Modified: trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp	2010-09-15 07:05:55 UTC (rev 31936)
+++ trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp	2010-09-15 08:00:19 UTC (rev 31937)
@@ -22,6 +22,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <stddef.h>
 #include <dds_api.h>
 #include <Stream.h>
 #include <DirectDrawSurface.h>
@@ -64,7 +65,7 @@
 	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 */

Modified: trunk/blender/source/blender/imbuf/intern/dds/dds_api.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/dds_api.h	2010-09-15 07:05:55 UTC (rev 31936)
+++ trunk/blender/source/blender/imbuf/intern/dds/dds_api.h	2010-09-15 08:00:19 UTC (rev 31937)
@@ -31,7 +31,7 @@
 
 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
 }

Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp	2010-09-15 07:05:55 UTC (rev 31936)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp	2010-09-15 08:00:19 UTC (rev 31937)
@@ -93,7 +93,7 @@
 {
 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 @@
 	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;

Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.h	2010-09-15 07:05:55 UTC (rev 31936)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.h	2010-09-15 08:00:19 UTC (rev 31937)
@@ -48,7 +48,7 @@
 	
 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
 }