Merge pull request #278 from ryki2658/master

Case-insensitive regexes for checking image extensions #270
CesiumGS · May 9, 2017 · 94b89ab · 94b89ab
2 parents ce48e5f + ad02448
commit 94b89ab
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/loadGltfUris.js b/lib/loadGltfUris.js
@@ -157,8 +157,7 @@ function readFromFile(object, name, uriPath) {
         });
 }
 
-var jimpSupportedExtensions = ['.png', '.jpg', '.jpeg', '.bmp'];
-
+var supportedExtensions = /\.(jpg|jpeg|bmp|png)$/i;
 /**
  * Generate a jimp image for png, jpeg, or bmp.
  *
@@ -169,7 +168,7 @@ var jimpSupportedExtensions = ['.png', '.jpg', '.jpeg', '.bmp'];
 function generateJimpImage(object) {
     var pipelineExtras = object.extras._pipeline;
     var ext = pipelineExtras.extension;
-    if (jimpSupportedExtensions.indexOf(ext) === -1) {
+    if (!supportedExtensions.test(ext)) {
         return Promise.resolve();
     }