|
Rex Dieter |
7f9b22b |
diff -up digikam-3.1.0/core/libs/dimg/filters/nr/libopencv.h.opencv20 digikam-3.1.0/core/libs/dimg/filters/nr/libopencv.h
|
|
 |
e440f1b |
--- digikam-3.1.0/core/digikam/utils/libopencv.h.opencv20 2013-03-11 03:24:28.000000000 -0500
|
|
 |
e440f1b |
+++ digikam-3.1.0/core/digikam/utils/libopencv.h 2013-03-24 20:15:32.499498390 -0500
|
|
Rex Dieter |
7f9b22b |
@@ -28,7 +28,7 @@
|
|
Rex Dieter |
7f9b22b |
|
|
Rex Dieter |
7f9b22b |
// OpenCV includes
|
|
Rex Dieter |
7f9b22b |
|
|
Rex Dieter |
7f9b22b |
-#include <opencv2/core/version.hpp>
|
|
Rex Dieter |
7f9b22b |
+#include <cvver.h>
|
|
Rex Dieter |
7f9b22b |
|
|
Rex Dieter |
7f9b22b |
#define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
|
|
Rex Dieter |
7f9b22b |
#define OPENCV_VERSION OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
|
|
Rex Dieter |
7f9b22b |
diff -up digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h.opencv20 digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h
|
|
Rex Dieter |
7f9b22b |
--- digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h.opencv20 2013-03-11 03:24:07.000000000 -0500
|
|
Rex Dieter |
7f9b22b |
+++ digikam-3.1.0/extra/kipi-plugins/removeredeyes/plugin/libopencv.h 2013-03-24 20:05:41.132932117 -0500
|
|
Rex Dieter |
7f9b22b |
@@ -35,7 +35,7 @@
|
|
Rex Dieter |
7f9b22b |
|
|
Rex Dieter |
7f9b22b |
// OpenCV includes
|
|
Rex Dieter |
7f9b22b |
|
|
Rex Dieter |
7f9b22b |
-#include <opencv2/core/version.hpp>
|
|
Rex Dieter |
7f9b22b |
+#include <cvver.h>
|
|
Rex Dieter |
7f9b22b |
|
|
Rex Dieter |
7f9b22b |
#define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
|
|
Rex Dieter |
7f9b22b |
#define OPENCV_VERSION OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
|
|
Rex Dieter |
7f9b22b |
diff -up digikam-3.1.0/extra/libkface/libkface/database.cpp.opencv20 digikam-3.1.0/extra/libkface/libkface/database.cpp
|
|
Rex Dieter |
7f9b22b |
--- digikam-3.1.0/extra/libkface/libkface/database.cpp.opencv20 2013-03-11 03:24:20.000000000 -0500
|
|
Rex Dieter |
7f9b22b |
+++ digikam-3.1.0/extra/libkface/libkface/database.cpp 2013-03-24 20:05:41.132932117 -0500
|
|
Rex Dieter |
7f9b22b |
@@ -80,7 +80,7 @@ public:
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch (cv::Exception& e)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
- kError() << "cv::Exception:" << e.what();
|
|
Rex Dieter |
7f9b22b |
+ kError() << "cv::Exception:" << e.code;
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch(...)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
@@ -108,7 +108,7 @@ public:
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch (cv::Exception& e)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
- kError() << "cv::Exception:" << e.what();
|
|
Rex Dieter |
7f9b22b |
+ kError() << "cv::Exception:" << e.code;
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch(...)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
@@ -148,7 +148,7 @@ Database::Database(InitFlags flags, cons
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch (cv::Exception& e)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
- kError() << "cv::Exception:" << e.what();
|
|
Rex Dieter |
7f9b22b |
+ kError() << "cv::Exception:" << e.code;
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch(...)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
@@ -190,7 +190,7 @@ QList<Face> Database::detectFaces(const
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch (cv::Exception& e)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
- kError() << "cv::Exception:" << e.what();
|
|
Rex Dieter |
7f9b22b |
+ kError() << "cv::Exception:" << e.code;
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch(...)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
@@ -231,7 +231,7 @@ bool Database::updateFaces(QList<Face>&
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch (cv::Exception& e)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
- kError() << "cv::Exception:" << e.what();
|
|
Rex Dieter |
7f9b22b |
+ kError() << "cv::Exception:" << e.code;
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch(...)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
@@ -278,7 +278,7 @@ QList<double> Database::recognizeFaces(Q
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch (cv::Exception& e)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
- kError() << "cv::Exception:" << e.what();
|
|
Rex Dieter |
7f9b22b |
+ kError() << "cv::Exception:" << e.code;
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch(...)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
diff -up digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp.opencv20 digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp
|
|
Rex Dieter |
7f9b22b |
--- digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp.opencv20 2013-03-11 03:24:20.000000000 -0500
|
|
Rex Dieter |
7f9b22b |
+++ digikam-3.1.0/extra/libkface/libkface/kfaceutils.cpp 2013-03-24 20:05:41.132932117 -0500
|
|
Rex Dieter |
7f9b22b |
@@ -94,7 +94,7 @@ IplImage* KFaceUtils::QImage2GrayscaleIp
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch (cv::Exception& e)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
- kError() << "Cannot allocate IplImage:" << e.what();
|
|
Rex Dieter |
7f9b22b |
+ kError() << "Cannot allocate IplImage:" << e.code;
|
|
Rex Dieter |
7f9b22b |
return 0;
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch(...)
|
|
Rex Dieter |
7f9b22b |
@@ -132,7 +132,7 @@ IplImage* KFaceUtils::Data2GrayscaleIplI
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch (cv::Exception& e)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
- kError() << "Cannot allocate IplImage:" << e.what();
|
|
Rex Dieter |
7f9b22b |
+ kError() << "Cannot allocate IplImage:" << e.code;
|
|
Rex Dieter |
7f9b22b |
return 0;
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch(...)
|
|
Rex Dieter |
7f9b22b |
@@ -229,7 +229,7 @@ QImage KFaceUtils::IplImage2QImage(const
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch (cv::Exception& e)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
- kError() << "Cannot convert OpenCV Image to QImage:" << e.what();
|
|
Rex Dieter |
7f9b22b |
+ kError() << "Cannot convert OpenCV Image to QImage:" << e.code;
|
|
Rex Dieter |
7f9b22b |
}
|
|
Rex Dieter |
7f9b22b |
catch(...)
|
|
Rex Dieter |
7f9b22b |
{
|
|
Rex Dieter |
7f9b22b |
diff -up digikam-3.1.0/extra/libkface/libkface/libopencv.h.opencv20 digikam-3.1.0/extra/libkface/libkface/libopencv.h
|
|
Rex Dieter |
7f9b22b |
--- digikam-3.1.0/extra/libkface/libkface/libopencv.h.opencv20 2013-03-11 03:24:20.000000000 -0500
|
|
Rex Dieter |
7f9b22b |
+++ digikam-3.1.0/extra/libkface/libkface/libopencv.h 2013-03-24 20:05:41.133932105 -0500
|
|
Rex Dieter |
7f9b22b |
@@ -28,7 +28,7 @@
|
|
Rex Dieter |
7f9b22b |
|
|
Rex Dieter |
7f9b22b |
// OpenCV includes
|
|
Rex Dieter |
7f9b22b |
|
|
Rex Dieter |
7f9b22b |
-#include <opencv2/core/version.hpp>
|
|
Rex Dieter |
7f9b22b |
+#include <cvver.h>
|
|
Rex Dieter |
7f9b22b |
|
|
Rex Dieter |
7f9b22b |
#define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
|
|
Rex Dieter |
7f9b22b |
#define OPENCV_VERSION OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
|