diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-07-08 04:04:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-08 04:04:41 +0400 |
commit | 2c8db878974a340e14b59a6ed5a61fb195ccc67c (patch) | |
tree | 92816b7e329337d96140e068ee2166acdf22d250 /source/blender/imbuf/intern/openexr | |
parent | 8b9977e354b0e05c30f8e221a505442c13867f5a (diff) |
fix [#32020] Image will not render in second (any scene other than first) if scene name is longer than 28 characters
Diffstat (limited to 'source/blender/imbuf/intern/openexr')
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 14 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_multi.h | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_stub.cpp | 4 |
3 files changed, 9 insertions, 17 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 18957cb8260..f5479bce570 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -665,9 +665,9 @@ void IMB_exr_read_channels(void *handle) } void IMB_exr_multilayer_convert(void *handle, void *base, - void * (*addlayer)(void *base, char *str), - void (*addpass)(void *base, void *lay, char *str, - float *rect, int totchan, char *chan_id)) + void * (*addlayer)(void *base, const char *str), + void (*addpass)(void *base, void *lay, const char *str, + float *rect, int totchan, const char *chan_id)) { ExrHandle *data = (ExrHandle *)handle; ExrLayer *lay; @@ -908,14 +908,6 @@ static ExrHandle *imb_exr_begin_read_mem(InputFile *file, int width, int height) /* ********************************************************* */ -typedef struct RGBA { - float r; - float g; - float b; - float a; -} RGBA; - - /* debug only */ static void exr_print_filecontents(InputFile *file) { diff --git a/source/blender/imbuf/intern/openexr/openexr_multi.h b/source/blender/imbuf/intern/openexr/openexr_multi.h index 523dc8120c4..78071975c72 100644 --- a/source/blender/imbuf/intern/openexr/openexr_multi.h +++ b/source/blender/imbuf/intern/openexr/openexr_multi.h @@ -37,9 +37,9 @@ /* Note: as for now openexr only supports 32 chars in channel names. * This api also supports max 8 channels per pass now. easy to fix! */ -#define EXR_LAY_MAXNAME 19 +#define EXR_LAY_MAXNAME 51 #define EXR_PASS_MAXNAME 11 -#define EXR_TOT_MAXNAME 32 +#define EXR_TOT_MAXNAME 64 #define EXR_PASS_MAXCHAN 8 @@ -62,8 +62,8 @@ void IMB_exrtile_write_channels(void *handle, int partx, int party, int level void IMB_exrtile_clear_channels(void *handle); void IMB_exr_multilayer_convert(void *handle, void *base, - void * (*addlayer)(void *base, char *str), - void (*addpass)(void *base, void *lay, char *str, float *rect, int totchan, char *chan_id)); + void * (*addlayer)(void *base, const char *str), + void (*addpass)(void *base, void *lay, const char *str, float *rect, int totchan, const char *chan_id)); void IMB_exr_close(void *handle); diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp b/source/blender/imbuf/intern/openexr/openexr_stub.cpp index e896fc58cf3..7262656d4e8 100644 --- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp @@ -48,8 +48,8 @@ void IMB_exrtile_write_channels (void *handle, int partx, int party, int level) void IMB_exrtile_clear_channels (void *handle) { (void)handle; } void IMB_exr_multilayer_convert (void *handle, void *base, - void * (*addlayer)(void *base, char *str), - void (*addpass)(void *base, void *lay, char *str, float *rect, int totchan, char *chan_id)) + void * (*addlayer)(void *base, const char *str), + void (*addpass)(void *base, void *lay, const char *str, float *rect, int totchan, const char *chan_id)) { (void)handle; (void)base; (void)addlayer; (void)addpass; } |