Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: memory-overflow/standard-ellipse-detection
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0
Choose a base ref
...
head repository: memory-overflow/standard-ellipse-detection
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 169 additions and 726 deletions.
  1. +11 −2 CMakeLists.txt
  2. +21 −674 LICENSE
  3. +102 −26 README.md
  4. +21 −21 src/detect.cpp
  5. +14 −3 test/CMakeLists.txt
13 changes: 11 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -21,7 +21,11 @@ project (${PACKAGE_NAME} VERSION ${PACKAGE_VERSION} LANGUAGES CXX)
set (OpenCV_FOUND 1)
find_package (OpenCV REQUIRED)

set (OTHER_LIBS -llapack)
# Manual set open library
#include_directories(/xxx/opencv_tag_v3.2.0)
#include_directories (/xxx/opencv_tag_v3.2.0/include)
#link_directories(/xxx/opencv_tag_v3.2.0/lib)
set (OTHER_LIBS -llapack -lblas -lgfortran)

set (CMAKE_CXX_STANDARD 11)
set (CMAKE_CXX_STANDARD_REQUIRE ON)
@@ -41,8 +45,13 @@ set (DEPEND_FILE
"src/cvcannyapi.cpp"
)

add_library (${PACKAGE_NAME} ${DEPEND_FILE})
set (Opencv_LIBS
-lopencv_core
-lopencv_imgproc
-lopencv_highgui
)

add_library (${PACKAGE_NAME} ${DEPEND_FILE})
target_link_libraries(${PACKAGE_NAME} ${Opencv_LIBS} ${OTHER_LIBS})

set (PUBLIC_HDRS
Loading