resolved conflicts, updated retina class interface and optimized a heavy retinacolor process

2013-04-29 19:06:35 +02:00
parent 9549949228 416fb50594
commit 72742f5316
2166 changed files with 342437 additions and 211189 deletions
--- a/samples/cpp/retinaDemo.cpp
+++ b/samples/cpp/retinaDemo.cpp
@@ -9,7 +9,8 @@
 #include <iostream>
 #include <cstring>

-#include "opencv2/opencv.hpp"
+#include "opencv2/contrib.hpp"
+#include "opencv2/highgui.hpp"

 static void help(std::string errorMessage)
 {