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/imbuf/intern/allocimbuf.c | |
| 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/imbuf/intern/allocimbuf.c')
| -rw-r--r-- | source/blender/imbuf/intern/allocimbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c index 02fc98f2d63..e67c319e61a 100644 --- a/source/blender/imbuf/intern/allocimbuf.c +++ b/source/blender/imbuf/intern/allocimbuf.c @@ -324,7 +324,7 @@ short imb_addtilesImBuf(ImBuf *ibuf) return (ibuf->tiles != NULL); } -ImBuf *IMB_allocImBuf(short x, short y, uchar d, unsigned int flags, uchar bitmap) /* XXX bitmap argument is deprecated */ +ImBuf *IMB_allocImBuf(unsigned int x, unsigned int y, uchar d, unsigned int flags, uchar bitmap) /* XXX bitmap argument is deprecated */ { ImBuf *ibuf; |