Attachment 1063042 Details for Bug 1238677 – fawkes-0.5.0-opencv3.patch

[patch] fawkes-0.5.0-opencv3.patch

fawkes-0.5.0-opencv3.patch (text/plain), 4.66 KB, created by Viktor Jancik on 2015-08-14 14:38:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Viktor Jancik

Created: 2015-08-14 14:38:18 UTC

Size: 4.66 KB

patch

obsolete

>diff -up fawkes-0.5.0/src/libs/fvfilters/gauss.cpp.opencv3 fawkes-0.5.0/src/libs/fvfilters/gauss.cpp
>--- fawkes-0.5.0/src/libs/fvfilters/gauss.cpp.opencv3	2015-08-14 08:14:14.313085394 -0400
>+++ fawkes-0.5.0/src/libs/fvfilters/gauss.cpp	2015-08-14 08:24:20.984425238 -0400
>@@ -27,7 +27,7 @@
> #ifdef HAVE_IPP
> #  include <ippi.h>
> #elif defined(HAVE_OPENCV)
>-#  include <cv.h>
>+#  include <opencv/cv.hpp>
> #else
> #  error "Neither IPP nor OpenCV available"
> #endif
>diff -up fawkes-0.5.0/src/libs/fvfilters/hipass.cpp.opencv3 fawkes-0.5.0/src/libs/fvfilters/hipass.cpp
>--- fawkes-0.5.0/src/libs/fvfilters/hipass.cpp.opencv3	2015-08-14 08:16:28.969829123 -0400
>+++ fawkes-0.5.0/src/libs/fvfilters/hipass.cpp	2015-08-14 08:17:29.056268550 -0400
>@@ -26,7 +26,7 @@
> #ifdef HAVE_IPP
> #  include <ippi.h>
> #elif defined(HAVE_OPENCV)
>-#  include <cv.h>
>+#  include <opencv/cv.hpp>
> #else
> #  error "Neither IPP nor OpenCV available"
> #endif
>diff -up fawkes-0.5.0/src/libs/fvfilters/laplace.cpp.opencv3 fawkes-0.5.0/src/libs/fvfilters/laplace.cpp
>--- fawkes-0.5.0/src/libs/fvfilters/laplace.cpp.opencv3	2015-08-14 08:17:57.466003490 -0400
>+++ fawkes-0.5.0/src/libs/fvfilters/laplace.cpp	2015-08-14 08:18:15.015839765 -0400
>@@ -30,7 +30,7 @@
> #ifdef HAVE_IPP
> #  include <ippi.h>
> #elif defined(HAVE_OPENCV)
>-#  include <cv.h>
>+#  include <opencv/cv.hpp>
> #else
> #  error "Neither IPP nor OpenCV available"
> #endif
>diff -up fawkes-0.5.0/src/libs/fvfilters/median.cpp.opencv3 fawkes-0.5.0/src/libs/fvfilters/median.cpp
>--- fawkes-0.5.0/src/libs/fvfilters/median.cpp.opencv3	2015-08-14 08:18:31.531685676 -0400
>+++ fawkes-0.5.0/src/libs/fvfilters/median.cpp	2015-08-14 08:18:45.731553208 -0400
>@@ -27,7 +27,7 @@
> #ifdef HAVE_IPP
> #  include <ippi.h>
> #elif defined(HAVE_OPENCV)
>-#  include <cv.h>
>+#  include <opencv/cv.hpp>
> #else
> #  error "Neither IPP nor OpenCV available"
> #endif
>diff -up fawkes-0.5.0/src/libs/fvfilters/morphology/dilation.cpp.opencv3 fawkes-0.5.0/src/libs/fvfilters/morphology/dilation.cpp
>--- fawkes-0.5.0/src/libs/fvfilters/morphology/dilation.cpp.opencv3	2015-08-14 08:19:27.554163007 -0400
>+++ fawkes-0.5.0/src/libs/fvfilters/morphology/dilation.cpp	2015-08-14 08:24:51.679138862 -0400
>@@ -31,7 +31,7 @@
> #ifdef HAVE_IPP
> #  include <ippi.h>
> #elif defined(HAVE_OPENCV)
>-#  include <cv.h>
>+#  include <opencv/cv.hpp>
> #else
> #  error "Neither IPP nor OpenCV available"
> #endif
>diff -up fawkes-0.5.0/src/libs/fvfilters/morphology/erosion.cpp.opencv3 fawkes-0.5.0/src/libs/fvfilters/morphology/erosion.cpp
>--- fawkes-0.5.0/src/libs/fvfilters/morphology/erosion.cpp.opencv3	2015-08-14 08:20:52.753368127 -0400
>+++ fawkes-0.5.0/src/libs/fvfilters/morphology/erosion.cpp	2015-08-14 08:21:06.743237604 -0400
>@@ -30,7 +30,7 @@
> #ifdef HAVE_IPP
> #  include <ippi.h>
> #elif defined(HAVE_OPENCV)
>-#  include <cv.h>
>+#  include <opencv/cv.hpp>
> #else
> #  error "Neither IPP nor OpenCV available"
> #endif
>diff -up fawkes-0.5.0/src/libs/fvfilters/or.cpp.opencv3 fawkes-0.5.0/src/libs/fvfilters/or.cpp
>--- fawkes-0.5.0/src/libs/fvfilters/or.cpp.opencv3	2015-08-14 08:22:13.369615951 -0400
>+++ fawkes-0.5.0/src/libs/fvfilters/or.cpp	2015-08-14 08:22:59.097189298 -0400
>@@ -29,7 +29,7 @@
> #ifdef HAVE_IPP
> #  include <ippi.h>
> #elif defined(HAVE_OPENCV)
>-#  include <cv.h>
>+#  include <opencv/cv.hpp>
> #else
> #  error "Neither IPP nor OpenCV available"
> #endif
>diff -up fawkes-0.5.0/src/libs/fvfilters/sharpen.cpp.opencv3 fawkes-0.5.0/src/libs/fvfilters/sharpen.cpp
>--- fawkes-0.5.0/src/libs/fvfilters/sharpen.cpp.opencv3	2015-08-14 08:22:19.641557429 -0400
>+++ fawkes-0.5.0/src/libs/fvfilters/sharpen.cpp	2015-08-14 08:23:18.688006506 -0400
>@@ -27,7 +27,7 @@
> #ifdef HAVE_IPP
> #  include <ippi.h>
> #elif defined(HAVE_OPENCV)
>-#  include <cv.h>
>+#  include <opencv/cv.hpp>
> #else
> #  error "Neither IPP nor OpenCV available"
> #endif
>diff -up fawkes-0.5.0/src/libs/fvfilters/sobel.cpp.opencv3 fawkes-0.5.0/src/libs/fvfilters/sobel.cpp
>--- fawkes-0.5.0/src/libs/fvfilters/sobel.cpp.opencv3	2015-08-14 08:22:37.087394659 -0400
>+++ fawkes-0.5.0/src/libs/fvfilters/sobel.cpp	2015-08-14 08:23:35.616848554 -0400
>@@ -27,7 +27,7 @@
> #ifdef HAVE_IPP
> #  include <ippi.h>
> #elif defined(HAVE_OPENCV)
>-#  include <cv.h>
>+#  include <opencv/cv.hpp>
> #else
> #  error "Neither IPP nor OpenCV available"
> #endif
>diff -up fawkes-0.5.0/src/libs/fvfilters/threshold.cpp.opencv3 fawkes-0.5.0/src/libs/fvfilters/threshold.cpp
>--- fawkes-0.5.0/src/libs/fvfilters/threshold.cpp.opencv3	2015-08-14 08:22:44.257327758 -0400
>+++ fawkes-0.5.0/src/libs/fvfilters/threshold.cpp	2015-08-14 08:23:49.007723610 -0400
>@@ -32,7 +32,7 @@
> #ifdef HAVE_IPP
> #  include <ippi.h>
> #elif defined(HAVE_OPENCV)
>-#  include <cv.h>
>+#  include <opencv/cv.hpp>
> #else
> #  error "Neither IPP nor OpenCV available"
> #endif

Actions: View | Diff

Attachments on bug 1238677: 1045481 | 1063042 | 1063043 | 1064369