[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58371] branches/soc-2013-paint/source/ blender/editors/sculpt_paint/paint_utils.c: Fix own buffer overflow when sampling colours, meant brush strength

Antony Riakiotakis kalast at gmail.com
Thu Jul 18 19:12:01 CEST 2013


Revision: 58371
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58371
Author:   psy-fi
Date:     2013-07-18 17:12:00 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
Fix own buffer overflow when sampling colours, meant brush strength
could be overwritten.

Modified Paths:
--------------
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_utils.c

Modified: branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_utils.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_utils.c	2013-07-18 17:08:23 UTC (rev 58370)
+++ branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_utils.c	2013-07-18 17:12:00 UTC (rev 58371)
@@ -440,9 +440,9 @@
 							bilinear_interpolation_color_wrap(ibuf, rgba, NULL, u, v);
 							if (use_palette) {
 								PaletteColor *color = BKE_palette_color_add(palette);
-								rgba_uchar_to_float(color->rgb, rgba);
+								rgb_uchar_to_float(color->rgb, rgba);
 							} else if (br) {
-								rgba_uchar_to_float(br->rgb, rgba);
+								rgb_uchar_to_float(br->rgb, rgba);
 							}
 						}
 					}
@@ -468,9 +468,9 @@
 	
 	if (use_palette && palette) {
 		PaletteColor *color = BKE_palette_color_add(palette);
-		rgba_uchar_to_float(color->rgb, cp);
+		rgb_uchar_to_float(color->rgb, cp);
 	} else if (br) {
-		rgba_uchar_to_float(br->rgb, cp);
+		rgb_uchar_to_float(br->rgb, cp);
 	}
 }
 




More information about the Bf-blender-cvs mailing list