diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-28 14:03:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-28 14:03:56 +0400 |
| commit | 8df244f20dc4a2d92bbe496f123f2d6578167949 (patch) | |
| tree | 93b4f34ee3cd5f98e30a3ebe324fdd59669e9ca1 /source/blender/blenkernel/BKE_image.h | |
| parent | 8d50b283cbc663f08b0c4b0e43ed8fdee4a93549 (diff) | |
images bigger then 32k no longer crash blender, use unsigned int for image size rather then short.
also check if jpeg fails to allocate an imbuf.
Diffstat (limited to 'source/blender/blenkernel/BKE_image.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_image.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index e246b51af09..0a07e6d482c 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -115,7 +115,7 @@ void BKE_image_release_ibuf(struct Image *ima, void *lock); struct Image *BKE_add_image_file(const char *name, int frame); /* adds image, adds ibuf, generates color or pattern */ -struct Image *BKE_add_image_size(int width, int height, char *name, int depth, int floatbuf, short uvtestgrid, float color[4]); +struct Image *BKE_add_image_size(unsigned int width, unsigned int height, char *name, int depth, int floatbuf, short uvtestgrid, float color[4]); /* adds image from imbuf, owns imbuf */ struct Image *BKE_add_image_imbuf(struct ImBuf *ibuf); |