From 42fce70a896a046b201c04a8a4921303acb876aa Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Fri, 28 Oct 2011 18:47:26 -0700 Subject: [PATCH] Check for the compiled bindings in both places. When node switched it's build system to GYP then the resulting bin will be put in "Release" instead of "build". So check for both places with a little `bindings.js` shim. --- lib/bindings.js | 10 ++++++++++ lib/canvas.js | 2 +- lib/context2d.js | 4 ++-- lib/image.js | 4 ++-- lib/pixelarray.js | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 lib/bindings.js diff --git a/lib/bindings.js b/lib/bindings.js new file mode 100644 index 0000000..bd348e3 --- /dev/null +++ b/lib/bindings.js @@ -0,0 +1,10 @@ +/** + * Compat for changes from node 0.4.x to 0.6.x. + */ +try { + module.exports = require('../build/Release/canvas'); +} catch (e) { try { + module.exports = require('../build/default/canvas'); +} catch (e) { + throw e; +}} diff --git a/lib/canvas.js b/lib/canvas.js index 8f2f07c..d1971ec 100644 --- a/lib/canvas.js +++ b/lib/canvas.js @@ -9,7 +9,7 @@ * Module dependencies. */ -var canvas = require('../build/default/canvas') +var canvas = require('./bindings') , Canvas = canvas.Canvas , Image = canvas.Image , cairoVersion = canvas.cairoVersion diff --git a/lib/context2d.js b/lib/context2d.js index 84c96bb..0202645 100644 --- a/lib/context2d.js +++ b/lib/context2d.js @@ -9,7 +9,7 @@ * Module dependencies. */ -var canvas = require('../build/default/canvas') +var canvas = require('./bindings') , Context2d = canvas.CanvasRenderingContext2d , CanvasGradient = canvas.CanvasGradient , ImageData = canvas.ImageData @@ -320,4 +320,4 @@ Context2d.prototype.createImageData = function(width, height){ width = width.width; } return new ImageData(new PixelArray(width, height)); -}; \ No newline at end of file +}; diff --git a/lib/image.js b/lib/image.js index fa0040a..558472b 100644 --- a/lib/image.js +++ b/lib/image.js @@ -9,7 +9,7 @@ * Module dependencies. */ -var Canvas = require('../build/default/canvas') +var Canvas = require('./bindings') , Image = Canvas.Image; /** @@ -57,4 +57,4 @@ Image.prototype.inspect = function(){ + (this.src ? ' ' + this.src : '') + (this.complete ? ' complete' : '') + ']'; -}; \ No newline at end of file +}; diff --git a/lib/pixelarray.js b/lib/pixelarray.js index 7f191f4..ff10cee 100644 --- a/lib/pixelarray.js +++ b/lib/pixelarray.js @@ -9,7 +9,7 @@ * Module dependencies. */ -var Canvas = require('../build/default/canvas') +var Canvas = require('./bindings') , PixelArray = Canvas.CanvasPixelArray; /**