Fix measurements to include blue and alpha pixel deviations

Author: Phrogz

test/results.txt

@@ -1,20 +1,20 @@
-normal         wrong:  0%   delta:     491   time:  8.5ms
-screen         wrong:  0%   delta:      73   time:  8.2ms
-multiply       wrong:  0%   delta:     678   time:  9.1ms
-difference     wrong:  0%   delta:      90   time: 10.4ms
+normal         wrong:  1%   delta:     781   time:  8.8ms
+screen         wrong:  1%   delta:     718   time:  8.8ms
+multiply       wrong:  1%   delta:     928   time:  9.9ms
+difference     wrong:  0%   delta:     291   time: 11.2ms
 src-in         wrong:  0%   delta:       0   time:  9.8ms
-add            wrong: 61%   delta:  299093   time:  9.5ms
-overlay        wrong: 55%   delta:  449511   time:  9.3ms
-hardlight      wrong: 55%   delta:  448624   time:  9.6ms
-colordodge     wrong: 56%   delta:  509641   time: 11.0ms
-colorburn      wrong: 57%   delta:  493990   time: 10.2ms
-darken         wrong: 55%   delta:  411961   time:  9.5ms
-lighten        wrong: 69%   delta:  479036   time: 10.1ms
-exclusion      wrong:  0%   delta:     145   time: 10.6ms
-softlight      wrong: 56%   delta:  444223   time: 10.2ms
-luminosity     wrong: 70%   delta:  474287   time: 11.2ms
-color          wrong: 70%   delta:  474206   time: 12.3ms
-hue            wrong: 75%   delta:  532690   time: 15.3ms
-saturation     wrong: 73%   delta:  529623   time: 14.9ms
-lightercolor   wrong: 56%   delta:  462821   time:  6.7ms
-darkercolor    wrong: 55%   delta:  416507   time:  5.4ms
+add            wrong: 62%   delta:  310363   time:  9.6ms
+overlay        wrong: 55%   delta:  470936   time: 10.0ms
+hardlight      wrong: 56%   delta:  469943   time: 10.1ms
+colordodge     wrong: 57%   delta:  548745   time: 11.1ms
+colorburn      wrong: 57%   delta:  535776   time: 10.8ms
+darken         wrong: 55%   delta:  431696   time:  9.6ms
+lighten        wrong: 70%   delta:  503412   time: 10.1ms
+exclusion      wrong:  0%   delta:     294   time: 11.0ms
+softlight      wrong: 56%   delta:  467026   time: 10.6ms
+luminosity     wrong: 73%   delta:  559715   time: 11.8ms
+color          wrong: 73%   delta:  559677   time: 12.9ms
+hue            wrong: 79%   delta:  599536   time: 15.7ms
+saturation     wrong: 79%   delta:  595011   time: 15.3ms
+lightercolor   wrong: 56%   delta:  490698   time:  6.4ms
+darkercolor    wrong: 56%   delta:  437570   time:  5.9ms

test/run_tests.html

@@ -97,7 +97,7 @@
 		}
 
 		function distance(ideal,actual){
-			return Math.sqrt( Math.pow(ideal.r-actual.r,2) + Math.pow(ideal.g-actual.g,2), Math.pow(ideal.b-actual.b,2), Math.pow(ideal.a-actual.a,2) ) * (ideal.a/255);
+			return Math.sqrt( Math.pow(ideal.r-actual.r,2) + Math.pow(ideal.g-actual.g,2) + Math.pow(ideal.b-actual.b,2) + Math.pow(ideal.a-actual.a,2) ) * (ideal.a/255);
 		}
 
 		function pxl(imgdata,i){

test/run_tests.js

@@ -6,7 +6,7 @@ var Canvas  = require(__dirname+'/../context_blender'),
     fs      = require('fs');
 
 var ctx = {};
-var blendModes   = Canvas.Context2d.prototype.blendOnto.supportedBlendModes, 
+var blendModes   = Canvas.Context2d.prototype.blendOnto.supportedBlendModes,
     blendAliases = Canvas.Context2d.prototype.blendOnto.aliases;
 
 var testLoops = 10;
@@ -24,7 +24,7 @@ function go(){
 }
 
 function analyze(mode){
-	ctx.ideal.clearRect(0,0,140,140);	
+	ctx.ideal.clearRect(0,0,140,140);
 	drawOntoContext(ctx.ideal, __dirname+'/'+mode+'-ideal.png');
 	var ideal = ctx.ideal.getImageData(0,0,140,140).data;
 
@@ -43,7 +43,7 @@ function analyze(mode){
 }
 
 function distance(ideal,actual){
-	return Math.sqrt( Math.pow(ideal.r-actual.r,2) + Math.pow(ideal.g-actual.g,2), Math.pow(ideal.b-actual.b,2), Math.pow(ideal.a-actual.a,2) ) * (ideal.a/255);
+	return Math.sqrt( Math.pow(ideal.r-actual.r,2) + Math.pow(ideal.g-actual.g,2) + Math.pow(ideal.b-actual.b,2) + Math.pow(ideal.a-actual.a,2) ) * (ideal.a/255);
 }
 
 function pxl(imgdata,i){