Merge pull request #1 from GeonHyeongP/master

add Define ADD_CIRCLE

Author: jakan2

CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD 11)
 find_package(OpenCV)
 include_directories(${OpenCV_INCLUDE_DIRS})
 
-add_library(EDLib STATIC
+add_library(EDLib SHARED
         ED.cpp
         ED.h
         EDCircles.cpp
@@ -21,11 +21,21 @@ add_library(EDLib STATIC
         NFA.cpp
         NFA.h)
 
-add_executable(test_it test_it.cpp)
-target_link_libraries(test_it ${OpenCV_LIBS} EDLib)
+target_link_libraries(EDLib ${OpenCV_LIBS})
 
-add_executable(test_ED test_ED.cpp)
-target_link_libraries(test_ED ${OpenCV_LIBS} EDLib)
+FILE(GLOB HEADERS *.h)
 
-add_executable(video_test video_test.cpp)
-target_link_libraries(video_test ${OpenCV_LIBS} EDLib)
+set(DEPENDENCY_DIR ${CMAKE_CURRENT_BINARY_DIR}/dependencies)
+set(DEPENDENCY_INSTALL_DIR ${DEPENDENCY_DIR}/install)
+
+install( TARGETS EDLib DESTINATION lib)
+install( FILES ${HEADERS} DESTINATION include/ED_Lib )
+
+#add_executable(test_it test_it.cpp)
+#target_link_libraries(test_it ${OpenCV_LIBS} EDLib)
+
+#add_executable(test_ED test_ED.cpp)
+#target_link_libraries(test_ED ${OpenCV_LIBS} EDLib)
+
+#add_executable(video_test video_test.cpp)
+#target_link_libraries(video_test ${OpenCV_LIBS} EDLib)

EDCircles.cpp

@@ -3,6 +3,8 @@
 using namespace cv;
 using namespace std;
 
+#define ADD_CIRCLE  0
+
 EDCircles::EDCircles(Mat srcImage)
 	: EDPF(srcImage)
 {
@@ -55,10 +57,12 @@ EDCircles::EDCircles(Mat srcImage)
 			double maxDistanceBetweenEndPoints = MAX(3, r / 4);
 
 			// If almost closed loop, then try to fit a circle/ellipse
-			if (d <= maxDistanceBetweenEndPoints) {
+			if (d <= maxDistanceBetweenEndPoints) 
+			{
 				double xc, yc, r, circleFitError = 1e10;
-
+#if ADD_CIRCLE == 1
 				CircleFit(x, y, noPixels, &xc, &yc, &r, &circleFitError);
+#endif				
 
 				EllipseEquation eq;
 				double ellipseFitError = 1e10;
@@ -273,7 +277,9 @@ EDCircles::EDCircles(ED obj)
 			if (d <= maxDistanceBetweenEndPoints) {
 				double xc, yc, r, circleFitError = 1e10;
 
+#if ADD_CIRCLE == 1 
 				CircleFit(x, y, noPixels, &xc, &yc, &r, &circleFitError);
+#endif				
 
 				EllipseEquation eq;
 				double ellipseFitError = 1e10;
@@ -488,7 +494,9 @@ EDCircles::EDCircles(EDColor obj)
 			if (d <= maxDistanceBetweenEndPoints) {
 				double xc, yc, r, circleFitError = 1e10;
 
+#if ADD_CIRCLE == 1
 				CircleFit(x, y, noPixels, &xc, &yc, &r, &circleFitError);
+#endif				
 
 				EllipseEquation eq;
 				double ellipseFitError = 1e10;