Explicit cast of size_t to 32 bit integer

Ensures compilation with nan 1.5.0+

README.md

@@ -429,7 +429,7 @@ An advanced setting to disable adaptive row filtering for the lossless PNG outpu
 `callback`, if present, is called with two arguments `(err, info)` where:
 
 * `err` contains an error message, if any.
-* `info` contains the output image `format`, `width` and `height`.
+* `info` contains the output image `format`, `size` (bytes), `width` and `height`.
 
 A Promises/A+ promise is returned when `callback` is not provided.
 
@@ -441,7 +441,7 @@ Write image data to a Buffer, the format of which will match the input image by
 
 * `err` is an error message, if any.
 * `buffer` is the output image data.
-* `info` contains the output image `format`, `width` and `height`.
+* `info` contains the output image `format`, `size` (bytes), `width` and `height`.
 
 A Promises/A+ promise is returned when `callback` is not provided.
 
@@ -464,7 +464,7 @@ sharp.cache(50, 200); // { current: 49, high: 99, memory: 50, items: 200}
 
 #### sharp.concurrency([threads])
 
-`threads`, if provided, is the Number of threads _libvips'_ should create for image processing. The default value is the number of CPU cores. A value of `0` will reset to this default.
+`threads`, if provided, is the Number of threads _libvips'_ should create for processing each image. The default value is the number of CPU cores. A value of `0` will reset to this default.
 
 This method always returns the current concurrency.
 
@@ -474,6 +474,8 @@ sharp.concurrency(2); // 2
 sharp.concurrency(0); // 4
 ```
 
+The maximum number of images that can be processed in parallel is limited by libuv's `UV_THREADPOOL_SIZE` environment variable.
+
 #### sharp.counters()
 
 Provides access to internal task counters.

index.js

@@ -18,6 +18,7 @@ var Sharp = function(input) {
   stream.Duplex.call(this);
   this.options = {
     // input options
+    bufferIn: null,
     streamIn: false,
     sequentialRead: false,
     // ICC profiles
@@ -95,16 +96,16 @@ Sharp.prototype._write = function(chunk, encoding, callback) {
   /*jslint unused: false */
   if (this.options.streamIn) {
     if (typeof chunk === 'object' && chunk instanceof Buffer) {
-      if (typeof this.options.bufferIn === 'undefined') {
-        // Create new Buffer
-        this.options.bufferIn = new Buffer(chunk.length);
-        chunk.copy(this.options.bufferIn);
-      } else {
+      if (this.options.bufferIn instanceof Buffer) {
         // Append to existing Buffer
         this.options.bufferIn = Buffer.concat(
           [this.options.bufferIn, chunk],
           this.options.bufferIn.length + chunk.length
         );
+      } else {
+        // Create new Buffer
+        this.options.bufferIn = new Buffer(chunk.length);
+        chunk.copy(this.options.bufferIn);
       }
       callback();
     } else {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sharp",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "author": "Lovell Fuller <npm@lovell.info>",
   "contributors": [
     "Pierre Inglebert <pierre.inglebert@gmail.com>",
@@ -34,9 +34,9 @@
     "vips"
   ],
   "dependencies": {
-    "bluebird": "^2.3.11",
-    "color": "^0.7.1",
-    "nan": "^1.4.1",
+    "bluebird": "^2.6.4",
+    "color": "^0.7.3",
+    "nan": "^1.5.1",
     "semver": "^4.1.0"
   },
   "devDependencies": {

src/resize.cc

@@ -529,7 +529,6 @@ class ResizeWorker : public NanAsyncWorker {
         }
         vips_object_local(hook, gaussian);
         // Apply Gaussian function
-        VipsImage *blurred;
         if (vips_convsep(image, &blurred, gaussian, "precision", VIPS_PRECISION_INTEGER, NULL)) {
           return Error(baton, hook);
         }
@@ -695,6 +694,11 @@ class ResizeWorker : public NanAsyncWorker {
   void HandleOKCallback () {
     NanScope();
 
+    // Free input Buffer
+    if (baton->bufferInLength > 0) {
+      g_free(baton->bufferIn);
+    }
+
     Handle<Value> argv[3] = { NanNull(), NanNull(),  NanNull() };
     if (!baton->err.empty()) {
       // Error
@@ -713,16 +717,21 @@ class ResizeWorker : public NanAsyncWorker {
       // Info Object
       Local<Object> info = NanNew<Object>();
       info->Set(NanNew<String>("format"), NanNew<String>(baton->outputFormat));
-      info->Set(NanNew<String>("width"), NanNew<Number>(width));
-      info->Set(NanNew<String>("height"), NanNew<Number>(height));
+      info->Set(NanNew<String>("width"), NanNew<Integer>(width));
+      info->Set(NanNew<String>("height"), NanNew<Integer>(height));
 
       if (baton->bufferOutLength > 0) {
-        // Buffer
+        // Copy data to new Buffer
         argv[1] = NanNewBufferHandle(static_cast<char*>(baton->bufferOut), baton->bufferOutLength);
         g_free(baton->bufferOut);
+        // Add buffer size to info
+        info->Set(NanNew<String>("size"), NanNew<Uint32>(static_cast<uint32_t>(baton->bufferOutLength)));
         argv[2] = info;
       } else {
-        // File
+        // Add file size to info
+        struct stat st;
+        g_stat(baton->output.c_str(), &st);
+        info->Set(NanNew<String>("size"), NanNew<Uint32>(static_cast<uint32_t>(st.st_size)));
         argv[1] = info;
       }
     }
@@ -833,8 +842,11 @@ NAN_METHOD(resize) {
   // Input Buffer object
   if (options->Get(NanNew<String>("bufferIn"))->IsObject()) {
     Local<Object> buffer = options->Get(NanNew<String>("bufferIn"))->ToObject();
+    // Take a copy of the input Buffer to avoid problems with V8 heap compaction
     baton->bufferInLength = node::Buffer::Length(buffer);
-    baton->bufferIn = node::Buffer::Data(buffer);
+    baton->bufferIn = g_malloc(baton->bufferInLength);
+    memcpy(baton->bufferIn, node::Buffer::Data(buffer), baton->bufferInLength);
+    options->Set(NanNew<String>("bufferIn"), NanNull());
   }
   // ICC profile to use when input CMYK image has no embedded profile
   baton->iccProfilePath = *String::Utf8Value(options->Get(NanNew<String>("iccProfilePath"))->ToString());

test/unit/io.js

@@ -18,6 +18,7 @@ describe('Input/output', function() {
       sharp(fixtures.outputJpg).toBuffer(function(err, data, info) {
         if (err) throw err;
         assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
         assert.strictEqual('jpeg', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(240, info.height);
@@ -35,6 +36,7 @@ describe('Input/output', function() {
       sharp(fixtures.outputJpg).toBuffer(function(err, data, info) {
         if (err) throw err;
         assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
         assert.strictEqual('jpeg', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(240, info.height);
@@ -49,6 +51,7 @@ describe('Input/output', function() {
     var readable = fs.createReadStream(fixtures.inputJpg);
     var pipeline = sharp().resize(320, 240).toFile(fixtures.outputJpg, function(err, info) {
       if (err) throw err;
+      assert.strictEqual(true, info.size > 0);
       assert.strictEqual('jpeg', info.format);
       assert.strictEqual(320, info.width);
       assert.strictEqual(240, info.height);
@@ -63,6 +66,7 @@ describe('Input/output', function() {
     var pipeline = sharp().resize(320, 240).toBuffer(function(err, data, info) {
       if (err) throw err;
       assert.strictEqual(true, data.length > 0);
+      assert.strictEqual(data.length, info.size);
       assert.strictEqual('jpeg', info.format);
       assert.strictEqual(320, info.width);
       assert.strictEqual(240, info.height);
@@ -90,6 +94,7 @@ describe('Input/output', function() {
       sharp(fixtures.outputJpg).toBuffer(function(err, data, info) {
         if (err) throw err;
         assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
         assert.strictEqual('jpeg', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(240, info.height);
@@ -137,6 +142,7 @@ describe('Input/output', function() {
       .toBuffer(function(err, data, info) {
         if (err) throw err;
         assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
         assert.strictEqual('jpeg', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(240, info.height);
@@ -151,6 +157,7 @@ describe('Input/output', function() {
       .toBuffer(function(err, data, info) {
         if (err) throw err;
         assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
         assert.strictEqual('jpeg', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(240, info.height);
@@ -221,6 +228,7 @@ describe('Input/output', function() {
       sharp(data).toBuffer(function(err, data, info) {
         if (err) throw err;
         assert.strictEqual(true, data.length > 0);
+        assert.strictEqual(data.length, info.size);
         assert.strictEqual('jpeg', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(240, info.height);
@@ -262,21 +270,23 @@ describe('Input/output', function() {
       .resize(320, 240)
       .png()
       .progressive(false)
-      .toBuffer(function(err, nonProgressive, info) {
+      .toBuffer(function(err, nonProgressiveData, nonProgressiveInfo) {
         if (err) throw err;
-        assert.strictEqual(true, nonProgressive.length > 0);
-        assert.strictEqual('png', info.format);
-        assert.strictEqual(320, info.width);
-        assert.strictEqual(240, info.height);
-        sharp(nonProgressive)
+        assert.strictEqual(true, nonProgressiveData.length > 0);
+        assert.strictEqual(nonProgressiveData.length, nonProgressiveInfo.size);
+        assert.strictEqual('png', nonProgressiveInfo.format);
+        assert.strictEqual(320, nonProgressiveInfo.width);
+        assert.strictEqual(240, nonProgressiveInfo.height);
+        sharp(nonProgressiveData)
           .progressive()
-          .toBuffer(function(err, progressive, info) {
+          .toBuffer(function(err, progressiveData, progressiveInfo) {
             if (err) throw err;
-            assert.strictEqual(true, progressive.length > 0);
-            assert.strictEqual(true, progressive.length > nonProgressive.length);
-            assert.strictEqual('png', info.format);
-            assert.strictEqual(320, info.width);
-            assert.strictEqual(240, info.height);
+            assert.strictEqual(true, progressiveData.length > 0);
+            assert.strictEqual(progressiveData.length, progressiveInfo.size);
+            assert.strictEqual(true, progressiveData.length > nonProgressiveData.length);
+            assert.strictEqual('png', progressiveInfo.format);
+            assert.strictEqual(320, progressiveInfo.width);
+            assert.strictEqual(240, progressiveInfo.height);
             done();
           });
       });
@@ -287,6 +297,7 @@ describe('Input/output', function() {
     it('JPEG', function(done) {
       sharp(fixtures.inputJpg).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
         if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
         assert.strictEqual('jpeg', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(80, info.height);
@@ -298,6 +309,7 @@ describe('Input/output', function() {
     it('PNG', function(done) {
       sharp(fixtures.inputPng).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
         if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
         assert.strictEqual('png', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(80, info.height);
@@ -309,6 +321,7 @@ describe('Input/output', function() {
     it('Transparent PNG', function(done) {
       sharp(fixtures.inputPngWithTransparency).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
         if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
         assert.strictEqual('png', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(80, info.height);
@@ -319,6 +332,7 @@ describe('Input/output', function() {
     it('WebP', function(done) {
       sharp(fixtures.inputWebP).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
         if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
         assert.strictEqual('webp', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(80, info.height);
@@ -330,6 +344,7 @@ describe('Input/output', function() {
     it('TIFF', function(done) {
       sharp(fixtures.inputTiff).resize(320, 80).toFile(fixtures.outputZoinks, function(err, info) {
         if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
         assert.strictEqual('tiff', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(80, info.height);
@@ -375,23 +390,25 @@ describe('Input/output', function() {
         sharp(fixtures.inputPng)
           .resize(320, 240)
           .withoutAdaptiveFiltering(false)
-          .toBuffer(function(err, dataAdaptive, info) {
+          .toBuffer(function(err, adaptiveData, adaptiveInfo) {
             if (err) throw err;
-            assert.strictEqual(true, dataAdaptive.length > 0);
-            assert.strictEqual('png', info.format);
-            assert.strictEqual(320, info.width);
-            assert.strictEqual(240, info.height);
+            assert.strictEqual(true, adaptiveData.length > 0);
+            assert.strictEqual(adaptiveData.length, adaptiveInfo.size);
+            assert.strictEqual('png', adaptiveInfo.format);
+            assert.strictEqual(320, adaptiveInfo.width);
+            assert.strictEqual(240, adaptiveInfo.height);
             // Then generate without
             sharp(fixtures.inputPng)
               .resize(320, 240)
               .withoutAdaptiveFiltering()
-              .toBuffer(function(err, dataWithoutAdaptive, info) {
+              .toBuffer(function(err, withoutAdaptiveData, withoutAdaptiveInfo) {
                 if (err) throw err;
-                assert.strictEqual(true, dataWithoutAdaptive.length > 0);
-                assert.strictEqual('png', info.format);
-                assert.strictEqual(320, info.width);
-                assert.strictEqual(240, info.height);
-                assert.strictEqual(true, dataWithoutAdaptive.length < dataAdaptive.length);
+                assert.strictEqual(true, withoutAdaptiveData.length > 0);
+                assert.strictEqual(withoutAdaptiveData.length, withoutAdaptiveInfo.size);
+                assert.strictEqual('png', withoutAdaptiveInfo.format);
+                assert.strictEqual(320, withoutAdaptiveInfo.width);
+                assert.strictEqual(240, withoutAdaptiveInfo.height);
+                assert.strictEqual(true, withoutAdaptiveData.length < adaptiveData.length);
                 done();
               });
           });
@@ -406,6 +423,7 @@ describe('Input/output', function() {
       .png()
       .toFile(fixtures.path('output.svg.png'), function(err, info) {
         if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
         assert.strictEqual('png', info.format);
         assert.strictEqual(100, info.width);
         assert.strictEqual(100, info.height);
@@ -419,6 +437,7 @@ describe('Input/output', function() {
       .png()
       .toFile(fixtures.path('output.psd.png'), function(err, info) {
         if (err) throw err;
+        assert.strictEqual(true, info.size > 0);
         assert.strictEqual('png', info.format);
         assert.strictEqual(320, info.width);
         assert.strictEqual(240, info.height);
@@ -435,6 +454,7 @@ describe('Input/output', function() {
         .toBuffer(function(err, data, info) {
           if (err) throw err;
           assert.strictEqual(true, data.length > 0);
+          assert.strictEqual(data.length, info.size);
           assert.strictEqual('jpeg', info.format);
           assert.strictEqual(320, info.width);
           assert.strictEqual(240, info.height);