Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '0.10-compatible'

  • Loading branch information...
commit 4c41241278d80b05c4924da22351238fc646df71 2 parents ed227d3 + b6a62b8
@drewish drewish authored
Showing with 8 additions and 26 deletions.
  1. +6 −6 exiv2node.cc
  2. +2 −2 package.json
  3. +0 −18 wscript
View
12 exiv2node.cc
@@ -108,11 +108,11 @@ static Local<Object> makeBuffer(char* data, size_t size) {
}
static void GetImageTagsWorker(uv_work_t* req);
-static void AfterGetImageTags(uv_work_t* req);
+static void AfterGetImageTags(uv_work_t* req, int status);
static void SetImageTagsWorker(uv_work_t *req);
-static void AfterSetImageTags(uv_work_t *req);
+static void AfterSetImageTags(uv_work_t* req, int status);
static void GetImagePreviewsWorker(uv_work_t* req);
-static void AfterGetImagePreviews(uv_work_t* req);
+static void AfterGetImagePreviews(uv_work_t* req, int status);
static Handle<Value> GetImageTags(const Arguments& args) {
HandleScope scope;
@@ -167,7 +167,7 @@ static void GetImageTagsWorker(uv_work_t* req) {
}
/* Thread complete callback.. */
-static void AfterGetImageTags(uv_work_t* req) {
+static void AfterGetImageTags(uv_work_t* req, int status) {
HandleScope scope;
Baton *thread_data = static_cast<Baton *> (req->data);
@@ -256,7 +256,7 @@ static void SetImageTagsWorker(uv_work_t *req) {
}
/* Thread complete callback.. */
-static void AfterSetImageTags(uv_work_t *req) {
+static void AfterSetImageTags(uv_work_t* req, int status) {
HandleScope scope;
Baton *thread_data = static_cast<Baton*> (req->data);
@@ -326,7 +326,7 @@ static void GetImagePreviewsWorker(uv_work_t *req) {
}
// Convert the previews from the baton into V8 objects and fire the callback.
-static void AfterGetImagePreviews(uv_work_t *req) {
+static void AfterGetImagePreviews(uv_work_t* req, int status) {
HandleScope scope;
GetPreviewBaton *thread_data = static_cast<GetPreviewBaton*> (req->data);
View
4 package.json
@@ -2,7 +2,7 @@
"author": "Damian Beresford <dberesford@gmail.com> (http://www.damianberesford.com/)",
"name": "exiv2",
"description": "A native c++ extension for node.js that provides support for reading & writing image metadata via Exiv2.",
- "version": "0.3.0",
+ "version": "0.4.0",
"homepage": "https://github.com/dberesford/exiv2node",
"repository": {
"type": "git",
@@ -15,7 +15,7 @@
},
"optionalDependencies": {},
"engines": {
- "node": ">= 0.5.6"
+ "node": ">= 0.9.4"
},
"main": "exiv2",
"scripts": {
View
18 wscript
@@ -1,18 +0,0 @@
-import Options
-from os import unlink, symlink, popen
-from os.path import exists
-
-def set_options(opt):
- opt.tool_options("compiler_cxx")
-
-def configure(conf):
- conf.check_tool("compiler_cxx")
- conf.check_tool("node_addon")
- conf.check_cfg(package='exiv2', args='--cflags --libs')
-
-def build(bld):
- obj = bld.new_task_gen("cxx", "shlib", "node_addon")
- obj.cxxflags = ["-g", "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE_SOURCE", "-Wall"]
- obj.target = "exiv2"
- obj.source = "exiv2node.cc"
- obj.uselib = "EXIV2"
Please sign in to comment.
Something went wrong with that request. Please try again.