ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused ol.color.blend()

Browse Source
This commit is contained in:
Tim Schaub
2016-03-08 09:03:49 -07:00
parent 091e8059c5
commit 7cf433eb68
2 changed files with 0 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/ol/color/color.js
View File

@@ -54,48 +54,6 @@ ol.color.rgbaColorRe_ =
/^(?:rgba)?\((0|[1-9]\d{0,2}),\s?(0|[1-9]\d{0,2}),\s?(0|[1-9]\d{0,2}),\s?(0|1|0\.\d{0,10})\)$/i;
/**
* @param {ol.Color} dst Destination.
* @param {ol.Color} src Source.
* @param {ol.Color=} opt_color Color.
* @return {ol.Color} Color.
*/
ol.color.blend = function(dst, src, opt_color) {
// http://en.wikipedia.org/wiki/Alpha_compositing
// FIXME do we need to scale by 255?
var out = opt_color ? opt_color : [];
var dstA = dst[3];
var srcA = src[3];
if (dstA == 1) {
out[0] = (src[0] * srcA + dst[0] * (1 - srcA) + 0.5) | 0;
out[1] = (src[1] * srcA + dst[1] * (1 - srcA) + 0.5) | 0;
out[2] = (src[2] * srcA + dst[2] * (1 - srcA) + 0.5) | 0;
out[3] = 1;
} else if (srcA === 0) {
out[0] = dst[0];
out[1] = dst[1];
out[2] = dst[2];
out[3] = dstA;
} else {
var outA = srcA + dstA * (1 - srcA);
if (outA === 0) {
out[0] = 0;
out[1] = 0;
out[2] = 0;
out[3] = 0;
} else {
out[0] = ((src[0] * srcA + dst[0] * dstA * (1 - srcA)) / outA + 0.5) | 0;
out[1] = ((src[1] * srcA + dst[1] * dstA * (1 - srcA)) / outA + 0.5) | 0;
out[2] = ((src[2] * srcA + dst[2] * dstA * (1 - srcA)) / outA + 0.5) | 0;
out[3] = outA;
}
}
goog.asserts.assert(ol.color.isValid(out),
'Output color of blend should be a valid color');
return out;
};
/**
* Return the color as an array. This function maintains a cache of calculated
* arrays which means the result should not be modified.

27
test/spec/ol/color.test.js
View File

@@ -3,33 +3,6 @@ goog.provide('ol.test.color');
describe('ol.color', function() {
describe('ol.color.blend', function() {
it('blends red (a=1) and blue (a=1) to blue (a=1)', function() {
var red = [255, 0, 0, 1];
var blue = [0, 0, 255, 1];
var blended = ol.color.blend(red, blue);
expect(blended).to.eql([0, 0, 255, 1]);
});
it('blends red (a=1) and blue (a=0) to red (a=1)', function() {
var red = [255, 0, 0, 1];
var blue = [0, 0, 255, 0];
var blended = ol.color.blend(red, blue);
expect(blended).to.eql([255, 0, 0, 1]);
});
it('blends red (a=0.5) and blue (a=0.5) to purple (a=0.75)', function() {
var red = [255, 0, 0, 0.5];
var blue = [0, 0, 255, 0.5];
var blended = ol.color.blend(red, blue);
expect(blended).to.eql([85, 0, 170, 0.75]);
});
it('blends red (a=0.5) and blue (a=0) to red (a=0.5)', function() {
var red = [255, 0, 0, 0.5];
var blue = [0, 0, 255, 0];
var blended = ol.color.blend(red, blue);
expect(blended).to.eql([255, 0, 0, 0.5]);
});
});
describe('ol.color.fromString', function() {
before(function() {