hzt_asc 1.0.8 → 1.1.0

package/CMakeLists.txt

@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.3)
 cmake_policy(SET CMP0042 NEW)
 set (CMAKE_CXX_STANDARD 11)
+#set(CMAKE_VERBOSE_MAKEFILE ON)
+
+#set(CMAKE_SKIP_BUILD_RPATH FALSE)
+#set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+#set(CMAKE_INSTALL_RPATH $ORIGIN)
+#set(CMAKE_PREFIX_PATH "/home/myusername/Documents/mylibleveldb")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 project (hzt_asc_v3)
 
@@ -8,31 +15,37 @@ find_package( OpenCV REQUIRED )
 include_directories( ${OpenCV_INCLUDE_DIRS} )
 include_directories(${CMAKE_JS_INC})
 
-#find_library(SERIALDEVICE_LIB arcsoft_face)
+#message(status " This is the OpenCV_INCLUDE_DIRS srcs:" ${OpenCV_INCLUDE_DIRS})
+#message(status " This is the OpenCV_LIBS srcs:" ${OpenCV_LIBS})
+#message(status " This is the CMAKE_JS_INC srcs:" ${CMAKE_JS_INC})
+#message(status " This is the CMAKE_JS_LIB srcs:" ${CMAKE_JS_LIB})
+
 
 #指定头文件目录
 include_directories(./)	
 include_directories(./inc)
 #指定静态和动态文件目录
-link_directories(linux_so)
-link_directories(lib)
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SRC)
+link_directories(./linux_so)
 
+
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SRC)
 add_library(${PROJECT_NAME} SHARED ${SRC} ${CMAKE_JS_SRC})
 
 
 
+find_library(ARC_LIBRARY arcsoft_face HINTS ${CMAKE_CURRENT_SOURCE_DIR}/linux_so)
+message(status " This is the ARC_LIBRARY srcs:" ${ARC_LIBRARY})
 
 #链接库文件
-target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
+#target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
 
-target_link_libraries(${PROJECT_NAME} arcsoft_face)
-#link_directories(./so)
-target_link_libraries(${PROJECT_NAME} arcsoft_face_engine)
+#target_link_libraries(${PROJECT_NAME} -larcsoft_face)
+target_link_libraries(${PROJECT_NAME} -larcsoft_face_engine)
 
+target_link_libraries(${PROJECT_NAME} ${ARC_LIBRARY})
 
 target_link_libraries(${PROJECT_NAME} curl)
-target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} )
+target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 # Include Node-API wrappers

package/ask.cc

@@ -579,8 +579,6 @@ Napi::Value ASK::ImageFaceCompareUrl2(const Napi::CallbackInfo& info) {
     return obj;
 }
 
-
-
 Napi::Value ASK::ImageFaceCompareUrl(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     int length = info.Length();
@@ -633,7 +631,6 @@ Napi::Value ASK::ImageFaceCompareUrl(const Napi::CallbackInfo& info) {
     return obj;
 }
 
-
 ////获取激活信息（采集离线激活信息、激活文件信息、SDK版本信息）
 void ASK::getSdkRelatedInfo() {
     printf("\n************* ArcFace SDK Info *****************\n");
@@ -716,14 +713,12 @@ int ASK::ColorSpaceConversion(MInt32 width, MInt32 height, MInt32 format, MUInt8
 	return 1;
 }
 
-
-
 MUInt8* ASK::processFile(const char*  filePath, int& picWidth, int& picHeight) {
     cv::Mat src = imread(filePath);
     cout<<filePath<<endl;
     int Width = src.cols;
 	int Height = src.rows;
-    cout << "Width:" << Width << ",Height:"<<Height<<endl;
+    cout << "Width:" << Width << ",Height:"<<Height << " flags: "<< src.flags << " dims: " << src.dims <<endl;
     int wScore = Width % 4;
     int hScore = Height % 2;
     cv::Mat dest;
@@ -777,29 +772,65 @@ cv::Mat curlImg(const char *img_url, int timeout=100000)
     curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); //重定向一次
     CURLcode res = curl_easy_perform(curl); // start curl
     curl_easy_cleanup(curl); // cleanup
-    cout<<res<<"xxxx" << stream.size() << " " << stream.max_size()<<endl;
+    cout<<res<<" xxxx " << stream.size() << " " << stream.max_size()<<endl;
     return imdecode(stream, -1); // 'keep-as-is'
 }
 
+void modifyImageFormat(cv::Mat& out, cv::Mat& in, int channel) 
+{
+    if (channel == 4) {
+        in.convertTo(out, CV_8UC4);
+    } else if (channel == 3) {
+        in.convertTo(out, CV_8UC3);
+    } else if (channel == 2) {
+        in.convertTo(out, CV_8UC2);
+    } else {
+        in.convertTo(out, CV_8U);
+    }
+}
+
 MUInt8* ASK::processFileUrl(const char*  url, int& picWidth, int& picHeight) {
     cv::Mat src = curlImg(url);
     int Width = src.cols;
 	int Height = src.rows;
-    cout << "Width:" << Width << ",Height:"<<Height<<endl;
+    int depth = src.depth();
+    int channel = src.channels();
+    cout << "Width:" << Width << ",Height:"<<Height <<endl;
+    cout << "dims: " << src.dims << endl;
+    cout << "channels: " << channel << endl;
+    cout << "depth: " << depth << endl;
+
     int wScore = Width % 4;
     int hScore = Height % 2;
     cv::Mat dest;
     if (wScore != 0 || hScore != 0) {
+        cout << "processFileUrl ou:" <<endl;
         Width -= wScore;
         Height -= hScore;
         cv::Mat dst;
         cv::resize(src, dst, cv::Size(Width, Height));
-        src.release();
-        cvtColor(dst, dest, COLOR_BGR2YUV_I420);
+        if (depth != 0) { //bit数仅支持8
+            cv::Mat mid;
+            modifyImageFormat(mid, dst, channel);
+            cvtColor(mid, dest, COLOR_BGR2YUV_I420);
+            mid.release();
+        } else {
+            cvtColor(dst, dest, COLOR_BGR2YUV_I420);
+        }
+
         dst.release();
     } else {
-        cvtColor(src, dest, COLOR_BGR2YUV_I420);
+        cout << "processFileUrl ji:" <<endl;
+        if (depth != 0) { //bit数仅支持8
+            cv::Mat mid;
+            modifyImageFormat(mid, src, channel);
+            cvtColor(mid, dest, COLOR_BGR2YUV_I420);
+            mid.release();
+        } else {
+            cvtColor(src, dest, COLOR_BGR2YUV_I420);
+        }
     }
+    
     int len = Height*Width*3/2;
     MUInt8* imageData = (MUInt8*)malloc(len);
     memset(imageData, 0, len);    

package/package.json

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