Moved black border detection code to seperate library

poljvd · poljvd · commit 590029949b79 · 2014-01-26T14:23:08.000+01:00
diff --git a/include/blackborder/BlackBorderDetector.h b/include/blackborder/BlackBorderDetector.h
diff --git a/include/blackborder/BlackBorderProcessor.h b/include/blackborder/BlackBorderProcessor.h
diff --git a/include/hyperion/ImageProcessor.h b/include/hyperion/ImageProcessor.h
@@ -8,7 +8,9 @@
 #include <hyperion/ImageProcessorFactory.h>
 #include <hyperion/LedString.h>
 #include <hyperion/ImageToLedsMap.h>
-#include <hyperion/BlackBorderProcessor.h>
+
+// Black border includes
+#include <blackborder/BlackBorderProcessor.h>
 
 ///
 /// The ImageProcessor translates an RGB-image to RGB-values for the leds. The processing is
diff --git a/libsrc/CMakeLists.txt b/libsrc/CMakeLists.txt
@@ -4,6 +4,7 @@ SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc)
 
 add_subdirectory(hyperion)
+add_subdirectory(blackborder)
 add_subdirectory(jsonserver)
 add_subdirectory(protoserver)
 add_subdirectory(boblightserver)
diff --git a/libsrc/blackborder/BlackBorderDetector.cpp b/libsrc/blackborder/BlackBorderDetector.cpp
@@ -1,6 +1,6 @@
 
-// Local-Hyperion includes
-#include <hyperion/BlackBorderDetector.h>
+// BlackBorders includes
+#include <blackborder/BlackBorderDetector.h>
 
 using namespace hyperion;
 
diff --git a/libsrc/blackborder/BlackBorderProcessor.cpp b/libsrc/blackborder/BlackBorderProcessor.cpp
@@ -1,6 +1,6 @@
 
-// Local-Hyperion includes
-#include <hyperion/BlackBorderProcessor.h>
+// Blackborder includes
+#include <blackborder/BlackBorderProcessor.h>
 
 using namespace hyperion;
 
diff --git a/libsrc/blackborder/CMakeLists.txt b/libsrc/blackborder/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+# Define the current source locations
+SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/blackborder)
+SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/blackborder)
+
+SET(Blackborder_HEADERS
+		${CURRENT_HEADER_DIR}/BlackBorderDetector.h
+		${CURRENT_HEADER_DIR}/BlackBorderProcessor.h
+)
+
+SET(Blackborder_SOURCES
+		${CURRENT_SOURCE_DIR}/BlackBorderDetector.cpp
+		${CURRENT_SOURCE_DIR}/BlackBorderProcessor.cpp
+)
+
+add_library(blackborder
+		${Blackborder_HEADERS}
+		${Blackborder_SOURCES}
+)
+
+target_link_libraries(blackborder
+		hyperion-utils
+)
diff --git a/libsrc/hyperion/CMakeLists.txt b/libsrc/hyperion/CMakeLists.txt
@@ -17,9 +17,6 @@ SET(Hyperion_HEADERS
 		${CURRENT_HEADER_DIR}/LedString.h
 		${CURRENT_HEADER_DIR}/PriorityMuxer.h
 
-		${CURRENT_HEADER_DIR}/BlackBorderDetector.h
-		${CURRENT_HEADER_DIR}/BlackBorderProcessor.h
-
 		${CURRENT_SOURCE_DIR}/MultiColorTransform.h
 )
 
@@ -30,8 +27,6 @@ SET(Hyperion_SOURCES
 		${CURRENT_SOURCE_DIR}/LedString.cpp
 		${CURRENT_SOURCE_DIR}/PriorityMuxer.cpp
 
-		${CURRENT_SOURCE_DIR}/BlackBorderDetector.cpp
-		${CURRENT_SOURCE_DIR}/BlackBorderProcessor.cpp
 		${CURRENT_SOURCE_DIR}/ImageToLedsMap.cpp
 		${CURRENT_SOURCE_DIR}/MultiColorTransform.cpp
 		${CURRENT_SOURCE_DIR}/LinearColorSmoothing.cpp
@@ -54,6 +49,7 @@ add_library(hyperion
 )
 
 target_link_libraries(hyperion
+		blackborder
 		hyperion-utils
 		leddevice
 		effectengine
diff --git a/libsrc/hyperion/ImageProcessor.cpp b/libsrc/hyperion/ImageProcessor.cpp
@@ -2,7 +2,9 @@
 // Hyperion includes
 #include <hyperion/ImageProcessor.h>
 #include <hyperion/ImageToLedsMap.h>
-#include <hyperion/BlackBorderProcessor.h>
+
+// Blacborder includes
+#include <blackborder/BlackBorderProcessor.h>
 
 using namespace hyperion;
 
diff --git a/test/TestBlackBorderDetector.cpp b/test/TestBlackBorderDetector.cpp
@@ -3,9 +3,11 @@
 #include <random>
 
 // Hyperion includes
-#include <hyperion/BlackBorderDetector.h>
 #include <utils/ColorRgb.h>
 
+// Blackborder includes
+#include <blackborder/BlackBorderDetector.h>
+
 using namespace hyperion;
 
 ColorRgb randomColor()
diff --git a/test/TestBlackBorderProcessor.cpp b/test/TestBlackBorderProcessor.cpp
@@ -8,8 +8,8 @@
 #include <utils/Image.h>
 #include <utils/ColorRgb.h>
 
-// Local-Hyperion includes
-#include "hyperion/BlackBorderProcessor.h"
+// Blackborder includes
+#include "blackborder/BlackBorderProcessor.h"
 
 using namespace hyperion;
 
