hzt_asc 1.1.2 → 1.1.4

package/ask.cc

@@ -149,19 +149,22 @@ Napi::Value ASK::faceDetectUrl(const Napi::CallbackInfo& info) {
         Napi::TypeError::New(env, "input expected").ThrowAsJavaScriptException();
         return errorData(env, "input expected"); //Napi::Number::New(info.Env(), -1);
     }
+    Napi::Object obj = Napi::Object::New(env);
     string filePath = info[0].As<Napi::String>().ToString();
     int Width, Height;
     MUInt8* imageData = processFileUrl(filePath.c_str(), Width, Height);
     if (!imageData) {
-        Napi::TypeError::New(env, "image download error").ThrowAsJavaScriptException();
-        return errorData(env, "image download error"); //Napi::Number::New(info.Env(), -1);
+        // Napi::TypeError::New(env, "image download error").ThrowAsJavaScriptException();
+        // return errorData(env, "image download error");
+        obj.Set(Napi::String::New(env, "faceNum"), 0);
+        return obj; 
     }
     ASVLOFFSCREEN offscreen = { 0 };
     ColorSpaceConversion(Width, Height, ASVL_PAF_NV21, imageData, offscreen);
     ASF_MultiFaceInfo detectedFaces = { 0 };
     MRESULT res = ASFDetectFacesEx(this->handle, &offscreen, &detectedFaces);
     
-    Napi::Object obj = Napi::Object::New(env);
+    
     obj.Set(Napi::String::New(env, "faceNum"), detectedFaces.faceNum);
     Napi::Array list = Napi::Array::New(env, detectedFaces.faceNum);
     for(int i = 0; i < detectedFaces.faceNum; ++i) {
@@ -245,12 +248,14 @@ Napi::Value ASK::faceFeatureExtractUrl(const Napi::CallbackInfo& info) {
         return errorData(env, "input expected"); //Napi::Number::New(info.Env(), -1);
     }
     string filePath = info[0].As<Napi::String>().ToString();
-   
+    Napi::Object obj = Napi::Object::New(env);
     int Width, Height;
     MUInt8* imageData = processFileUrl(filePath.c_str(), Width, Height);
     if (!imageData) {
-        Napi::TypeError::New(env, "image download error").ThrowAsJavaScriptException();
-        return errorData(env, "image download error"); //Napi::Number::New(info.Env(), -1);
+        // Napi::TypeError::New(env, "image download error").ThrowAsJavaScriptException();
+        // return errorData(env, "image download error"); //Napi::Number::New(info.Env(), -1);
+        obj.Set(Napi::String::New(env, "faceNum"), 0);
+        return obj;
     }
     ASVLOFFSCREEN offscreen = { 0 };
     ColorSpaceConversion(Width, Height, ASVL_PAF_NV21, imageData, offscreen);
@@ -258,7 +263,7 @@ Napi::Value ASK::faceFeatureExtractUrl(const Napi::CallbackInfo& info) {
     ASF_MultiFaceInfo detectedFaces = { 0 };
     MRESULT res = ASFDetectFacesEx(this->handle, &offscreen, &detectedFaces);
 
-    Napi::Object obj = Napi::Object::New(env);
+    
     obj.Set(Napi::String::New(env, "faceNum"), detectedFaces.faceNum);
     if (0 == detectedFaces.faceNum) {
         SafeFree(imageData);
@@ -567,19 +572,22 @@ Napi::Value ASK::ImageFaceCompareUrl2(const Napi::CallbackInfo& info) {
         Napi::TypeError::New(env, "input expected").ThrowAsJavaScriptException();
         return errorData(env, "input expected"); 
     }
+    Napi::Object obj = Napi::Object::New(env);
     string filePath = info[0].As<Napi::String>().ToString();
     int Width, Height;
     MUInt8* imageData = processFileUrl(filePath.c_str(), Width, Height);
     if (!imageData) {
-        Napi::TypeError::New(env, "image download error").ThrowAsJavaScriptException();
-        return errorData(env, "image download error"); //Napi::Number::New(info.Env(), -1);
+        // Napi::TypeError::New(env, "image download error").ThrowAsJavaScriptException();
+        // return errorData(env, "image download error"); //Napi::Number::New(info.Env(), -1);
+        obj.Set(Napi::String::New(env, "faceNum"), 0);
+        return obj; 
     }
     ASVLOFFSCREEN offscreen = { 0 };
     ColorSpaceConversion(Width, Height, ASVL_PAF_NV21, imageData, offscreen);
     
     ASF_MultiFaceInfo detectedFaces = { 0 };
     MRESULT res = ASFDetectFacesEx(this->handle, &offscreen, &detectedFaces);
-    Napi::Object obj = Napi::Object::New(env);
+    
     obj.Set(Napi::String::New(env, "faceNum"), detectedFaces.faceNum);
     if (0 == detectedFaces.faceNum) {
         SafeFree(imageData);
@@ -598,19 +606,22 @@ Napi::Value ASK::ImageFaceCompareUrl(const Napi::CallbackInfo& info) {
         Napi::TypeError::New(env, "input expected").ThrowAsJavaScriptException();
         return errorData(env, "input expected"); 
     }
+    Napi::Object obj = Napi::Object::New(env);
     string filePath = info[0].As<Napi::String>().ToString();
     int Width, Height;
     MUInt8* imageData = processFileUrl(filePath.c_str(), Width, Height);
     if (!imageData) {
-        Napi::TypeError::New(env, "image download error").ThrowAsJavaScriptException();
-        return errorData(env, "image download error"); //Napi::Number::New(info.Env(), -1);
+        // Napi::TypeError::New(env, "image download error").ThrowAsJavaScriptException();
+        // return errorData(env, "image download error"); //Napi::Number::New(info.Env(), -1);
+        obj.Set(Napi::String::New(env, "faceNum"), 0);
+        return obj; 
     }
     ASVLOFFSCREEN offscreen = { 0 };
     ColorSpaceConversion(Width, Height, ASVL_PAF_NV21, imageData, offscreen);
 
     ASF_MultiFaceInfo detectedFaces = { 0 };
     MRESULT res = ASFDetectFacesEx(this->handle, &offscreen, &detectedFaces);
-    Napi::Object obj = Napi::Object::New(env);
+    
     obj.Set(Napi::String::New(env, "faceNum"), detectedFaces.faceNum);
     if (0 == detectedFaces.faceNum) {
         SafeFree(imageData);
@@ -779,6 +790,7 @@ size_t write_data(char *ptr, size_t size, size_t nmemb, void *userdata)
 cv::Mat curlImg(const char *img_url, int timeout=100000)
 {
     //cout<<img_url<<endl;
+    char *pCaPath = "/opt/ssl_csr/*.haizitong.com.chained.crt";
     vector<uchar> stream;
     CURL *curl = curl_easy_init();
     curl_easy_setopt(curl, CURLOPT_URL, img_url); //the img url
@@ -786,6 +798,10 @@ cv::Mat curlImg(const char *img_url, int timeout=100000)
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream); // pass the stream ptr to the writefunction
     curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); // timeout if curl_easy hangs, 
     curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); //重定向一次
+
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2L);
+    curl_easy_setopt(curl, CURLOPT_CAINFO, pCaPath);
     CURLcode res = curl_easy_perform(curl); // start curl
     
     curl_easy_cleanup(curl); // cleanup
@@ -831,7 +847,6 @@ MUInt8* ASK::processFileUrl(const char*  url, int& picWidth, int& picHeight) {
     int hScore = Height % 2;
     cv::Mat dest;
     if (wScore != 0 || hScore != 0) {
-        //cout << "processFileUrl ou:" <<endl;
         Width -= wScore;
         Height -= hScore;
         cv::Mat dst;
@@ -847,7 +862,6 @@ MUInt8* ASK::processFileUrl(const char*  url, int& picWidth, int& picHeight) {
 
         dst.release();
     } else {
-        //cout << "processFileUrl ji:" <<endl;
         if (depth != 0) { //bit数仅支持8
             cv::Mat mid;
             modifyImageFormat(mid, src, channel);
@@ -909,39 +923,6 @@ MUInt8* ASK::processFileUrl(const char*  url, int& picWidth, int& picHeight) {
 //     ColorSpaceConversion(Width, Height, ASVL_PAF_NV21, imageData, offscreen);
 // }
 
-// void ASK::processFileUrl(const char*  url, MUInt8* imageData, ASVLOFFSCREEN& offscreen) {
-//     cv::Mat src = curlImg(url);
-//     int Width = src.cols;
-// 	int Height = src.rows;
-//     cout << "Width:" << Width << ",Height:"<<Height<<endl;
-//     int wScore = Width % 4;
-//     int hScore = Height % 2;
-//     cv::Mat dest;
-//     if (wScore != 0 || hScore != 0) {
-//         Width -= wScore;
-//         Height -= hScore;
-//         cv::Mat dst;
-//         cv::resize(src, dst, cv::Size(Width, Height));
-//         src.release();
-//         //src = dst;
-//         cvtColor(dst, dest, COLOR_BGR2YUV_I420);
-//         dst.release();
-//     } else {
-//         cvtColor(src, dest, COLOR_BGR2YUV_I420);
-//     }
-    
-//     int len = Height*Width*3/2;
-//     imageData = (MUInt8*)malloc(len);
-//     memset(imageData, 0, len);    
-//     memcpy(imageData, dest.data, len);
-//     src.release();
-//     dest.release();
-//     ColorSpaceConversion(Width, Height, ASVL_PAF_NV21, imageData, offscreen);
-// }
-
-
-
-
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hzt_asc",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "main": "index.js",
   "description": "hzt_asc_v3.",
   "author": {