frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add_effect_engine

Browse Source 
Conflicts:
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp

Former-commit-id: 1df163d1880691ded2fc8b5902c6ad3501912c48
This commit is contained in:
T. van der Zwan
2013-12-05 22:11:38 +01:00
parent f4ef83b171 3978638356
commit cd02263e25
29 changed files with 1349 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/hyperion/ImageProcessor.cpp
View File

@@ -4,8 +4,6 @@
#include <hyperion/ImageToLedsMap.h>
#include <hyperion/BlackBorderProcessor.h>
#include <utils/ColorTransform.h>
using namespace hyperion;
ImageProcessor::ImageProcessor(const LedString& ledString, bool enableBlackBorderDetector) :