[Bf-blender-cvs] [9432503] master: Fix T38298: crash saving float image with 3 channels from exr to png/jpeg.
Brecht Van Lommel
noreply at git.blender.org
Tue Jan 21 15:31:05 CET 2014
Commit: 94325035f4fa0c45885194efb16eebc1af0d2d65
Author: Brecht Van Lommel
Date: Tue Jan 21 15:28:13 2014 +0100
https://developer.blender.org/rB94325035f4fa0c45885194efb16eebc1af0d2d65
Fix T38298: crash saving float image with 3 channels from exr to png/jpeg.
===================================================================
M source/blender/imbuf/intern/divers.c
===================================================================
diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c
index e33f4d4..e147b81 100644
--- a/source/blender/imbuf/intern/divers.c
+++ b/source/blender/imbuf/intern/divers.c
@@ -552,7 +552,8 @@ void IMB_rect_from_float(ImBuf *ibuf)
IMB_colormanagement_transform(buffer, ibuf->x, ibuf->y, ibuf->channels, from_colorspace, ibuf->rect_colorspace->name, true);
/* convert from float's premul alpha to byte's straight alpha */
- IMB_unpremultiply_rect_float(buffer, ibuf->planes, ibuf->x, ibuf->y);
+ if (ibuf->channels == 4)
+ IMB_unpremultiply_rect_float(buffer, ibuf->planes, ibuf->x, ibuf->y);
/* convert float to byte */
IMB_buffer_byte_from_float((unsigned char *) ibuf->rect, buffer, ibuf->channels, ibuf->dither, IB_PROFILE_SRGB, IB_PROFILE_SRGB,
More information about the Bf-blender-cvs
mailing list