[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48403] branches/soc-2011-tomato/source/ blender/imbuf/intern/filter.c: Tomato Branch:

Thomas Dinges blender at dingto.org
Fri Jun 29 13:42:58 CEST 2012


Revision: 48403
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48403
Author:   dingto
Date:     2012-06-29 11:42:57 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Tomato Branch:
* Compile fix for windows platforms, pow10 -> pow. 

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c	2012-06-29 11:32:12 UTC (rev 48402)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c	2012-06-29 11:42:57 UTC (rev 48403)
@@ -669,7 +669,7 @@
 	// Parameters controlling linear extrapolation.
 	const float LIGHT_SLOPE = 0.023;
 	const float CROSSOVER = pow(10,-KNOT_END);
-	const float REV_CROSSOVER = pow10( -KNOT_DENS[ KNOT_LEN - 1]) - FLARE;
+	const float REV_CROSSOVER = pow(10.0f, -KNOT_DENS[ KNOT_LEN - 1]) - FLARE;
 	const float DARK_SLOPE = REV_CROSSOVER / CROSSOVER;
 
 	// Textbook monomial to basis-function conversion matrix.
@@ -750,7 +750,7 @@
 				}
 			}
         }
-        y = pow10( -out_dens) - FLARE;
+        y = pow(10.0f, -out_dens) - FLARE;
     }
     return y;
 }




More information about the Bf-blender-cvs mailing list