jpeg-js
diff --git a/‎.gitignore
Lines changed: 1 addition & 0 deletions b/‎.gitignore
Lines changed: 1 addition & 0 deletions
diff --git a/‎lib/decoder.js
Lines changed: 4 additions & 4 deletions b/‎lib/decoder.js
Lines changed: 4 additions & 4 deletions
diff --git a/‎test/fixtures/cmyk-grey.cmyk
Lines changed: 1056 additions & 0 deletions b/‎test/fixtures/cmyk-grey.cmyk
Lines changed: 1056 additions & 0 deletions
diff --git a/‎test/fixtures/cmyk-grey.jpg
90 KB b/‎test/fixtures/cmyk-grey.jpg
90 KB
diff --git a/‎test/fixtures/cmyktest.cmyk
130 KB b/‎test/fixtures/cmyktest.cmyk
130 KB
diff --git a/‎test/fixtures/cmyktest.jpg
35.4 KB b/‎test/fixtures/cmyktest.jpg
35.4 KB
diff --git a/‎test/fixtures/plusshelf-drawing.cmyk
319 KB b/‎test/fixtures/plusshelf-drawing.cmyk
319 KB
diff --git a/‎test/fixtures/plusshelf-drawing.jpg
44.5 KB b/‎test/fixtures/plusshelf-drawing.jpg
44.5 KB
diff --git a/‎test/fixtures/rgb.jpg
26 KB b/‎test/fixtures/rgb.jpg
26 KB
diff --git a/‎test/fixtures/rgb.rgb
Lines changed: 36 additions & 0 deletions b/‎test/fixtures/rgb.rgb
Lines changed: 36 additions & 0 deletions
diff --git a/‎test/fixtures/tree-cmyk.cmyk
Lines changed: 866 additions & 0 deletions b/‎test/fixtures/tree-cmyk.cmyk
Lines changed: 866 additions & 0 deletions
diff --git a/‎test/fixtures/tree-cmyk.jpg
71.2 KB b/‎test/fixtures/tree-cmyk.jpg
71.2 KB
diff --git a/‎test/fixtures/tree-rgb.jpg
42.8 KB b/‎test/fixtures/tree-rgb.jpg
42.8 KB
diff --git a/‎test/fixtures/tree-rgb.rgb
Lines changed: 950 additions & 0 deletions b/‎test/fixtures/tree-rgb.rgb
Lines changed: 950 additions & 0 deletions
diff --git a/‎test/index.js
Lines changed: 48 additions & 0 deletions b/‎test/index.js
Lines changed: 48 additions & 0 deletions
@@ -2,3 +2,4 @@
 .DS_Store
 node_modules/
 npm-debug.log
+.idea*
@@ -895,10 +895,10 @@ var JpegImage = (function jpegImage() {
                 M = 255 - clampTo8bit(Y - 0.3441363 * (Cb - 128) - 0.71413636 * (Cr - 128));
                 Ye = 255 - clampTo8bit(Y + 1.772 * (Cb - 128));
               }
-              data[offset++] = C;
-              data[offset++] = M;
-              data[offset++] = Ye;
-              data[offset++] = K;
+              data[offset++] = 255-C;
+              data[offset++] = 255-M;
+              data[offset++] = 255-Ye;
+              data[offset++] = 255-K;
             }
           }
           break;
 
@@ -48,6 +48,54 @@ it('should be able to decode a grayscale JPEG', function(t) {
   t.end();
 });
 
+it('should be able to decode a CMYK jpeg with correct colors', function (t) {
+  var jpegData = fixture('tree-cmyk.jpg');
+  var rawImageData = jpeg.decode(jpegData);
+  t.equal(rawImageData.width, 400);
+  t.equal(rawImageData.height, 250);
+  var expected = fixture('tree-cmyk.cmyk');
+  t.deepEqual(rawImageData.data, expected);
+  t.end();
+});
+
+it('should be able to decode an RGB jpeg with correct colors', function (t) {
+  var jpegData = fixture('tree-rgb.jpg');
+  var rawImageData = jpeg.decode(jpegData);
+  t.equal(rawImageData.width, 400);
+  t.equal(rawImageData.height, 250);
+  var expected = fixture('tree-rgb.rgb');
+  t.deepEqual(rawImageData.data, expected);
+  t.end();
+});
+
+it('should be able to decode a greyscale CMYK jpeg with correct colors', function (t) {
+  var jpegData = fixture('cmyk-grey.jpg');
+  var rawImageData = jpeg.decode(jpegData);
+  t.equal(rawImageData.width, 300);
+  t.equal(rawImageData.height, 389);
+  var expected = fixture('cmyk-grey.cmyk');
+  t.deepEqual(rawImageData.data, expected);
+  t.end();
+});
+
+it('should be able to decode an adobe CMYK jpeg with correct colors', function (t) {
+  var jpegData = fixture('cmyktest.jpg');
+  var rawImageData = jpeg.decode(jpegData);
+  t.equal(rawImageData.width, 300);
+  t.equal(rawImageData.height, 111);
+  var expected = fixture('cmyktest.cmyk');
+  t.deepEqual(rawImageData.data, expected);
+
+  var jpegData2 = fixture('plusshelf-drawing.jpg');
+  var rawImageData2 = jpeg.decode(jpegData2);
+  t.equal(rawImageData2.width, 350);
+  t.equal(rawImageData2.height, 233);
+  var expected2 = fixture('plusshelf-drawing.cmyk');
+  t.deepEqual(rawImageData2.data, expected2);
+
+  t.end();
+});
+
 it('should be able to decode a unconventional table JPEG', function (t) {
   var jpegData = fixture('unconventional-table.jpg');
   var rawImageData = jpeg.decode(jpegData);
Original file line number	Diff line number	Diff line change
`@@ -895,10 +895,10 @@ var JpegImage = (function jpegImage() {`
`895`	`895`	`M = 255 - clampTo8bit(Y - 0.3441363 * (Cb - 128) - 0.71413636 * (Cr - 128));`
`896`	`896`	`Ye = 255 - clampTo8bit(Y + 1.772 * (Cb - 128));`
`897`	`897`	`}`
`898`		`- data[offset++] = C;`
`899`		`- data[offset++] = M;`
`900`		`- data[offset++] = Ye;`
`901`		`- data[offset++] = K;`
	`898`	`+ data[offset++] = 255-C;`
	`899`	`+ data[offset++] = 255-M;`
	`900`	`+ data[offset++] = 255-Ye;`
	`901`	`+ data[offset++] = 255-K;`
`902`	`902`	`}`
`903`	`903`	`}`
`904`	`904`	`break;`