[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50085] trunk/blender/source/blender/ blenkernel/intern/colortools.c: Fix #32369: pixel glitch with compositor curves node, and some pixels having

[Brecht Van Lommel]

Revision: 50085
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50085
Author:   blendix
Date:     2012-08-21 13:19:34 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
Fix #32369: pixel glitch with compositor curves node, and some pixels having
black point = white point. That's a degenerate case, clamped it now to 1e5,
which is a bit arbitrary, but infinity would give NaN issues.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/colortools.c

Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c	2012-08-21 13:19:31 UTC (rev 50084)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c	2012-08-21 13:19:34 UTC (rev 50085)
@@ -150,13 +150,8 @@
 	int a;
 
 	for (a = 0; a < 3; a++) {
-		const float delta = white[a] - black[a];
-		if (delta != 0.0f) {
-			r_bwmul[a] = 1.0f / delta;
-		}
-		else {
-			r_bwmul[a] = 0.0f;
-		}
+		const float delta = MAX2(white[a] - black[a], 1e-5f);
+		r_bwmul[a] = 1.0f / delta;
 	}
 }