summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjules <jules@okfoc.us>2014-09-08 12:27:20 -0400
committerjules <jules@okfoc.us>2014-09-08 12:27:20 -0400
commit5a65510b53d18c734acaee9fe6e561e298f81d3e (patch)
treea74768e4cfc9b14441b33b862f7e1e63086b2391
parent769fd4e9b93bf2130527ed7bad661ce17f4cf550 (diff)
parentcad7a5651589a99070cfe64a59da6fd50067d6d5 (diff)
Merge branch 'master' of lmno:dither
-rw-r--r--js/color.js2
-rw-r--r--js/image.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/color.js b/js/color.js
index ddabf1d..879a78b 100644
--- a/js/color.js
+++ b/js/color.js
@@ -57,7 +57,7 @@ function xyz2rgb(xyz){
function xyz2hunterlab (XYZ) {
var X = XYZ[0]
- var Y = XYZ[1]
+ var Y = XYZ[1] || 1e-6 // otherwise divide-by-zero error when converting rgb(0,0,0)
var Z = XYZ[2]
var L = 10 * sqrt( Y )
var a = 17.5 * ( ( ( 1.02 * X ) - Y ) / sqrt( Y ) )
diff --git a/js/image.js b/js/image.js
index d02673e..9296300 100644
--- a/js/image.js
+++ b/js/image.js
@@ -12,7 +12,7 @@ function loadImage(imageURL, callback) {
window.img = null
callback()
}
- else if (imageURL.substr(-3) === "gif") {
+ else if (imageURL.substr(-3).toLowerCase() === "gif") {
window.gif = GIF(imageURL);
// gif.on("error", tryToLoadNextImage);
// gif.on("rendered", trackLoadTime);