From fcbb3ccc587267bd30f1bb3142f78d50bb41dfc1 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 22 Oct 2016 15:21:57 -0400 Subject: [PATCH] update vibrant --- .../emby-apiclient/.bower.json | 8 +- .../emby-apiclient/connectionmanager.js | 2 +- .../bower_components/vibrant/dist/vibrant.js | 1521 +++++++++-------- 3 files changed, 784 insertions(+), 747 deletions(-) diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json index 9f7932c5f7..233587ba7e 100644 --- a/dashboard-ui/bower_components/emby-apiclient/.bower.json +++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.1.91", - "_release": "1.1.91", + "version": "1.1.92", + "_release": "1.1.92", "_resolution": { "type": "version", - "tag": "1.1.91", - "commit": "f94b80f14bce6922acf1dbd749a60ad54e4abfd8" + "tag": "1.1.92", + "commit": "0a48f9a0b64a422c4466938b24aa983041a89f52" }, "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_target": "^1.1.51", diff --git a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js index 209ca317ee..01a67ddb99 100644 --- a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js +++ b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js @@ -216,7 +216,7 @@ return connectUser; }; - var minServerVersion = '3.0.5994'; + var minServerVersion = '3.0.6040'; self.minServerVersion = function (val) { if (val) { diff --git a/dashboard-ui/bower_components/vibrant/dist/vibrant.js b/dashboard-ui/bower_components/vibrant/dist/vibrant.js index 7b631185c9..a802e3544f 100644 --- a/dashboard-ui/bower_components/vibrant/dist/vibrant.js +++ b/dashboard-ui/bower_components/vibrant/dist/vibrant.js @@ -1,492 +1,527 @@ define([], function () { + 'use strict'; + /* * quantize.js Copyright 2008 Nick Rabinowitz * Ported to node.js by Olivier Lesnicki * Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php */ -// fill out a couple protovis dependencies -/* - * Block below copied from Protovis: http://mbostock.github.com/protovis/ - * Copyright 2010 Stanford Visualization Group - * Licensed under the BSD License: http://www.opensource.org/licenses/bsd-license.php - */ -if (!pv) { + // fill out a couple protovis dependencies + /* + * Block below copied from Protovis: http://mbostock.github.com/protovis/ + * Copyright 2010 Stanford Visualization Group + * Licensed under the BSD License: http://www.opensource.org/licenses/bsd-license.php + */ var pv = { - map: function(array, f) { + map: function (array, f) { var o = {}; - return f ? array.map(function(d, i) { + return f ? array.map(function (d, i) { o.index = i; return f.call(o, d); }) : array.slice(); }, - naturalOrder: function(a, b) { + naturalOrder: function (a, b) { return (a < b) ? -1 : ((a > b) ? 1 : 0); }, - sum: function(array, f) { + sum: function (array, f) { var o = {}; - return array.reduce(f ? function(p, d, i) { + return array.reduce(f ? function (p, d, i) { o.index = i; return p + f.call(o, d); - } : function(p, d) { + } : function (p, d) { return p + d; }, 0); }, - max: function(array, f) { + max: function (array, f) { return Math.max.apply(null, f ? pv.map(array, f) : array); } - } -} + }; -/** - * Basic Javascript port of the MMCQ (modified median cut quantization) - * algorithm from the Leptonica library (http://www.leptonica.com/). - * Returns a color map you can use to map original pixels to the reduced - * palette. Still a work in progress. - * - * @author Nick Rabinowitz - * @example - -// array of pixels as [R,G,B] arrays -var myPixels = [[190,197,190], [202,204,200], [207,214,210], [211,214,211], [205,207,207] - // etc - ]; -var maxColors = 4; - -var cmap = MMCQ.quantize(myPixels, maxColors); -var newPalette = cmap.palette(); -var newPixels = myPixels.map(function(p) { - return cmap.map(p); -}); - - */ -var MMCQ = (function() { - // private constants - var sigbits = 5, - rshift = 8 - sigbits, - maxIterations = 1000, - fractByPopulations = 0.75; + /** + * Basic Javascript port of the MMCQ (modified median cut quantization) + * algorithm from the Leptonica library (http://www.leptonica.com/). + * Returns a color map you can use to map original pixels to the reduced + * palette. Still a work in progress. + * + * @author Nick Rabinowitz + * @example + + // array of pixels as [R,G,B] arrays + var myPixels = [[190,197,190], [202,204,200], [207,214,210], [211,214,211], [205,207,207] + // etc + ]; + var maxColors = 4; + + var cmap = MMCQ.quantize(myPixels, maxColors); + var newPalette = cmap.palette(); + var newPixels = myPixels.map(function(p) { + return cmap.map(p); + }); + + */ + var MMCQ = (function () { + // private constants + var sigbits = 5, + rshift = 8 - sigbits, + maxIterations = 1000, + fractByPopulations = 0.75; - // get reduced-space color index for a pixel + // get reduced-space color index for a pixel - function getColorIndex(r, g, b) { - return (r << (2 * sigbits)) + (g << sigbits) + b; - } - - // Simple priority queue - - function PQueue(comparator) { - var contents = [], - sorted = false; - - function sort() { - contents.sort(comparator); - sorted = true; + function getColorIndex(r, g, b) { + return (r << (2 * sigbits)) + (g << sigbits) + b; } - return { - push: function(o) { - contents.push(o); + // Simple priority queue + + function PQueue(comparator) { + var contents = [], sorted = false; + + function sort() { + contents.sort(comparator); + sorted = true; + } + + return { + push: function (o) { + contents.push(o); + sorted = false; + }, + peek: function (index) { + if (!sorted) { + sort(); + } + if (index === undefined) { + index = contents.length - 1; + } + return contents[index]; + }, + pop: function () { + if (!sorted) { + sort(); + } + return contents.pop(); + }, + size: function () { + return contents.length; + }, + map: function (f) { + return contents.map(f); + }, + debug: function () { + if (!sorted) { + sort(); + } + return contents; + } + }; + } + + // 3d color space box + + function VBox(r1, r2, g1, g2, b1, b2, histo) { + var vbox = this; + vbox.r1 = r1; + vbox.r2 = r2; + vbox.g1 = g1; + vbox.g2 = g2; + vbox.b1 = b1; + vbox.b2 = b2; + vbox.histo = histo; + } + VBox.prototype = { + volume: function (force) { + var vbox = this; + if (!vbox._volume || force) { + vbox._volume = ((vbox.r2 - vbox.r1 + 1) * (vbox.g2 - vbox.g1 + 1) * (vbox.b2 - vbox.b1 + 1)); + } + return vbox._volume; }, - peek: function(index) { - if (!sorted) sort(); - if (index === undefined) index = contents.length - 1; - return contents[index]; + count: function (force) { + var vbox = this, + histo = vbox.histo; + if (!vbox._count_set || force) { + var npix = 0, + i, j, k, index; + for (i = vbox.r1; i <= vbox.r2; i++) { + for (j = vbox.g1; j <= vbox.g2; j++) { + for (k = vbox.b1; k <= vbox.b2; k++) { + index = getColorIndex(i, j, k); + npix += (histo[index] || 0); + } + } + } + vbox._count = npix; + vbox._count_set = true; + } + return vbox._count; }, - pop: function() { - if (!sorted) sort(); - return contents.pop(); + copy: function () { + var vbox = this; + return new VBox(vbox.r1, vbox.r2, vbox.g1, vbox.g2, vbox.b1, vbox.b2, vbox.histo); }, - size: function() { - return contents.length; + avg: function (force) { + var vbox = this, + histo = vbox.histo; + if (!vbox._avg || force) { + var ntot = 0, + mult = 1 << (8 - sigbits), + rsum = 0, + gsum = 0, + bsum = 0, + hval, + i, j, k, histoindex; + for (i = vbox.r1; i <= vbox.r2; i++) { + for (j = vbox.g1; j <= vbox.g2; j++) { + for (k = vbox.b1; k <= vbox.b2; k++) { + histoindex = getColorIndex(i, j, k); + hval = histo[histoindex] || 0; + ntot += hval; + rsum += (hval * (i + 0.5) * mult); + gsum += (hval * (j + 0.5) * mult); + bsum += (hval * (k + 0.5) * mult); + } + } + } + if (ntot) { + vbox._avg = [~~(rsum / ntot), ~~(gsum / ntot), ~~(bsum / ntot)]; + } else { + //console.log('empty box'); + vbox._avg = [~~(mult * (vbox.r1 + vbox.r2 + 1) / 2), ~~(mult * (vbox.g1 + vbox.g2 + 1) / 2), ~~(mult * (vbox.b1 + vbox.b2 + 1) / 2)]; + } + } + return vbox._avg; }, - map: function(f) { - return contents.map(f); - }, - debug: function() { - if (!sorted) sort(); - return contents; + contains: function (pixel) { + var vbox = this, + rval = pixel[0] >> rshift; + gval = pixel[1] >> rshift; + bval = pixel[2] >> rshift; + return (rval >= vbox.r1 && rval <= vbox.r2 && + gval >= vbox.g1 && gval <= vbox.g2 && + bval >= vbox.b1 && bval <= vbox.b2); } }; - } - // 3d color space box + // Color map - function VBox(r1, r2, g1, g2, b1, b2, histo) { - var vbox = this; - vbox.r1 = r1; - vbox.r2 = r2; - vbox.g1 = g1; - vbox.g2 = g2; - vbox.b1 = b1; - vbox.b2 = b2; - vbox.histo = histo; - } - VBox.prototype = { - volume: function(force) { - var vbox = this; - if (!vbox._volume || force) { - vbox._volume = ((vbox.r2 - vbox.r1 + 1) * (vbox.g2 - vbox.g1 + 1) * (vbox.b2 - vbox.b1 + 1)); + function CMap() { + this.vboxes = new PQueue(function (a, b) { + return pv.naturalOrder( + a.vbox.count() * a.vbox.volume(), + b.vbox.count() * b.vbox.volume() + ); + }); + } + CMap.prototype = { + push: function (vbox) { + this.vboxes.push({ + vbox: vbox, + color: vbox.avg() + }); + }, + palette: function () { + return this.vboxes.map(function (vb) { + return vb.color; + }); + }, + size: function () { + return this.vboxes.size(); + }, + map: function (color) { + var vboxes = this.vboxes; + for (var i = 0; i < vboxes.size() ; i++) { + if (vboxes.peek(i).vbox.contains(color)) { + return vboxes.peek(i).color; + } + } + return this.nearest(color); + }, + nearest: function (color) { + var vboxes = this.vboxes, + d1, d2, pColor; + for (var i = 0; i < vboxes.size() ; i++) { + d2 = Math.sqrt( + Math.pow(color[0] - vboxes.peek(i).color[0], 2) + + Math.pow(color[1] - vboxes.peek(i).color[1], 2) + + Math.pow(color[2] - vboxes.peek(i).color[2], 2) + ); + if (d2 < d1 || d1 === undefined) { + d1 = d2; + pColor = vboxes.peek(i).color; + } + } + return pColor; + }, + forcebw: function () { + // XXX: won't work yet + var vboxes = this.vboxes; + vboxes.sort(function (a, b) { + return pv.naturalOrder(pv.sum(a.color), pv.sum(b.color)); + }); + + // force darkest color to black if everything < 5 + var lowest = vboxes[0].color; + if (lowest[0] < 5 && lowest[1] < 5 && lowest[2] < 5) { + vboxes[0].color = [0, 0, 0]; + } + + // force lightest color to white if everything > 251 + var idx = vboxes.length - 1, + highest = vboxes[idx].color; + if (highest[0] > 251 && highest[1] > 251 && highest[2] > 251) { + vboxes[idx].color = [255, 255, 255]; + } } - return vbox._volume; - }, - count: function(force) { - var vbox = this, - histo = vbox.histo; - if (!vbox._count_set || force) { - var npix = 0, - i, j, k, index; + }; + + // histo (1-d array, giving the number of pixels in + // each quantized region of color space), or null on error + + function getHisto(pixels) { + var histosize = 1 << (3 * sigbits), + histo = new Array(histosize), + index, rval, gval, bval; + pixels.forEach(function (pixel) { + rval = pixel[0] >> rshift; + gval = pixel[1] >> rshift; + bval = pixel[2] >> rshift; + index = getColorIndex(rval, gval, bval); + histo[index] = (histo[index] || 0) + 1; + }); + return histo; + } + + function vboxFromPixels(pixels, histo) { + var rmin = 1000000, + rmax = 0, + gmin = 1000000, + gmax = 0, + bmin = 1000000, + bmax = 0, + rval, gval, bval; + // find min/max + pixels.forEach(function (pixel) { + rval = pixel[0] >> rshift; + gval = pixel[1] >> rshift; + bval = pixel[2] >> rshift; + if (rval < rmin) { + rmin = rval; + } + else if (rval > rmax) { + rmax = rval; + } + if (gval < gmin) { + gmin = gval; + } + else if (gval > gmax) { + gmax = gval; + } + if (bval < bmin) { + bmin = bval; + } + else if (bval > bmax) { + bmax = bval; + } + }); + return new VBox(rmin, rmax, gmin, gmax, bmin, bmax, histo); + } + + function medianCutApply(histo, vbox) { + + var vBoxCount = vbox.count(); + + if (!vBoxCount) { + return; + } + + var rw = vbox.r2 - vbox.r1 + 1, + gw = vbox.g2 - vbox.g1 + 1, + bw = vbox.b2 - vbox.b1 + 1, + maxw = pv.max([rw, gw, bw]); + // only one pixel, no split + if (vBoxCount === 1) { + return [vbox.copy()]; + } + /* Find the partial sum arrays along the selected axis. */ + var total = 0, + partialsum = [], + lookaheadsum = [], + i, j, k, sum, index; + if (maxw === rw) { for (i = vbox.r1; i <= vbox.r2; i++) { + sum = 0; for (j = vbox.g1; j <= vbox.g2; j++) { for (k = vbox.b1; k <= vbox.b2; k++) { index = getColorIndex(i, j, k); - npix += (histo[index] || 0); + sum += (histo[index] || 0); } } + total += sum; + partialsum[i] = total; } - vbox._count = npix; - vbox._count_set = true; - } - return vbox._count; - }, - copy: function() { - var vbox = this; - return new VBox(vbox.r1, vbox.r2, vbox.g1, vbox.g2, vbox.b1, vbox.b2, vbox.histo); - }, - avg: function(force) { - var vbox = this, - histo = vbox.histo; - if (!vbox._avg || force) { - var ntot = 0, - mult = 1 << (8 - sigbits), - rsum = 0, - gsum = 0, - bsum = 0, - hval, - i, j, k, histoindex; - for (i = vbox.r1; i <= vbox.r2; i++) { - for (j = vbox.g1; j <= vbox.g2; j++) { + } else if (maxw === gw) { + for (i = vbox.g1; i <= vbox.g2; i++) { + sum = 0; + for (j = vbox.r1; j <= vbox.r2; j++) { for (k = vbox.b1; k <= vbox.b2; k++) { - histoindex = getColorIndex(i, j, k); - hval = histo[histoindex] || 0; - ntot += hval; - rsum += (hval * (i + 0.5) * mult); - gsum += (hval * (j + 0.5) * mult); - bsum += (hval * (k + 0.5) * mult); + index = getColorIndex(j, i, k); + sum += (histo[index] || 0); } } + total += sum; + partialsum[i] = total; } - if (ntot) { - vbox._avg = [~~(rsum / ntot), ~~ (gsum / ntot), ~~ (bsum / ntot)]; - } else { - //console.log('empty box'); - vbox._avg = [~~(mult * (vbox.r1 + vbox.r2 + 1) / 2), ~~ (mult * (vbox.g1 + vbox.g2 + 1) / 2), ~~ (mult * (vbox.b1 + vbox.b2 + 1) / 2)]; + } else { /* maxw == bw */ + for (i = vbox.b1; i <= vbox.b2; i++) { + sum = 0; + for (j = vbox.r1; j <= vbox.r2; j++) { + for (k = vbox.g1; k <= vbox.g2; k++) { + index = getColorIndex(j, k, i); + sum += (histo[index] || 0); + } + } + total += sum; + partialsum[i] = total; } } - return vbox._avg; - }, - contains: function(pixel) { - var vbox = this, - rval = pixel[0] >> rshift; - gval = pixel[1] >> rshift; - bval = pixel[2] >> rshift; - return (rval >= vbox.r1 && rval <= vbox.r2 && - gval >= vbox.g1 && gval <= vbox.g2 && - bval >= vbox.b1 && bval <= vbox.b2); - } - }; - - // Color map - - function CMap() { - this.vboxes = new PQueue(function(a, b) { - return pv.naturalOrder( - a.vbox.count() * a.vbox.volume(), - b.vbox.count() * b.vbox.volume() - ) - });; - } - CMap.prototype = { - push: function(vbox) { - this.vboxes.push({ - vbox: vbox, - color: vbox.avg() - }); - }, - palette: function() { - return this.vboxes.map(function(vb) { - return vb.color - }); - }, - size: function() { - return this.vboxes.size(); - }, - map: function(color) { - var vboxes = this.vboxes; - for (var i = 0; i < vboxes.size(); i++) { - if (vboxes.peek(i).vbox.contains(color)) { - return vboxes.peek(i).color; - } - } - return this.nearest(color); - }, - nearest: function(color) { - var vboxes = this.vboxes, - d1, d2, pColor; - for (var i = 0; i < vboxes.size(); i++) { - d2 = Math.sqrt( - Math.pow(color[0] - vboxes.peek(i).color[0], 2) + - Math.pow(color[1] - vboxes.peek(i).color[1], 2) + - Math.pow(color[2] - vboxes.peek(i).color[2], 2) - ); - if (d2 < d1 || d1 === undefined) { - d1 = d2; - pColor = vboxes.peek(i).color; - } - } - return pColor; - }, - forcebw: function() { - // XXX: won't work yet - var vboxes = this.vboxes; - vboxes.sort(function(a, b) { - return pv.naturalOrder(pv.sum(a.color), pv.sum(b.color)) + partialsum.forEach(function (d, i) { + lookaheadsum[i] = total - d; }); - // force darkest color to black if everything < 5 - var lowest = vboxes[0].color; - if (lowest[0] < 5 && lowest[1] < 5 && lowest[2] < 5) - vboxes[0].color = [0, 0, 0]; - - // force lightest color to white if everything > 251 - var idx = vboxes.length - 1, - highest = vboxes[idx].color; - if (highest[0] > 251 && highest[1] > 251 && highest[2] > 251) - vboxes[idx].color = [255, 255, 255]; - } - }; - - // histo (1-d array, giving the number of pixels in - // each quantized region of color space), or null on error - - function getHisto(pixels) { - var histosize = 1 << (3 * sigbits), - histo = new Array(histosize), - index, rval, gval, bval; - pixels.forEach(function(pixel) { - rval = pixel[0] >> rshift; - gval = pixel[1] >> rshift; - bval = pixel[2] >> rshift; - index = getColorIndex(rval, gval, bval); - histo[index] = (histo[index] || 0) + 1; - }); - return histo; - } - - function vboxFromPixels(pixels, histo) { - var rmin = 1000000, - rmax = 0, - gmin = 1000000, - gmax = 0, - bmin = 1000000, - bmax = 0, - rval, gval, bval; - // find min/max - pixels.forEach(function(pixel) { - rval = pixel[0] >> rshift; - gval = pixel[1] >> rshift; - bval = pixel[2] >> rshift; - if (rval < rmin) rmin = rval; - else if (rval > rmax) rmax = rval; - if (gval < gmin) gmin = gval; - else if (gval > gmax) gmax = gval; - if (bval < bmin) bmin = bval; - else if (bval > bmax) bmax = bval; - }); - return new VBox(rmin, rmax, gmin, gmax, bmin, bmax, histo); - } - - function medianCutApply(histo, vbox) { - if (!vbox.count()) return; - - var rw = vbox.r2 - vbox.r1 + 1, - gw = vbox.g2 - vbox.g1 + 1, - bw = vbox.b2 - vbox.b1 + 1, - maxw = pv.max([rw, gw, bw]); - // only one pixel, no split - if (vbox.count() == 1) { - return [vbox.copy()] - } - /* Find the partial sum arrays along the selected axis. */ - var total = 0, - partialsum = [], - lookaheadsum = [], - i, j, k, sum, index; - if (maxw == rw) { - for (i = vbox.r1; i <= vbox.r2; i++) { - sum = 0; - for (j = vbox.g1; j <= vbox.g2; j++) { - for (k = vbox.b1; k <= vbox.b2; k++) { - index = getColorIndex(i, j, k); - sum += (histo[index] || 0); + function doCut(color) { + var dim1 = color + '1', + dim2 = color + '2', + left, right, vbox1, vbox2, d2, count2 = 0; + for (i = vbox[dim1]; i <= vbox[dim2]; i++) { + if (partialsum[i] > total / 2) { + vbox1 = vbox.copy(); + vbox2 = vbox.copy(); + left = i - vbox[dim1]; + right = vbox[dim2] - i; + if (left <= right) { + d2 = Math.min(vbox[dim2] - 1, ~~(i + right / 2)); + } + else { + d2 = Math.max(vbox[dim1], ~~(i - 1 - left / 2)); + } + // avoid 0-count boxes + while (!partialsum[d2]) { + d2++; + } + count2 = lookaheadsum[d2]; + while (!count2 && partialsum[d2 - 1]) { + count2 = lookaheadsum[--d2]; + } + // set dimensions + vbox1[dim2] = d2; + vbox2[dim1] = vbox1[dim2] + 1; + return [vbox1, vbox2]; } } - total += sum; - partialsum[i] = total; - } - } else if (maxw == gw) { - for (i = vbox.g1; i <= vbox.g2; i++) { - sum = 0; - for (j = vbox.r1; j <= vbox.r2; j++) { - for (k = vbox.b1; k <= vbox.b2; k++) { - index = getColorIndex(j, i, k); - sum += (histo[index] || 0); - } - } - total += sum; - partialsum[i] = total; - } - } else { /* maxw == bw */ - for (i = vbox.b1; i <= vbox.b2; i++) { - sum = 0; - for (j = vbox.r1; j <= vbox.r2; j++) { - for (k = vbox.g1; k <= vbox.g2; k++) { - index = getColorIndex(j, k, i); - sum += (histo[index] || 0); - } - } - total += sum; - partialsum[i] = total; - } - } - partialsum.forEach(function(d, i) { - lookaheadsum[i] = total - d - }); - function doCut(color) { - var dim1 = color + '1', - dim2 = color + '2', - left, right, vbox1, vbox2, d2, count2 = 0; - for (i = vbox[dim1]; i <= vbox[dim2]; i++) { - if (partialsum[i] > total / 2) { - vbox1 = vbox.copy(); - vbox2 = vbox.copy(); - left = i - vbox[dim1]; - right = vbox[dim2] - i; - if (left <= right) - d2 = Math.min(vbox[dim2] - 1, ~~ (i + right / 2)); - else d2 = Math.max(vbox[dim1], ~~ (i - 1 - left / 2)); - // avoid 0-count boxes - while (!partialsum[d2]) d2++; - count2 = lookaheadsum[d2]; - while (!count2 && partialsum[d2 - 1]) count2 = lookaheadsum[--d2]; - // set dimensions - vbox1[dim2] = d2; - vbox2[dim1] = vbox1[dim2] + 1; - // console.log('vbox counts:', vbox.count(), vbox1.count(), vbox2.count()); - return [vbox1, vbox2]; - } } - - } - // determine the cut planes - return maxw == rw ? doCut('r') : - maxw == gw ? doCut('g') : - doCut('b'); - } - - function quantize(pixels, maxcolors) { - // short-circuit - if (!pixels.length || maxcolors < 2 || maxcolors > 256) { - // console.log('wrong number of maxcolors'); - return false; + // determine the cut planes + return maxw === rw ? doCut('r') : + maxw === gw ? doCut('g') : + doCut('b'); } - // XXX: check color content and convert to grayscale if insufficient + function quantize(pixels, maxcolors) { + // short-circuit + if (!pixels.length || maxcolors < 2 || maxcolors > 256) { + // console.log('wrong number of maxcolors'); + return false; + } - var histo = getHisto(pixels), - histosize = 1 << (3 * sigbits); + // XXX: check color content and convert to grayscale if insufficient - // check that we aren't below maxcolors already - var nColors = 0; - histo.forEach(function() { - nColors++ - }); - if (nColors <= maxcolors) { - // XXX: generate the new colors from the histo and return - } + var histo = getHisto(pixels), + histosize = 1 << (3 * sigbits); - // get the beginning vbox from the colors - var vbox = vboxFromPixels(pixels, histo), - pq = new PQueue(function(a, b) { - return pv.naturalOrder(a.count(), b.count()) + // check that we aren't below maxcolors already + var nColors = 0; + histo.forEach(function () { + nColors++; }); - pq.push(vbox); + if (nColors <= maxcolors) { + // XXX: generate the new colors from the histo and return + } - // inner function to do the iteration + // get the beginning vbox from the colors + var vbox = vboxFromPixels(pixels, histo), + pq = new PQueue(function (a, b) { + return pv.naturalOrder(a.count(), b.count()); + }); + pq.push(vbox); - function iter(lh, target) { - var ncolors = 1, - niters = 0, - vbox; - while (niters < maxIterations) { - vbox = lh.pop(); - if (!vbox.count()) { /* just put it back */ - lh.push(vbox); - niters++; - continue; - } - // do the cut - var vboxes = medianCutApply(histo, vbox), - vbox1 = vboxes[0], - vbox2 = vboxes[1]; + // inner function to do the iteration - if (!vbox1) { - // console.log("vbox1 not defined; shouldn't happen!"); - return; - } - lh.push(vbox1); - if (vbox2) { /* vbox2 can be null */ - lh.push(vbox2); - ncolors++; - } - if (ncolors >= target) return; - if (niters++ > maxIterations) { - // console.log("infinite loop; perhaps too few pixels!"); - return; + function iter(lh, target) { + var ncolors = 1, + niters = 0, + vbox; + while (niters < maxIterations) { + vbox = lh.pop(); + if (!vbox.count()) { /* just put it back */ + lh.push(vbox); + niters++; + continue; + } + // do the cut + var vboxes = medianCutApply(histo, vbox), + vbox1 = vboxes[0], + vbox2 = vboxes[1]; + + if (!vbox1) { + // console.log("vbox1 not defined; shouldn't happen!"); + return; + } + lh.push(vbox1); + if (vbox2) { /* vbox2 can be null */ + lh.push(vbox2); + ncolors++; + } + if (ncolors >= target) { + return; + } + if (niters++ > maxIterations) { + // console.log("infinite loop; perhaps too few pixels!"); + return; + } } } + + // first set of colors, sorted by population + iter(pq, fractByPopulations * maxcolors); + // console.log(pq.size(), pq.debug().length, pq.debug().slice()); + + // Re-sort by the product of pixel occupancy times the size in color space. + var pq2 = new PQueue(function (a, b) { + return pv.naturalOrder(a.count() * a.volume(), b.count() * b.volume()); + }); + while (pq.size()) { + pq2.push(pq.pop()); + } + + // next set - generate the median cuts using the (npix * vol) sorting. + iter(pq2, maxcolors - pq2.size()); + + // calculate the actual colors + var cmap = new CMap(); + while (pq2.size()) { + cmap.push(pq2.pop()); + } + + return cmap; } - // first set of colors, sorted by population - iter(pq, fractByPopulations * maxcolors); - // console.log(pq.size(), pq.debug().length, pq.debug().slice()); - - // Re-sort by the product of pixel occupancy times the size in color space. - var pq2 = new PQueue(function(a, b) { - return pv.naturalOrder(a.count() * a.volume(), b.count() * b.volume()) - }); - while (pq.size()) { - pq2.push(pq.pop()); - } - - // next set - generate the median cuts using the (npix * vol) sorting. - iter(pq2, maxcolors - pq2.size()); - - // calculate the actual colors - var cmap = new CMap(); - while (pq2.size()) { - cmap.push(pq2.pop()); - } - - return cmap; - } - - return { - quantize: quantize - } -})(); + return { + quantize: quantize + }; + })(); /* Vibrant.js @@ -500,326 +535,328 @@ var MMCQ = (function() { Google - Palette support library in Android */ -var CanvasImage, Swatch, Vibrant, - bind = function (fn, me) { return function () { return fn.apply(me, arguments); }; }, - slice = [].slice; + var CanvasImage, Swatch, Vibrant, + bind = function (fn, me) { return function () { return fn.apply(me, arguments); }; }, + slice = [].slice; -window.Swatch = Swatch = (function () { - Swatch.prototype.hsl = void 0; + window.Swatch = Swatch = (function () { + Swatch.prototype.hsl = void 0; - Swatch.prototype.rgb = void 0; + Swatch.prototype.rgb = void 0; - Swatch.prototype.population = 1; + Swatch.prototype.population = 1; - Swatch.yiq = 0; + Swatch.yiq = 0; - function Swatch(rgb, population) { - this.rgb = rgb; - this.population = population; - } + function Swatch(rgb, population) { + this.rgb = rgb; + this.population = population; + } - Swatch.prototype.getHsl = function () { - if (!this.hsl) { - return this.hsl = Vibrant.rgbToHsl(this.rgb[0], this.rgb[1], this.rgb[2]); - } else { + Swatch.prototype.getHsl = function () { + if (!this.hsl) { + this.hsl = Vibrant.rgbToHsl(this.rgb[0], this.rgb[1], this.rgb[2]); + } return this.hsl; + }; + + Swatch.prototype.getPopulation = function () { + return this.population; + }; + + Swatch.prototype.getRgb = function () { + return this.rgb; + }; + + Swatch.prototype.getHex = function () { + return "#" + ((1 << 24) + (this.rgb[0] << 16) + (this.rgb[1] << 8) + this.rgb[2]).toString(16).slice(1, 7); + }; + + Swatch.prototype.getTitleTextColor = function () { + this._ensureTextColors(); + if (this.yiq < 200) { + return "#fff"; + } else { + return "#000"; + } + }; + + Swatch.prototype.getBodyTextColor = function () { + this._ensureTextColors(); + if (this.yiq < 150) { + return "#fff"; + } else { + return "#000"; + } + }; + + Swatch.prototype._ensureTextColors = function () { + if (!this.yiq) { + this.yiq = (this.rgb[0] * 299 + this.rgb[1] * 587 + this.rgb[2] * 114) / 1000; + return this.yiq; + } + }; + + return Swatch; + + })(); + + window.Vibrant = Vibrant = (function () { + Vibrant.prototype.quantize = MMCQ.quantize; + Vibrant.prototype._swatches = []; + + Vibrant.prototype.TARGET_DARK_LUMA = 0.26; + + Vibrant.prototype.MAX_DARK_LUMA = 0.45; + + Vibrant.prototype.MIN_LIGHT_LUMA = 0.55; + + Vibrant.prototype.TARGET_LIGHT_LUMA = 0.74; + + Vibrant.prototype.MIN_NORMAL_LUMA = 0.3; + + Vibrant.prototype.TARGET_NORMAL_LUMA = 0.5; + + Vibrant.prototype.MAX_NORMAL_LUMA = 0.7; + + Vibrant.prototype.TARGET_MUTED_SATURATION = 0.3; + + Vibrant.prototype.MAX_MUTED_SATURATION = 0.4; + + Vibrant.prototype.TARGET_VIBRANT_SATURATION = 1; + + Vibrant.prototype.MIN_VIBRANT_SATURATION = 0.35; + + Vibrant.prototype.WEIGHT_SATURATION = 3; + + Vibrant.prototype.WEIGHT_LUMA = 6; + + Vibrant.prototype.WEIGHT_POPULATION = 1; + + Vibrant.prototype.VibrantSwatch = void 0; + + Vibrant.prototype.MutedSwatch = void 0; + + Vibrant.prototype.DarkVibrantSwatch = void 0; + + Vibrant.prototype.DarkMutedSwatch = void 0; + + Vibrant.prototype.LightVibrantSwatch = void 0; + + Vibrant.prototype.LightMutedSwatch = void 0; + + Vibrant.prototype.HighestPopulation = 0; + + function Vibrant(sourceImage, colorCount, quality) { + this.swatches = bind(this.swatches, this); + var a, allPixels, b, cmap, g, i, image, imageData, offset, pixelCount, pixels, r; + if (typeof colorCount === 'undefined') { + colorCount = 16; + } + if (typeof quality === 'undefined') { + quality = 5; + } + image = new CanvasImage(sourceImage); + try { + imageData = image.getImageData(); + pixels = imageData.data; + pixelCount = image.getPixelCount(); + allPixels = []; + i = 0; + while (i < pixelCount) { + offset = i * 4; + r = pixels[offset + 0]; + g = pixels[offset + 1]; + b = pixels[offset + 2]; + a = pixels[offset + 3]; + if (a >= 125) { + if (!(r > 250 && g > 250 && b > 250)) { + allPixels.push([r, g, b]); + } + } + i = i + quality; + } + cmap = this.quantize(allPixels, colorCount); + this._swatches = cmap.vboxes.map((function (_this) { + return function (vbox) { + return new Swatch(vbox.color, vbox.vbox.count()); + }; + })(this)); + this.maxPopulation = this.findMaxPopulation; + this.generateVarationColors(); + this.generateEmptySwatches(); + } finally { + image.removeCanvas(); + } } - }; - Swatch.prototype.getPopulation = function () { - return this.population; - }; + Vibrant.prototype.generateVarationColors = function () { + this.VibrantSwatch = this.findColorVariation(this.TARGET_NORMAL_LUMA, this.MIN_NORMAL_LUMA, this.MAX_NORMAL_LUMA, this.TARGET_VIBRANT_SATURATION, this.MIN_VIBRANT_SATURATION, 1); + this.LightVibrantSwatch = this.findColorVariation(this.TARGET_LIGHT_LUMA, this.MIN_LIGHT_LUMA, 1, this.TARGET_VIBRANT_SATURATION, this.MIN_VIBRANT_SATURATION, 1); + this.DarkVibrantSwatch = this.findColorVariation(this.TARGET_DARK_LUMA, 0, this.MAX_DARK_LUMA, this.TARGET_VIBRANT_SATURATION, this.MIN_VIBRANT_SATURATION, 1); + this.MutedSwatch = this.findColorVariation(this.TARGET_NORMAL_LUMA, this.MIN_NORMAL_LUMA, this.MAX_NORMAL_LUMA, this.TARGET_MUTED_SATURATION, 0, this.MAX_MUTED_SATURATION); + this.LightMutedSwatch = this.findColorVariation(this.TARGET_LIGHT_LUMA, this.MIN_LIGHT_LUMA, 1, this.TARGET_MUTED_SATURATION, 0, this.MAX_MUTED_SATURATION); + this.DarkMutedSwatch = this.findColorVariation(this.TARGET_DARK_LUMA, 0, this.MAX_DARK_LUMA, this.TARGET_MUTED_SATURATION, 0, this.MAX_MUTED_SATURATION); + return this.DarkMutedSwatch; + }; - Swatch.prototype.getRgb = function () { - return this.rgb; - }; + Vibrant.prototype.generateEmptySwatches = function () { + var hsl; + if (this.VibrantSwatch === void 0) { + if (this.DarkVibrantSwatch !== void 0) { + hsl = this.DarkVibrantSwatch.getHsl(); + hsl[2] = this.TARGET_NORMAL_LUMA; + this.VibrantSwatch = new Swatch(Vibrant.hslToRgb(hsl[0], hsl[1], hsl[2]), 0); + } + } + if (this.DarkVibrantSwatch === void 0) { + if (this.VibrantSwatch !== void 0) { + hsl = this.VibrantSwatch.getHsl(); + hsl[2] = this.TARGET_DARK_LUMA; + this.DarkVibrantSwatch = new Swatch(Vibrant.hslToRgb(hsl[0], hsl[1], hsl[2]), 0); + return this.DarkVibrantSwatch; + } + } + }; - Swatch.prototype.getHex = function () { - return "#" + ((1 << 24) + (this.rgb[0] << 16) + (this.rgb[1] << 8) + this.rgb[2]).toString(16).slice(1, 7); - }; + Vibrant.prototype.findMaxPopulation = function () { + var j, len, population, ref, swatch; + population = 0; + ref = this._swatches; + for (j = 0, len = ref.length; j < len; j++) { + swatch = ref[j]; + population = Math.max(population, swatch.getPopulation()); + } + return population; + }; - Swatch.prototype.getTitleTextColor = function () { - this._ensureTextColors(); - if (this.yiq < 200) { - return "#fff"; - } else { - return "#000"; - } - }; - - Swatch.prototype.getBodyTextColor = function () { - this._ensureTextColors(); - if (this.yiq < 150) { - return "#fff"; - } else { - return "#000"; - } - }; - - Swatch.prototype._ensureTextColors = function () { - if (!this.yiq) { - return this.yiq = (this.rgb[0] * 299 + this.rgb[1] * 587 + this.rgb[2] * 114) / 1000; - } - }; - - return Swatch; - -})(); - -window.Vibrant = Vibrant = (function () { - Vibrant.prototype.quantize = MMCQ.quantize; - Vibrant.prototype._swatches = []; - - Vibrant.prototype.TARGET_DARK_LUMA = 0.26; - - Vibrant.prototype.MAX_DARK_LUMA = 0.45; - - Vibrant.prototype.MIN_LIGHT_LUMA = 0.55; - - Vibrant.prototype.TARGET_LIGHT_LUMA = 0.74; - - Vibrant.prototype.MIN_NORMAL_LUMA = 0.3; - - Vibrant.prototype.TARGET_NORMAL_LUMA = 0.5; - - Vibrant.prototype.MAX_NORMAL_LUMA = 0.7; - - Vibrant.prototype.TARGET_MUTED_SATURATION = 0.3; - - Vibrant.prototype.MAX_MUTED_SATURATION = 0.4; - - Vibrant.prototype.TARGET_VIBRANT_SATURATION = 1; - - Vibrant.prototype.MIN_VIBRANT_SATURATION = 0.35; - - Vibrant.prototype.WEIGHT_SATURATION = 3; - - Vibrant.prototype.WEIGHT_LUMA = 6; - - Vibrant.prototype.WEIGHT_POPULATION = 1; - - Vibrant.prototype.VibrantSwatch = void 0; - - Vibrant.prototype.MutedSwatch = void 0; - - Vibrant.prototype.DarkVibrantSwatch = void 0; - - Vibrant.prototype.DarkMutedSwatch = void 0; - - Vibrant.prototype.LightVibrantSwatch = void 0; - - Vibrant.prototype.LightMutedSwatch = void 0; - - Vibrant.prototype.HighestPopulation = 0; - - function Vibrant(sourceImage, colorCount, quality) { - this.swatches = bind(this.swatches, this); - var a, allPixels, b, cmap, g, i, image, imageData, offset, pixelCount, pixels, r; - if (typeof colorCount === 'undefined') { - colorCount = 16; - } - if (typeof quality === 'undefined') { - quality = 5; - } - image = new CanvasImage(sourceImage); - try { - imageData = image.getImageData(); - pixels = imageData.data; - pixelCount = image.getPixelCount(); - allPixels = []; - i = 0; - while (i < pixelCount) { - offset = i * 4; - r = pixels[offset + 0]; - g = pixels[offset + 1]; - b = pixels[offset + 2]; - a = pixels[offset + 3]; - if (a >= 125) { - if (!(r > 250 && g > 250 && b > 250)) { - allPixels.push([r, g, b]); + Vibrant.prototype.findColorVariation = function (targetLuma, minLuma, maxLuma, targetSaturation, minSaturation, maxSaturation) { + var j, len, luma, max, maxValue, ref, sat, swatch, value; + max = void 0; + maxValue = 0; + ref = this._swatches; + for (j = 0, len = ref.length; j < len; j++) { + swatch = ref[j]; + sat = swatch.getHsl()[1]; + luma = swatch.getHsl()[2]; + if (sat >= minSaturation && sat <= maxSaturation && luma >= minLuma && luma <= maxLuma && !this.isAlreadySelected(swatch)) { + value = this.createComparisonValue(sat, targetSaturation, luma, targetLuma, swatch.getPopulation(), this.HighestPopulation); + if (max === void 0 || value > maxValue) { + max = swatch; + maxValue = value; } } - i = i + quality; } - cmap = this.quantize(allPixels, colorCount); - this._swatches = cmap.vboxes.map((function (_this) { - return function (vbox) { - return new Swatch(vbox.color, vbox.vbox.count()); - }; - })(this)); - this.maxPopulation = this.findMaxPopulation; - this.generateVarationColors(); - this.generateEmptySwatches(); - } finally { - image.removeCanvas(); - } - } + return max; + }; - Vibrant.prototype.generateVarationColors = function () { - this.VibrantSwatch = this.findColorVariation(this.TARGET_NORMAL_LUMA, this.MIN_NORMAL_LUMA, this.MAX_NORMAL_LUMA, this.TARGET_VIBRANT_SATURATION, this.MIN_VIBRANT_SATURATION, 1); - this.LightVibrantSwatch = this.findColorVariation(this.TARGET_LIGHT_LUMA, this.MIN_LIGHT_LUMA, 1, this.TARGET_VIBRANT_SATURATION, this.MIN_VIBRANT_SATURATION, 1); - this.DarkVibrantSwatch = this.findColorVariation(this.TARGET_DARK_LUMA, 0, this.MAX_DARK_LUMA, this.TARGET_VIBRANT_SATURATION, this.MIN_VIBRANT_SATURATION, 1); - this.MutedSwatch = this.findColorVariation(this.TARGET_NORMAL_LUMA, this.MIN_NORMAL_LUMA, this.MAX_NORMAL_LUMA, this.TARGET_MUTED_SATURATION, 0, this.MAX_MUTED_SATURATION); - this.LightMutedSwatch = this.findColorVariation(this.TARGET_LIGHT_LUMA, this.MIN_LIGHT_LUMA, 1, this.TARGET_MUTED_SATURATION, 0, this.MAX_MUTED_SATURATION); - return this.DarkMutedSwatch = this.findColorVariation(this.TARGET_DARK_LUMA, 0, this.MAX_DARK_LUMA, this.TARGET_MUTED_SATURATION, 0, this.MAX_MUTED_SATURATION); - }; + Vibrant.prototype.createComparisonValue = function (saturation, targetSaturation, luma, targetLuma, population, maxPopulation) { + return this.weightedMean(this.invertDiff(saturation, targetSaturation), this.WEIGHT_SATURATION, this.invertDiff(luma, targetLuma), this.WEIGHT_LUMA, population / maxPopulation, this.WEIGHT_POPULATION); + }; - Vibrant.prototype.generateEmptySwatches = function () { - var hsl; - if (this.VibrantSwatch === void 0) { - if (this.DarkVibrantSwatch !== void 0) { - hsl = this.DarkVibrantSwatch.getHsl(); - hsl[2] = this.TARGET_NORMAL_LUMA; - this.VibrantSwatch = new Swatch(Vibrant.hslToRgb(hsl[0], hsl[1], hsl[2]), 0); + Vibrant.prototype.invertDiff = function (value, targetValue) { + return 1 - Math.abs(value - targetValue); + }; + + Vibrant.prototype.weightedMean = function () { + var i, sum, sumWeight, value, values, weight; + values = 1 <= arguments.length ? slice.call(arguments, 0) : []; + sum = 0; + sumWeight = 0; + i = 0; + while (i < values.length) { + value = values[i]; + weight = values[i + 1]; + sum += value * weight; + sumWeight += weight; + i += 2; } - } - if (this.DarkVibrantSwatch === void 0) { - if (this.VibrantSwatch !== void 0) { - hsl = this.VibrantSwatch.getHsl(); - hsl[2] = this.TARGET_DARK_LUMA; - return this.DarkVibrantSwatch = new Swatch(Vibrant.hslToRgb(hsl[0], hsl[1], hsl[2]), 0); - } - } - }; + return sum / sumWeight; + }; - Vibrant.prototype.findMaxPopulation = function () { - var j, len, population, ref, swatch; - population = 0; - ref = this._swatches; - for (j = 0, len = ref.length; j < len; j++) { - swatch = ref[j]; - population = Math.max(population, swatch.getPopulation()); - } - return population; - }; + Vibrant.prototype.swatches = function () { + return { + Vibrant: this.VibrantSwatch, + Muted: this.MutedSwatch, + DarkVibrant: this.DarkVibrantSwatch, + DarkMuted: this.DarkMutedSwatch, + LightVibrant: this.LightVibrantSwatch, + LightMuted: this.LightMuted + }; + }; - Vibrant.prototype.findColorVariation = function (targetLuma, minLuma, maxLuma, targetSaturation, minSaturation, maxSaturation) { - var j, len, luma, max, maxValue, ref, sat, swatch, value; - max = void 0; - maxValue = 0; - ref = this._swatches; - for (j = 0, len = ref.length; j < len; j++) { - swatch = ref[j]; - sat = swatch.getHsl()[1]; - luma = swatch.getHsl()[2]; - if (sat >= minSaturation && sat <= maxSaturation && luma >= minLuma && luma <= maxLuma && !this.isAlreadySelected(swatch)) { - value = this.createComparisonValue(sat, targetSaturation, luma, targetLuma, swatch.getPopulation(), this.HighestPopulation); - if (max === void 0 || value > maxValue) { - max = swatch; - maxValue = value; + Vibrant.prototype.isAlreadySelected = function (swatch) { + return this.VibrantSwatch === swatch || this.DarkVibrantSwatch === swatch || this.LightVibrantSwatch === swatch || this.MutedSwatch === swatch || this.DarkMutedSwatch === swatch || this.LightMutedSwatch === swatch; + }; + + Vibrant.rgbToHsl = function (r, g, b) { + var d, h, l, max, min, s; + r /= 255; + g /= 255; + b /= 255; + max = Math.max(r, g, b); + min = Math.min(r, g, b); + h = void 0; + s = void 0; + l = (max + min) / 2; + if (max === min) { + h = s = 0; + } else { + d = max - min; + s = l > 0.5 ? d / (2 - max - min) : d / (max + min); + switch (max) { + case r: + h = (g - b) / d + (g < b ? 6 : 0); + break; + case g: + h = (b - r) / d + 2; + break; + case b: + h = (r - g) / d + 4; } + h /= 6; } - } - return max; - }; - - Vibrant.prototype.createComparisonValue = function (saturation, targetSaturation, luma, targetLuma, population, maxPopulation) { - return this.weightedMean(this.invertDiff(saturation, targetSaturation), this.WEIGHT_SATURATION, this.invertDiff(luma, targetLuma), this.WEIGHT_LUMA, population / maxPopulation, this.WEIGHT_POPULATION); - }; - - Vibrant.prototype.invertDiff = function (value, targetValue) { - return 1 - Math.abs(value - targetValue); - }; - - Vibrant.prototype.weightedMean = function () { - var i, sum, sumWeight, value, values, weight; - values = 1 <= arguments.length ? slice.call(arguments, 0) : []; - sum = 0; - sumWeight = 0; - i = 0; - while (i < values.length) { - value = values[i]; - weight = values[i + 1]; - sum += value * weight; - sumWeight += weight; - i += 2; - } - return sum / sumWeight; - }; - - Vibrant.prototype.swatches = function () { - return { - Vibrant: this.VibrantSwatch, - Muted: this.MutedSwatch, - DarkVibrant: this.DarkVibrantSwatch, - DarkMuted: this.DarkMutedSwatch, - LightVibrant: this.LightVibrantSwatch, - LightMuted: this.LightMuted + return [h, s, l]; }; - }; - Vibrant.prototype.isAlreadySelected = function (swatch) { - return this.VibrantSwatch === swatch || this.DarkVibrantSwatch === swatch || this.LightVibrantSwatch === swatch || this.MutedSwatch === swatch || this.DarkMutedSwatch === swatch || this.LightMutedSwatch === swatch; - }; - - Vibrant.rgbToHsl = function (r, g, b) { - var d, h, l, max, min, s; - r /= 255; - g /= 255; - b /= 255; - max = Math.max(r, g, b); - min = Math.min(r, g, b); - h = void 0; - s = void 0; - l = (max + min) / 2; - if (max === min) { - h = s = 0; - } else { - d = max - min; - s = l > 0.5 ? d / (2 - max - min) : d / (max + min); - switch (max) { - case r: - h = (g - b) / d + (g < b ? 6 : 0); - break; - case g: - h = (b - r) / d + 2; - break; - case b: - h = (r - g) / d + 4; + Vibrant.hslToRgb = function (h, s, l) { + var b, g, hue2rgb, p, q, r; + r = void 0; + g = void 0; + b = void 0; + hue2rgb = function (p, q, t) { + if (t < 0) { + t += 1; + } + if (t > 1) { + t -= 1; + } + if (t < 1 / 6) { + return p + (q - p) * 6 * t; + } + if (t < 1 / 2) { + return q; + } + if (t < 2 / 3) { + return p + (q - p) * (2 / 3 - t) * 6; + } + return p; + }; + if (s === 0) { + r = g = b = l; + } else { + q = l < 0.5 ? l * (1 + s) : l + s - (l * s); + p = 2 * l - q; + r = hue2rgb(p, q, h + 1 / 3); + g = hue2rgb(p, q, h); + b = hue2rgb(p, q, h - (1 / 3)); } - h /= 6; - } - return [h, s, l]; - }; - - Vibrant.hslToRgb = function (h, s, l) { - var b, g, hue2rgb, p, q, r; - r = void 0; - g = void 0; - b = void 0; - hue2rgb = function (p, q, t) { - if (t < 0) { - t += 1; - } - if (t > 1) { - t -= 1; - } - if (t < 1 / 6) { - return p + (q - p) * 6 * t; - } - if (t < 1 / 2) { - return q; - } - if (t < 2 / 3) { - return p + (q - p) * (2 / 3 - t) * 6; - } - return p; + return [r * 255, g * 255, b * 255]; }; - if (s === 0) { - r = g = b = l; - } else { - q = l < 0.5 ? l * (1 + s) : l + s - (l * s); - p = 2 * l - q; - r = hue2rgb(p, q, h + 1 / 3); - g = hue2rgb(p, q, h); - b = hue2rgb(p, q, h - (1 / 3)); - } - return [r * 255, g * 255, b * 255]; - }; - return Vibrant; + return Vibrant; -})(); + })(); /* @@ -830,46 +867,46 @@ window.Vibrant = Vibrant = (function () { Stolen from https://github.com/lokesh/color-thief */ -window.CanvasImage = CanvasImage = (function () { - function CanvasImage(image) { + window.CanvasImage = CanvasImage = (function () { + function CanvasImage(image) { - this.canvas = document.createElement('canvas'); + this.canvas = document.createElement('canvas'); - this.context = this.canvas.getContext('2d'); + this.context = this.canvas.getContext('2d'); - var originalWidth = image.width; - var originalHeight = image.height; + var originalWidth = image.width; + var originalHeight = image.height; - var maxArea = 300 * 300; - var bitmapArea = originalWidth * originalHeight; - var scaleRatio = 1; - if (bitmapArea > maxArea) { - scaleRatio = maxArea / bitmapArea; + var maxArea = 300 * 300; + var bitmapArea = originalWidth * originalHeight; + var scaleRatio = 1; + if (bitmapArea > maxArea) { + scaleRatio = maxArea / bitmapArea; + } + + //console.log(scaleRatio); + + this.width = this.canvas.width = originalWidth * scaleRatio; + this.height = this.canvas.height = originalHeight * scaleRatio; + + this.context.drawImage(image, 0, 0, originalWidth, originalHeight, 0, 0, this.width, this.height); } - //console.log(scaleRatio); + CanvasImage.prototype.getPixelCount = function () { + return this.width * this.height; + }; - this.width = this.canvas.width = originalWidth * scaleRatio; - this.height = this.canvas.height = originalHeight * scaleRatio; + CanvasImage.prototype.getImageData = function () { + return this.context.getImageData(0, 0, this.width, this.height); + }; - this.context.drawImage(image, 0, 0, originalWidth, originalHeight, 0, 0, this.width, this.height); - } + CanvasImage.prototype.removeCanvas = function () { + this.context = null; + this.canvas = null; + }; - CanvasImage.prototype.getPixelCount = function () { - return this.width * this.height; - }; + return CanvasImage; - CanvasImage.prototype.getImageData = function () { - return this.context.getImageData(0, 0, this.width, this.height); - }; - - CanvasImage.prototype.removeCanvas = function () { - this.context = null; - this.canvas = null; - }; - - return CanvasImage; - -})(); + })(); }); \ No newline at end of file