From 24111af39cb856f669afed74a1e3b69358ffa03b Mon Sep 17 00:00:00 2001 From: bryanrasmussen Date: Thu, 17 Sep 2015 09:42:00 +0200 Subject: [PATCH 1/3] throw errors --- lib/phash.js | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/lib/phash.js b/lib/phash.js index 1872680..7c62022 100644 --- a/lib/phash.js +++ b/lib/phash.js @@ -23,15 +23,27 @@ var pHash = require('../build/Release/pHashBinding'); exports.imageHashSync = function(file) { - return pHash.imageHashSync(file); + try{ + return pHash.imageHashSync(file); + }catch(err){ + throw err; + } }; exports.imageHash = function(file, cb) { - return pHash.imageHash(file, cb); + try{ + return pHash.imageHash(file, cb); + }catch(err){ + throw err; + } }; exports.hammingDistance = function(hasha, hashb) { - return pHash.hammingDistance(hasha, hashb); + try{ + return pHash.hammingDistance(hasha, hashb); + }catch(err){ + throw err; + } }; /* @@ -40,5 +52,9 @@ exports.hammingDistance = function(hasha, hashb) { exports.getImageHash = exports.imageHashSync; exports.getOldHash = function(filePath) { - return pHash.oldHash(filePath); + try{ + return pHash.oldHash(filePath); + }catch(err){ + throw err; + } }; From 0a5fbc4d8677a490b4f3fe39a2800ef0e613a19f Mon Sep 17 00:00:00 2001 From: bryanrasmussen Date: Thu, 17 Sep 2015 10:28:13 +0200 Subject: [PATCH 2/3] handle c++ exceptions --- binding.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/binding.gyp b/binding.gyp index 0e0ee92..9e3de2e 100644 --- a/binding.gyp +++ b/binding.gyp @@ -3,6 +3,8 @@ 'targets': [ { 'target_name': 'pHashBinding', + 'cflags!': [ '-fno-exceptions' ], + 'cflags_cc!': [ '-fno-exceptions' ], 'defines': [ 'HAVE_IMAGE_HASH', 'cimg_verbosity=0', From f5c27e89ea3d5ef48516e1bdee24b0caed590467 Mon Sep 17 00:00:00 2001 From: bryanrasmussen Date: Thu, 17 Sep 2015 10:40:33 +0200 Subject: [PATCH 3/3] removed try catch --- lib/phash.js | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/lib/phash.js b/lib/phash.js index 7c62022..4970473 100644 --- a/lib/phash.js +++ b/lib/phash.js @@ -23,27 +23,15 @@ var pHash = require('../build/Release/pHashBinding'); exports.imageHashSync = function(file) { - try{ - return pHash.imageHashSync(file); - }catch(err){ - throw err; - } + return pHash.imageHashSync(file); }; exports.imageHash = function(file, cb) { - try{ - return pHash.imageHash(file, cb); - }catch(err){ - throw err; - } + return pHash.imageHash(file, cb); }; exports.hammingDistance = function(hasha, hashb) { - try{ - return pHash.hammingDistance(hasha, hashb); - }catch(err){ - throw err; - } + pHash.hammingDistance(hasha, hashb); }; /* @@ -52,9 +40,5 @@ exports.hammingDistance = function(hasha, hashb) { exports.getImageHash = exports.imageHashSync; exports.getOldHash = function(filePath) { - try{ - return pHash.oldHash(filePath); - }catch(err){ - throw err; - } + return pHash.oldHash(filePath); };