Merge pull request Automattic#841 from timknip/master

Add windows jpeg support

Author: LinusU

binding.gyp

@@ -4,7 +4,18 @@
       'variables': {
         'GTK_Root%': 'C:/GTK', # Set the location of GTK all-in-one bundle
         'with_jpeg%': 'false',
-        'with_gif%': 'false'
+        'with_gif%': 'false',
+        'variables': { # Nest jpeg_root to evaluate it before with_jpeg
+          'jpeg_root%': '<!(node ./util/win_jpeg_lookup)'
+        },
+        'jpeg_root%': '<(jpeg_root)', # Take value of nested variable
+        'conditions': [
+          ['jpeg_root==""', {
+            'with_jpeg%': 'false'
+          }, {
+            'with_jpeg%': 'true'
+          }]
+        ]
       }
     }, { # 'OS!="win"'
       'variables': {
@@ -119,8 +130,17 @@
           ],
           'conditions': [
             ['OS=="win"', {
+              'copies': [{
+                'destination': '<(PRODUCT_DIR)',
+                'files': [
+                  '<(jpeg_root)/bin/jpeg62.dll',
+                ]
+              }],
+              'include_dirs': [
+                '<(jpeg_root)/include'
+              ],
               'libraries': [
-                '-l<(GTK_Root)/lib/jpeg.lib'
+                '-l<(jpeg_root)/lib/jpeg.lib',
               ]
             }, {
               'libraries': [

src/Image.cc

@@ -640,7 +640,7 @@ Image::loadGIFFromBuffer(uint8_t *buf, unsigned len) {
 
 // libjpeg 6.2 does not have jpeg_mem_src; define it ourselves here unless
 // libjpeg 8 is installed.
-#if JPEG_LIB_VERSION < 80
+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
 
 /* Read JPEG image from a memory segment */
 static void
@@ -880,7 +880,11 @@ cairo_status_t
 Image::loadJPEG(FILE *stream) {
   cairo_status_t status;
 
+#if defined(_MSC_VER)
+  if (false) { // Force using loadJPEGFromBuffer
+#else
   if (data_mode == DATA_IMAGE) { // Can lazily read in the JPEG.
+#endif
     // JPEG setup
     struct jpeg_decompress_struct args;
     struct jpeg_error_mgr err;
@@ -915,7 +919,13 @@ Image::loadJPEG(FILE *stream) {
       if (!status) status = assignDataAsMime(buf, len, CAIRO_MIME_TYPE_JPEG);
     } else if (DATA_MIME == data_mode) {
       status = decodeJPEGBufferIntoMimeSurface(buf, len);
-    } else {
+    }
+#if defined(_MSC_VER)
+    else if (DATA_IMAGE == data_mode) {
+      status = loadJPEGFromBuffer(buf, len);
+    }
+#endif
+    else {
       status = CAIRO_STATUS_READ_ERROR;
     }
 

test/image.test.js

@@ -9,6 +9,7 @@ var Canvas = require('../')
 
 var png_checkers = __dirname + '/fixtures/checkers.png';
 var png_clock = __dirname + '/fixtures/clock.png';
+var jpg_face = __dirname + '/fixtures/face.jpeg';
 
 describe('Image', function () {
   it('should require new', function () {
@@ -19,6 +20,32 @@ describe('Image', function () {
     assert.ok(Image instanceof Function);
   });
 
+  it('Image set src to JPEG', function () {
+    var img = new Image
+      , onloadCalled = 0
+      , onerrorCalled = 0;
+
+    assert.strictEqual(null, img.onload);
+    assert.strictEqual(false, img.complete);
+
+    img.onload = function () {
+      onloadCalled += 1;
+      assert.strictEqual(img.src, jpg_face);
+      assert.strictEqual(485, img.width);
+      assert.strictEqual(401, img.height);
+      assert.strictEqual(true, img.complete);
+    };
+
+    img.onerror = function (e) {
+      onerrorCalled += 1;
+    };
+
+    img.src = jpg_face;
+    assert.strictEqual(1, onloadCalled);
+    assert.strictEqual(0, onerrorCalled);
+    assert.strictEqual(img.src, jpg_face);
+  });
+
   it('Image#onload', function () {
     var img = new Image
       , onloadCalled = 0;

util/win_jpeg_lookup.js

@@ -0,0 +1,21 @@
+var fs = require('fs')
+var paths = ['C:/libjpeg-turbo']
+
+if (process.arch === 'x64') {
+  paths.unshift('C:/libjpeg-turbo64')
+}
+
+paths.forEach(function(path){
+  if (exists(path)) {
+    process.stdout.write(path)
+    process.exit()
+  }
+})
+
+function exists(path) {
+  try {
+    return fs.lstatSync(path).isDirectory()
+  } catch(e) {
+    return false
+  }
+}