diff options
| author | jules <jules@okfoc.us> | 2014-09-29 16:24:38 -0400 |
|---|---|---|
| committer | jules <jules@okfoc.us> | 2014-09-29 16:24:38 -0400 |
| commit | 984f2c492c8ffd6bf6b4717557ccf835f240a592 (patch) | |
| tree | 925504588ced7c471743b7354e0367f5d311f3a2 | |
| parent | 5a65510b53d18c734acaee9fe6e561e298f81d3e (diff) | |
found some carats that should be Math.pow
| -rw-r--r-- | js/color.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/color.js b/js/color.js index 879a78b..5073e7f 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 |