bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix for error in last commit.

Browse Source
This commit is contained in:
Campbell Barton 2010-09-15 08:00:19 +00:00
parent ee7a2ccb22
commit a8db76f00e
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/imbuf/intern/dds/dds_api.cpp
View File

@ -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 @@ 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 */

2
source/blender/imbuf/intern/dds/dds_api.h
View File

@ -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
}

4
source/blender/imbuf/intern/openexr/openexr_api.cpp
View File

@ -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;

2
source/blender/imbuf/intern/openexr/openexr_api.h
View File

@ -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
}