sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

use [].concat, not Ox.merge

Browse source
This commit is contained in:
rolux 2012-05-24 09:45:33 +02:00
commit 1c40fb007b
27 changed files with 87 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

12
source/Ox.Image/Ox.Image.js
View file

@ -96,10 +96,9 @@ Ox.load.Image = function(options, callback) {
function setSL(sl, d) {
var c = sl == 's' ? 1 : 2;
return that.map(function(rgba) {
var hsl = Ox.hsl([rgba[0], rgba[1], rgba[2]]), rgb;
var hsl = Ox.hsl([rgba[0], rgba[1], rgba[2]]);
hsl[c] = d < 0 ? hsl[c] * (d + 1) : hsl[c] + (1 - hsl[c]) * d;
rgb = Ox.rgb(hsl);
return Ox.merge(rgb, rgba[3]);
return Ox.rgb(hsl).concat(rgba[3]);
});
}
@ -150,7 +149,7 @@ Ox.load.Image = function(options, callback) {
: Ox.range(3).map(function() {
return parseInt(val * 255);
});
return Ox.merge(rgb, rgba[3]);
return rgb.concat(rgba[3]);
}
});
}
@ -553,10 +552,9 @@ Ox.load.Image = function(options, callback) {
@*/
that.hue = function(val) {
return that.map(function(rgba) {
var hsl = Ox.hsl([rgba[0], rgba[1], rgba[2]]), rgb;
var hsl = Ox.hsl([rgba[0], rgba[1], rgba[2]]);
hsl[0] = (hsl[0] + val) % 360;
rgb = Ox.rgb(hsl);
return Ox.merge(rgb, rgba[3]);
return Ox.rgb(hsl).concat(rgba[3]);
});
};