refactor: remove unused vars (#111)

jpeg-js · Feb 24, 2023 · b8cfcd4 · b8cfcd4
1 parent 9ccd35f
commit b8cfcd4
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 50 deletions.
diff --git a/lib/decoder.js b/lib/decoder.js
@@ -94,12 +94,8 @@ var JpegImage = (function jpegImage() {
                       frame, components, resetInterval,
                       spectralStart, spectralEnd,
                       successivePrev, successive, opts) {
-    var precision = frame.precision;
-    var samplesPerLine = frame.samplesPerLine;
-    var scanLines = frame.scanLines;
     var mcusPerLine = frame.mcusPerLine;
     var progressive = frame.progressive;
-    var maxH = frame.maxH, maxV = frame.maxV;
 
     var startOffset = offset, bitsData = 0, bitsCount = 0;
     function readBit() {
@@ -354,7 +350,7 @@ var JpegImage = (function jpegImage() {
     return offset - startOffset;
   }
 
-  function buildComponentData(frame, component) {
+  function buildComponentData(component) {
     var lines = [];
     var blocksPerLine = component.blocksPerLine;
     var blocksPerColumn = component.blocksPerColumn;
@@ -620,7 +616,6 @@ var JpegImage = (function jpegImage() {
       }
       var jfif = null;
       var adobe = null;
-      var pixels = null;
       var frame, resetInterval;
       var quantizationTables = [], frames = [];
       var huffmanTablesAC = [], huffmanTablesDC = [];
@@ -633,7 +628,7 @@ var JpegImage = (function jpegImage() {
 
       fileMarker = readUint16();
       while (fileMarker != 0xFFD9) { // EOI (End of image)
-        var i, j, l;
+        var i, j;
         switch(fileMarker) {
           case 0xFF00: break;
           case 0xFFE0: // APP0 (Application Specific)
@@ -741,7 +736,6 @@ var JpegImage = (function jpegImage() {
             }
 
             var componentsCount = data[offset++], componentId;
-            var maxH = 0, maxV = 0;
             for (i = 0; i < componentsCount; i++) {
               componentId = data[offset];
               var h = data[offset + 1] >> 4;
@@ -866,7 +860,7 @@ var JpegImage = (function jpegImage() {
       for (var i = 0; i < frame.componentsOrder.length; i++) {
         var component = frame.components[frame.componentsOrder[i]];
         this.components.push({
-          lines: buildComponentData(frame, component),
+          lines: buildComponentData(component),
           scaleX: component.h / frame.maxH,
           scaleY: component.v / frame.maxV
         });

diff --git a/test/fixtures/cmyk-grey.cmyk → test/fixtures/cmyk-grey.rgba b/test/fixtures/cmyk-grey.cmyk → test/fixtures/cmyk-grey.rgba
diff --git a/test/fixtures/cmyktest.cmyk → test/fixtures/cmyktest.rgba b/test/fixtures/cmyktest.cmyk → test/fixtures/cmyktest.rgba
diff --git a/test/fixtures/plusshelf-drawing.cmyk → test/fixtures/plusshelf-drawing.rgba b/test/fixtures/plusshelf-drawing.cmyk → test/fixtures/plusshelf-drawing.rgba
diff --git a/test/fixtures/rgb.rgb → test/fixtures/rgb.rgba b/test/fixtures/rgb.rgb → test/fixtures/rgb.rgba
diff --git a/test/fixtures/tree-cmyk-notransform.cmyk → test/fixtures/tree-cmyk-notransform.rgba b/test/fixtures/tree-cmyk-notransform.cmyk → test/fixtures/tree-cmyk-notransform.rgba
diff --git a/test/fixtures/tree-cmyk.cmyk → test/fixtures/tree-cmyk.rgba b/test/fixtures/tree-cmyk.cmyk → test/fixtures/tree-cmyk.rgba
diff --git a/test/index.js b/test/index.js
@@ -69,7 +69,7 @@ it('should be able to decode a CMYK jpeg with correct colors', function () {
   var rawImageData = jpeg.decode(jpegData);
   expect(rawImageData.width).toEqual(400);
   expect(rawImageData.height).toEqual(250);
-  var expected = fixture('tree-cmyk.cmyk');
+  var expected = fixture('tree-cmyk.rgba');
   expect(rawImageData.data).toEqual(expected);
 });
 
@@ -78,7 +78,7 @@ it('should be able to decode a CMYK jpeg with correct colors without transform',
   var rawImageData = jpeg.decode(jpegData);
   expect(rawImageData.width).toEqual(400);
   expect(rawImageData.height).toEqual(250);
-  var expected = fixture('tree-cmyk-notransform.cmyk');
+  var expected = fixture('tree-cmyk-notransform.rgba');
   expect(rawImageData.data).toEqual(expected);
 });
 
@@ -91,12 +91,21 @@ it('should be able to decode an RGB jpeg with correct colors', function () {
   expect(rawImageData.data).toEqual(expected);
 });
 
+it('should be able to decode an progressive RGB jpeg with correct colors', function () {
+  var jpegData = fixture('rgb.jpg');
+  var rawImageData = jpeg.decode(jpegData);
+  expect(rawImageData.width).toEqual(350);
+  expect(rawImageData.height).toEqual(262);
+  var expected = fixture('rgb.rgba');
+  expect(rawImageData.data).toEqual(expected);
+});
+
 it('should be able to decode a greyscale CMYK jpeg with correct colors', function () {
   var jpegData = fixture('cmyk-grey.jpg');
   var rawImageData = jpeg.decode(jpegData);
   expect(rawImageData.width).toEqual(300);
   expect(rawImageData.height).toEqual(389);
-  var expected = fixture('cmyk-grey.cmyk');
+  var expected = fixture('cmyk-grey.rgba');
   expect(rawImageData.data).toEqual(expected);
 });
 
@@ -105,14 +114,14 @@ it('should be able to decode an adobe CMYK jpeg with correct colors', function (
   var rawImageData = jpeg.decode(jpegData);
   expect(rawImageData.width).toEqual(300);
   expect(rawImageData.height).toEqual(111);
-  var expected = fixture('cmyktest.cmyk');
+  var expected = fixture('cmyktest.rgba');
   expect(rawImageData.data).toEqual(expected);
 
   var jpegData2 = fixture('plusshelf-drawing.jpg');
   var rawImageData2 = jpeg.decode(jpegData2);
   expect(rawImageData2.width).toEqual(350);
   expect(rawImageData2.height).toEqual(233);
-  var expected2 = fixture('plusshelf-drawing.cmyk');
+  var expected2 = fixture('plusshelf-drawing.rgba');
   expect(rawImageData2.data).toEqual(expected2);
 });