Version bump

update to nan 1.1.0

binding.gyp

@@ -11,6 +11,7 @@
       '/usr/include/glib-2.0',
       '/usr/lib/glib-2.0/include',
       '/usr/lib/x86_64-linux-gnu/glib-2.0/include',
+      '/usr/lib/i386-linux-gnu/glib-2.0/include',
       '<!(node -e "require(\'nan\')")'
     ],
     'cflags': ['-fexceptions', '-pedantic', '-Wall', '-O3'],

index.js

@@ -107,9 +107,13 @@ Sharp.prototype.resize = function(width, height) {
 
 Sharp.prototype.write = function(output, callback) {
   if (!output || output.length === 0) {
-    throw 'Invalid output';
+    callback('Invalid output');
   } else {
-    this._sharp(output, callback);
+    if (this.options.inFile === output) {
+      callback('Cannot use same file for input and output');
+    } else {
+      this._sharp(output, callback);
+    }
   }
   return this;
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sharp",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "author": "Lovell Fuller <npm@lovell.info>",
   "contributors": [
     "Pierre Inglebert <pierre.inglebert@gmail.com>"
@@ -31,13 +31,13 @@
     "buffer"
   ],
   "dependencies": {
-    "nan": "^1.0.0"
+    "nan": "^1.1.0"
   },
   "devDependencies": {
     "imagemagick": "^0.1.3",
-    "imagemagick-native": "git://github.com/mash/node-imagemagick-native.git#master",
+    "imagemagick-native": "^1.0.0",
     "gm": "^1.16.0",
-    "async": "^0.8.0",
+    "async": "^0.9.0",
     "benchmark": "^1.0.0"
   },
   "license": "Apache 2.0",

src/sharp.cc

@@ -211,7 +211,7 @@ class ResizeWorker : public NanAsyncWorker {
       // Recalculate residual float based on dimensions of required vs shrunk images
       double residualx = static_cast<double>(baton->width) / static_cast<double>(shrunk->Xsize);
       double residualy = static_cast<double>(baton->height) / static_cast<double>(shrunk->Ysize);
-      if (baton->crop) {
+      if (baton->crop || baton->max) {
         residual = std::max(residualx, residualy);
       } else {
         residual = std::min(residualx, residualy);
@@ -235,7 +235,7 @@ class ResizeWorker : public NanAsyncWorker {
     // Crop/embed
     VipsImage *canvased = vips_image_new();
     if (affined->Xsize != baton->width || affined->Ysize != baton->height) {
-      if (baton->crop) {
+      if (baton->crop || baton->max) {
         // Crop/max
         int width = std::min(affined->Xsize, baton->width);
         int height = std::min(affined->Ysize, baton->height);
@@ -352,14 +352,13 @@ NAN_METHOD(resize) {
   baton->width = args[3]->Int32Value();
   baton->height = args[4]->Int32Value();
   Local<String> canvas = args[5]->ToString();
-  if (canvas->Equals(NanSymbol("c"))) {
+  if (canvas->Equals(NanNew<String>("c"))) {
     baton->crop = true;
-  } else if (canvas->Equals(NanSymbol("w"))) {
+  } else if (canvas->Equals(NanNew<String>("w"))) {
     baton->extend = VIPS_EXTEND_WHITE;
-  } else if (canvas->Equals(NanSymbol("b"))) {
+  } else if (canvas->Equals(NanNew<String>("b"))) {
     baton->extend = VIPS_EXTEND_BLACK;
-  } else if (canvas->Equals(NanSymbol("m"))) {
+  } else if (canvas->Equals(NanNew<String>("m"))) {
-    baton->crop = true;
     baton->max = true;
   }
   baton->sharpen = args[6]->BooleanValue();
@@ -384,9 +383,9 @@ NAN_METHOD(cache) {
 
   // Get cache statistics
   Local<Object> cache = NanNew<Object>();
-  cache->Set(NanSymbol("current"), NanNew<Number>(vips_tracked_get_mem() / 1048576));
+  cache->Set(NanNew<String>("current"), NanNew<Number>(vips_tracked_get_mem() / 1048576));
-  cache->Set(NanSymbol("high"), NanNew<Number>(vips_tracked_get_mem_highwater() / 1048576));
+  cache->Set(NanNew<String>("high"), NanNew<Number>(vips_tracked_get_mem_highwater() / 1048576));
-  cache->Set(NanSymbol("limit"), NanNew<Number>(vips_cache_get_max_mem() / 1048576));
+  cache->Set(NanNew<String>("limit"), NanNew<Number>(vips_cache_get_max_mem() / 1048576));
   NanReturnValue(cache);
 }
 

tests/unit.js

@@ -145,5 +145,12 @@ async.series([
         done();
       });
     });
+  },
+  // Attempt to output to input, should fail
+  function(done) {
+    sharp(inputJpg).write(inputJpg, function(err) {
+      assert(!!err);
+      done();
+    });
   }
 ]);