[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23172] branches/blender2.4/source/blender /imbuf/intern/jp2.c: Patch [#19315], Fix for Jpeg2000 alpha channel bug [ #19280]

Campbell Barton ideasman42 at gmail.com
Sun Sep 13 10:07:16 CEST 2009


Revision: 23172
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23172
Author:   campbellbarton
Date:     2009-09-13 10:07:15 +0200 (Sun, 13 Sep 2009)

Log Message:
-----------
Patch [#19315], Fix for Jpeg2000 alpha channel bug [#19280]
thanks to Albertas Vy?\197?\161niauskas (thezbyg)

Modified Paths:
--------------
    branches/blender2.4/source/blender/imbuf/intern/jp2.c

Modified: branches/blender2.4/source/blender/imbuf/intern/jp2.c
===================================================================
--- branches/blender2.4/source/blender/imbuf/intern/jp2.c	2009-09-13 07:35:31 UTC (rev 23171)
+++ branches/blender2.4/source/blender/imbuf/intern/jp2.c	2009-09-13 08:07:15 UTC (rev 23172)
@@ -230,7 +230,7 @@
 				rect_float[2]= (float)(image->comps[2].data[index] + signed_offsets[2]) / float_divs[2];
 				
 				if (image->numcomps >= 4)
-					rect_float[3]= (float)(image->comps[2].data[index] + signed_offsets[3]) / float_divs[3];
+					rect_float[3]= (float)(image->comps[3].data[index] + signed_offsets[3]) / float_divs[3];
 				else
 					rect_float[3]= 1.0f;
 			}
@@ -260,7 +260,7 @@
 				rect[2]= image->comps[2].data[index] + signed_offsets[2];
 				
 				if (image->numcomps >= 4)
-					rect[3]= image->comps[2].data[index] + signed_offsets[3];
+					rect[3]= image->comps[3].data[index] + signed_offsets[3];
 				else
 					rect[3]= 255;
 			}





More information about the Bf-blender-cvs mailing list