Kaynağa Gözat

change build.sh

DevYK 3 yıl önce
ebeveyn
işleme
95ca35fcde
4 değiştirilmiş dosya ile 62 ekleme ve 61 silme
  1. 57 59
      CMakeLists.txt
  2. 1 1
      build.sh
  3. 3 1
      main.cpp
  4. 1 0
      opencv/image_blur_detection.h

+ 57 - 59
CMakeLists.txt

@@ -49,8 +49,6 @@ include_directories(${OPENCV_INCLUDE})
 include_directories(${JNI_MD_PATH})
 
 
-
-
 add_library(piaoquan_java_opencv SHARED
         ${OPENCV_SRC}
         ${JAVA_JNI_SRC})
@@ -59,64 +57,64 @@ set(OpenCV_LIBS
         -lopencv_imgproc
         -lopencv_imgcodecs
         -lopencv_core
-#        -lopencv_xphoto
-#        -lopencv_xobjdetect
-#        -lopencv_ximgproc
-#        -lopencv_xfeatures2d
-#        -lopencv_wechat_qrcode
-#        -lopencv_viz
-#        -lopencv_videostab
-#        -lopencv_videoio
-#        -lopencv_video
-#        -lopencv_tracking
-#        -lopencv_text
-#        -lopencv_surface_matching
-#        -lopencv_superres
-#        -lopencv_structured_light
-#        -lopencv_stitching
-#        -lopencv_stereo
-#        -lopencv_shape
-#        -lopencv_sfm
-#        -lopencv_saliency
-#        -lopencv_rgbd
-#        -lopencv_reg
-#        -lopencv_rapid
-#        -lopencv_quality
-#        -lopencv_plot
-#        -lopencv_photo
-#        -lopencv_phase_unwrapping
-#        -lopencv_optflow
-#        -lopencv_objdetect
-#        -lopencv_ml
-#        -lopencv_mcc
-#        -lopencv_line_descriptor
-#        -lopencv_intensity_transform
-#        -lopencv_img_hash
-#        -lopencv_highgui
-#        -lopencv_hfs
-#        -lopencv_gapi
-#        -lopencv_fuzzy
-#        -lopencv_freetype
-#        -lopencv_flann
-#        -lopencv_features2d
-#        -lopencv_face
-#        -lopencv_dpm
-#        -lopencv_dnn_superres
-#        -lopencv_dnn_objdetect
-#        -lopencv_dnn
-#        -lopencv_datasets
-#        -lopencv_ccalib
-#        -lopencv_calib3d
-#        -lopencv_bioinspired
-#        -lopencv_bgsegm
-#        -lopencv_barcode
-#        -lopencv_aruco
-#        -lopencv_alphamat
+        -lopencv_highgui
+        #        -lopencv_xphoto
+        #        -lopencv_xobjdetect
+        #        -lopencv_ximgproc
+        #        -lopencv_xfeatures2d
+        #        -lopencv_wechat_qrcode
+        #        -lopencv_viz
+        #        -lopencv_videostab
+        #        -lopencv_videoio
+        #        -lopencv_video
+        #        -lopencv_tracking
+        #        -lopencv_text
+        #        -lopencv_surface_matching
+        #        -lopencv_superres
+        #        -lopencv_structured_light
+        #        -lopencv_stitching
+        #        -lopencv_stereo
+        #        -lopencv_shape
+        #        -lopencv_sfm
+        #        -lopencv_saliency
+        #        -lopencv_rgbd
+        #        -lopencv_reg
+        #        -lopencv_rapid
+        #        -lopencv_quality
+        #        -lopencv_plot
+        #        -lopencv_photo
+        #        -lopencv_phase_unwrapping
+        #        -lopencv_optflow
+        #        -lopencv_objdetect
+        #        -lopencv_ml
+        #        -lopencv_mcc
+        #        -lopencv_line_descriptor
+        #        -lopencv_intensity_transform
+        #        -lopencv_img_hash
+        #        -lopencv_hfs
+        #        -lopencv_gapi
+        #        -lopencv_fuzzy
+        #        -lopencv_freetype
+        #        -lopencv_flann
+        #        -lopencv_features2d
+        #        -lopencv_face
+        #        -lopencv_dpm
+        #        -lopencv_dnn_superres
+        #        -lopencv_dnn_objdetect
+        #        -lopencv_dnn
+        #        -lopencv_datasets
+        #        -lopencv_ccalib
+        #        -lopencv_calib3d
+        #        -lopencv_bioinspired
+        #        -lopencv_bgsegm
+        #        -lopencv_barcode
+        #        -lopencv_aruco
+        #        -lopencv_alphamat
         )
 
 
 # 条件判断
-if(CMAKE_BUILD_TYPE AND (CMAKE_BUILD_TYPE STREQUAL "Debug"))
+if (CMAKE_BUILD_TYPE AND (CMAKE_BUILD_TYPE STREQUAL "Debug"))
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -O0")
     message("Debug mode:${CMAKE_C_FLAGS_DEBUG}")
     add_executable(ImageBlurDetection_debug main.cpp
@@ -127,13 +125,13 @@ if(CMAKE_BUILD_TYPE AND (CMAKE_BUILD_TYPE STREQUAL "Debug"))
     target_link_libraries(ImageBlurDetection_debug -lpthread
             ${OpenCV_LIBS}
             )
-elseif(CMAKE_BUILD_TYPE AND (CMAKE_BUILD_TYPE STREQUAL "Release"))
+elseif (CMAKE_BUILD_TYPE AND (CMAKE_BUILD_TYPE STREQUAL "Release"))
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -O3")
     message("Release mode:${CMAKE_C_FLAGS_RELEASE}")
-else()
+else ()
     message("else:${CMAKE_BUILD_TYPE}")
     message("else:${CMAKE_C_FLAGS_RELEASE}")
-endif()
+endif ()
 
 target_link_libraries(piaoquan_java_opencv
         ${OpenCV_LIBS}

+ 1 - 1
build.sh

@@ -4,6 +4,6 @@ mkdir build && cd build
 
 cmake -DCMAKE_BUILD_TYPE=Release ..
 
-make -j8 && make install
+make -j4
 
 echo "安装成功,在当前 output/lib 下"

+ 3 - 1
main.cpp

@@ -15,7 +15,7 @@ static void *detection_thread(void *arg) {
     uint8_t *data = (uint8_t *) malloc(sizeof(uint8_t) * size);
     size_t size2 = fread(data, size, 1, fp);
     printf("图片模糊度检测 %d \n", image_blur_detection(filename));
-    printf("图片模糊度检测 %d \n", bytes_blur_detection(data,size));
+    printf("图片模糊度检测 %d \n", bytes_blur_detection(data, size));
     free(data);
 //    printf("图片模糊度检测 %d \n", image_blur_detection("/Users/devyk/Downloads/black.png"));
     auto *countdown = (CountDownLatch *) arg;
@@ -36,3 +36,5 @@ int main() {
     return 0;
 }
 
+
+

+ 1 - 0
opencv/image_blur_detection.h

@@ -16,6 +16,7 @@
 
 #include "opencv2/opencv.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/highgui.hpp"
 #include "vector"
 
 int image_blur_detection(const char *filename);