Enable building on mac using macports or homebrew.

.gitignore

@@ -0,0 +1,2 @@
+build
+node_modules

binding.gyp

@@ -15,9 +15,15 @@
         'VERSION=0.5.0'
       ],
       'sources': [ 'src/bindings.cpp', 'src/FreeImage.cpp', 'src/Image.cpp' ],
+      "include_dirs" : [
+        "<!(node -e \"require('nan')\")"
+      ],
       'conditions': [
         ['OS=="linux"', {'libraries': ['-lfreeimage']}],
-        ['OS=="mac"', {'libraries': ['-lfreeimage']}],
+        ['OS=="mac"', {
+          'libraries': ['-lfreeimage', '-L/opt/local/lib', '-L/usr/local/lib'],
+          'include_dirs': ['/opt/local/include', '/usr/local/include']
+          }],
         ['OS=="win"', {
           'libraries': [
             'FreeImage64.lib'

package.json

@@ -1,65 +1,67 @@
 {
-   "name": "node-image",
-   "version": "0.5.0",
-   "description": "A Node.JS wrapper around FreeImage",
-   "main": "lib/image.js",
-   "author": "Mikael Bourges-Sevenier <[email protected]>",
-   "keywords": [
-       "jpeg",
-       "jpg",
-       "png",
-       "gif",
-       "bmp",
-       "jng",
-       "pnm",
-       "ppm",
-       "tga",
-       "tiff",
-       "psd",
-       "xbm",
-       "xpm",
-       "j2k",
-       "jpeg2000",
-       "jp2",
-       "sgi",
-       "exr",
-       "hdr",
-       "pict",
-       "raw",
-       "ico",
-       "wbmp",
-       "image",
-       "picture"
-   ],
-   "maintainers": [
-       {
-           "name": "Mikael Bourges-Sevenier",
-           "email": "[email protected]",
-           "twitter": "msevenier"
-       }
-   ],
-   "licenses":[
-     {
-       "type":"BSD",
-       "url": "http://github.com/mikeseven/node-image/raw/master/LICENSES" 
-     }
-   ],
-   "repositories": [
-       {
-           "type": "git",
-           "url": "https://[email protected]/mikeseven/node-image.git" 
-       } 
-   ],
-   "directories": {
-       "src": "src",
-       "lib": "lib",
-       "test": "test"
-   },
-   "engines": {
-       "node": ">=0.5.9"
-   },
-   "scripts": {
-       "install": "node-gyp rebuild"
-   }
+  "name": "node-image",
+  "version": "0.5.2",
+  "description": "A Node.JS wrapper around FreeImage",
+  "main": "lib/image.js",
+  "author": "Mikael Bourges-Sevenier <[email protected]>",
+  "keywords": [
+    "jpeg",
+    "jpg",
+    "png",
+    "gif",
+    "bmp",
+    "jng",
+    "pnm",
+    "ppm",
+    "tga",
+    "tiff",
+    "psd",
+    "xbm",
+    "xpm",
+    "j2k",
+    "jpeg2000",
+    "jp2",
+    "sgi",
+    "exr",
+    "hdr",
+    "pict",
+    "raw",
+    "ico",
+    "wbmp",
+    "image",
+    "picture"
+  ],
+  "maintainers": [
+    {
+      "name": "Mikael Bourges-Sevenier",
+      "email": "[email protected]",
+      "twitter": "msevenier"
+    }
+  ],
+  "licenses": [
+    {
+      "type": "BSD",
+      "url": "http://github.com/mikeseven/node-image/raw/master/LICENSES"
+    }
+  ],
+  "repositories": [
+    {
+      "type": "git",
+      "url": "https://[email protected]/mikeseven/node-image.git"
+    }
+  ],
+  "directories": {
+    "src": "src",
+    "lib": "lib",
+    "test": "test"
+  },
+  "engines": {
+    "node": ">=0.5.9"
+  },
+  "scripts": {
+    "install": "node-gyp rebuild"
+  },
+  "dependencies": {
+    "nan": "~1.8.4"
+  }
 }
-

src/FreeImage.cpp

@@ -5,9 +5,13 @@
  ** (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.  **
  */
 
+#include "nan.h"
+
 #include "FreeImage.h"
 #include "Image.h"
 
+#include <node_buffer.h>
+
 #include <iostream>
 using namespace std;
 
@@ -27,36 +31,44 @@ FreeImage::~FreeImage() {
 }
 
 void FreeImage::Initialize(Handle<Object> target) {
-  HandleScope scope;
+  NanScope();
 
-  Local<FunctionTemplate> t = FunctionTemplate::New(New);
-  constructor_template = Persistent<FunctionTemplate>::New(t);
+  Local<FunctionTemplate> t = NanNew<FunctionTemplate>(New);
+  NanAssignPersistent(constructor_template, t);
 
-  constructor_template->InstanceTemplate()->SetInternalFieldCount(1);
-  constructor_template->SetClassName(JS_STR("FreeImage"));
+  t->InstanceTemplate()->SetInternalFieldCount(1);
+  t->SetClassName(NanNew<String>("FreeImage"));
 
-  NODE_SET_PROTOTYPE_METHOD(constructor_template, "getVersion", getVersion);
-  NODE_SET_PROTOTYPE_METHOD(constructor_template, "load", load);
-  NODE_SET_PROTOTYPE_METHOD(constructor_template, "save", save);
+  NODE_SET_PROTOTYPE_METHOD(t, "getVersion", getVersion);
+  NODE_SET_PROTOTYPE_METHOD(t, "load", load);
+  NODE_SET_PROTOTYPE_METHOD(t, "loadFromMemory", loadFromMemory);
+  NODE_SET_PROTOTYPE_METHOD(t, "convertFromRawBits", convertFromRawBits);
+  NODE_SET_PROTOTYPE_METHOD(t, "save", save);
 
-  target->Set(JS_STR("FreeImage"), constructor_template->GetFunction());
+  target->Set(NanNew<String>("FreeImage"), t->GetFunction());
 }
 
+void FreeImageErrorHandler(FREE_IMAGE_FORMAT fif, const char *message) {
+  cout << "Error: " << message << endl;
+}
 
-JS_METHOD(FreeImage::New) {
-  HandleScope scope;
+NAN_METHOD(FreeImage::New) {
+  NanScope();
   FreeImage *fi = new FreeImage(args.This());
   fi->Wrap(args.This());
-  return scope.Close(args.This());
+
+  FreeImage_SetOutputMessage(FreeImageErrorHandler);
+
+  NanReturnThis();
 }
 
-JS_METHOD(FreeImage::getVersion) {
-  HandleScope scope;
-  return scope.Close(JS_STR(FreeImage_GetVersion()));
+NAN_METHOD(FreeImage::getVersion) {
+  NanScope();
+  NanReturnValue(NanNew<String>(FreeImage_GetVersion()));
 }
 
-JS_METHOD(FreeImage::load) {
-  HandleScope scope;
+NAN_METHOD(FreeImage::load) {
+  NanScope();
 
   String::Utf8Value filename(args[0]->ToString());
 
@@ -67,37 +79,66 @@ JS_METHOD(FreeImage::load) {
     dib = FreeImage_Load(fif, *filename);
 
   // check that dib does not contains pixels
-  if(!dib) return Undefined();
-  if(!FreeImage_HasPixels(dib)) return Undefined();
-
-  //cout<<"dib "<<hex<<dib<<dec<<endl;
-  /*FREE_IMAGE_TYPE type = FreeImage_GetImageType(dib);
-  int w=0,h=0,pitch=0;
-
-  Handle<ObjectTemplate> obj = ObjectTemplate::New();
-  obj->SetInternalFieldCount(1);
-
-  Local<Object> image = obj->NewInstance();
-  image->SetInternalField(0, External::New(dib));
-  image->Set(JS_STR("width"), JS_INT(w=FreeImage_GetWidth(dib)));
-  image->Set(JS_STR("height"), JS_INT(h=FreeImage_GetHeight(dib)));
-  image->Set(JS_STR("bpp"), JS_INT(FreeImage_GetBPP(dib)));
-  image->Set(JS_STR("pitch"), JS_INT(pitch=FreeImage_GetPitch(dib)));
-  image->Set(JS_STR("type"), JS_INT(type));
-  image->Set(JS_STR("redMask"), JS_INT(FreeImage_GetRedMask(dib)));
-  image->Set(JS_STR("greenMask"), JS_INT(FreeImage_GetGreenMask(dib)));
-  image->Set(JS_STR("blueMask"), JS_INT(FreeImage_GetBlueMask(dib)));
-
-  BYTE *bits=FreeImage_GetBits(dib);
-  node::Buffer *buf = node::Buffer::New((char*)bits,h*pitch);
-  image->Set(JS_STR("buffer"), buf->handle_);
-
-  return scope.Close(image);*/
-  return scope.Close(Image::New(dib)->handle_);
+  if(!dib) NanReturnUndefined();
+  if(!FreeImage_HasPixels(dib)) NanReturnUndefined();
+
+  NanReturnValue(NanObjectWrapHandle(Image::New(dib)));
+}
+
+NAN_METHOD(FreeImage::loadFromMemory) {
+  NanScope();
+
+  Local<Object> bufferObj    = args[0]->ToObject();
+  BYTE*         bufferData   = (BYTE*) Buffer::Data(bufferObj);
+  size_t        bufferLength = Buffer::Length(bufferObj);
+
+  FIMEMORY *hmem = FreeImage_OpenMemory(bufferData, bufferLength);
+
+  FREE_IMAGE_FORMAT fif = FreeImage_GetFileTypeFromMemory(hmem, 0);
+  FIBITMAP *dib = FreeImage_LoadFromMemory(fif, hmem, 0);
+  FreeImage_CloseMemory(hmem);
+
+  // check that dib does not contains pixels
+  if(!dib) NanReturnUndefined();
+  if(!FreeImage_HasPixels(dib)) NanReturnUndefined();
+
+  NanReturnValue(NanObjectWrapHandle(Image::New(dib)));
+}
+
+NAN_METHOD(FreeImage::convertFromRawBits) {
+  NanScope();
+
+  Local<Object> bufferObj    = args[0]->ToObject();
+  BYTE*         bufferData   = (BYTE*) Buffer::Data(bufferObj);
+
+  uint32_t width  = args[1]->Int32Value();
+  uint32_t height = args[2]->Int32Value();
+  uint32_t pitch=width*4, bpp=32;
+  uint32_t redMask=0xFF000000, greenMask=0x00FF0000, blueMask=0x0000FF00;
+  BOOL topdown = FALSE;
+
+  if(args.Length()>3) pitch=args[3]->Uint32Value();
+  if(args.Length()>4) bpp=args[4]->Uint32Value();
+  if(args.Length()>5) redMask=args[5]->Uint32Value();
+  if(args.Length()>6) greenMask=args[6]->Uint32Value();
+  if(args.Length()>7) blueMask=args[7]->Uint32Value();
+  if(args.Length()>8) topdown=args[8]->BooleanValue();
+
+// cout<<"convertFromRawBits: wxh: "<<width<<"x"<<height<<" bpp: "<<bpp<<" pitch: "<<pitch<<endl;
+
+  FIBITMAP *dib =
+    FreeImage_ConvertFromRawBits(bufferData, width, height, pitch, bpp,
+                                 redMask, greenMask, blueMask, topdown);
+
+  // check that dib does not contains pixels
+  if(!dib) NanReturnUndefined();
+  if(!FreeImage_HasPixels(dib)) NanReturnUndefined();
+
+  NanReturnValue(NanObjectWrapHandle(Image::New(dib)));
 }
 
-JS_METHOD(FreeImage::save) {
-  HandleScope scope;
+NAN_METHOD(FreeImage::save) {
+  NanScope();
   String::Utf8Value filename(args[0]->ToString());
   cout<<"args length: "<<args.Length()<<endl;
 
@@ -133,7 +174,7 @@ JS_METHOD(FreeImage::save) {
     image=FreeImage_ConvertTo24Bits(image);
     FreeImage_Unload(old);
   }
-  return scope.Close(Boolean::New((FreeImage_Save(format, image, *filename) == TRUE) ? true : false));
+  NanReturnValue(NanNew<Boolean>(FreeImage_Save(format, image, *filename) == TRUE));
 }
 
 }

src/FreeImage.h

@@ -21,11 +21,13 @@ class FreeImage : public node::ObjectWrap
 public:
   static void Initialize(Handle<Object> target);
 
-  static JS_METHOD(New);
+  static NAN_METHOD(New);
 
-  static JS_METHOD(getVersion);
-  static JS_METHOD(load);
-  static JS_METHOD(save);
+  static NAN_METHOD(getVersion);
+  static NAN_METHOD(load);
+  static NAN_METHOD(loadFromMemory);
+  static NAN_METHOD(convertFromRawBits);
+  static NAN_METHOD(save);
 
 protected:
   ~FreeImage();