Merge branch 'master' of lmno:dither

2 files changed, 7 insertions, 7 deletions

diff --git a/js/color.js b/js/color.js
index 879a78b..215c3e6 100644
--- a/js/color.js
+++ b/js/color.js
@@ -16,11 +16,11 @@ function rgb2xyz(rgb){
   var var_G = ( rgb[1] / 255 )        //G from 0 to 255
   var var_B = ( rgb[2] / 255 )        //B from 0 to 255
 
-  if ( var_R > 0.04045 ) var_R = ( ( var_R + 0.055 ) / 1.055 ) ^ 2.4
+  if ( var_R > 0.04045 ) var_R = Math.pow( ( var_R + 0.055 ) / 1.055, 2.4)
   else                   var_R = var_R / 12.92
-  if ( var_G > 0.04045 ) var_G = ( ( var_G + 0.055 ) / 1.055 ) ^ 2.4
+  if ( var_G > 0.04045 ) var_G = Math.pow( ( var_G + 0.055 ) / 1.055, 2.4)
   else                   var_G = var_G / 12.92
-  if ( var_B > 0.04045 ) var_B = ( ( var_B + 0.055 ) / 1.055 ) ^ 2.4
+  if ( var_B > 0.04045 ) var_B = Math.pow( ( var_B + 0.055 ) / 1.055, 2.4)
   else                   var_B = var_B / 12.92
 
   var_R = var_R * 100
@@ -107,11 +107,11 @@ function cielab2xyz (lab){
   var var_X = lab[1] / 500 + var_Y
   var var_Z = var_Y - lab[2] / 200
 
-  if ( var_Y^3 > 0.008856 ) var_Y = Math.pow(var_Y, 3)
+  if ( Math.pow(var_Y, 3) > 0.008856 ) var_Y = Math.pow(var_Y, 3)
   else                      var_Y = ( var_Y - 16 / 116 ) / 7.787
-  if ( var_X^3 > 0.008856 ) var_X = Math.pow(var_X, 3)
+  if ( Math.pow(var_X, 3) > 0.008856 ) var_X = Math.pow(var_X, 3)
   else                      var_X = ( var_X - 16 / 116 ) / 7.787
-  if ( var_Z^3 > 0.008856 ) var_Z = Math.pow(var_Z, 3)
+  if ( Math.pow(var_Z, 3) > 0.008856 ) var_Z = Math.pow(var_Z, 3)
   else                      var_Z = ( var_Z - 16 / 116 ) / 7.787
 
   var x = REF_X * var_X     //ref_X =  95.047     Observer= 2°, Illuminant= D65
diff --git a/js/util.js b/js/util.js
index 80fce9c..911e44b 100644
--- a/js/util.js
+++ b/js/util.js
@@ -36,7 +36,7 @@ function tan(n){ return Math.tan(n) }
 function acos(n){ return Math.cos(n) }
 function asin(n){ return Math.sin(n) }
 function atan(n){ return Math.atan(n) }
-function atan2(n){ return Math.atan2(n) }
+function atan2(a,b){ return Math.atan2(a,b) }
 function sec(n){ return 1/cos(n) }
 function csc(n){ return 1/sin(n) }
 function cot(n){ return 1/tan(n) }