rev 20010 - in kde-extras/digikam/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2014-09-29 22:37:30 +0000 (Mon, 29 Sep 2014)
New Revision: 20010

Added:
   kde-extras/digikam/trunk/debian/patches/upstream_Restore-the-lowercase-path-to-opencv-shared-data.patch
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/patches/series
Log:
fix loading of OpenCV Haar Cascade XML files (#763089)

backport upstream commit 4433a5ba8386641088fe0d606f8b18fd0e87e973 (from
libkface)


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2014-09-29 18:58:44 UTC (rev 20009)
+++ kde-extras/digikam/trunk/debian/changelog	2014-09-29 22:37:30 UTC (rev 20010)
@@ -4,6 +4,10 @@
   * Change section of digikam-private-libs from graphics to libs.
   * Remove the gallery suggest from kipi-plugins, since it does not exist in
     Debian nor seem used.
+  * Backport upstream commit 4433a5ba8386641088fe0d606f8b18fd0e87e973 (from
+    libkface) to fix the loading of OpenCV Haar Cascade XML files; patch
+    upstream_Restore-the-lowercase-path-to-opencv-shared-data.patch.
+    (Closes: #763089)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 27 Sep 2014 20:01:43 +0200
 

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2014-09-29 18:58:44 UTC (rev 20009)
+++ kde-extras/digikam/trunk/debian/patches/series	2014-09-29 22:37:30 UTC (rev 20010)
@@ -1 +1,2 @@
+upstream_Restore-the-lowercase-path-to-opencv-shared-data.patch
 sendimages-icedove.diff

Added: kde-extras/digikam/trunk/debian/patches/upstream_Restore-the-lowercase-path-to-opencv-shared-data.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/upstream_Restore-the-lowercase-path-to-opencv-shared-data.patch	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/upstream_Restore-the-lowercase-path-to-opencv-shared-data.patch	2014-09-29 22:37:30 UTC (rev 20010)
@@ -0,0 +1,33 @@
+From 4433a5ba8386641088fe0d606f8b18fd0e87e973 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Tue, 30 Sep 2014 00:22:10 +0200
+Subject: [PATCH] Restore the lowercase path to opencv shared data
+
+Add back the lowercase path to the OpenCV data (e.g. the haar cascades),
+as it was before commit b8a9b3f23f073e899cede16c351ca9119d8af510.
+
+This makes likface able to use again system OpenCV data, at least on
+Debian systems.
+
+BUG: 337507
+---
+ libkface/facedetector.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/extra/libkface/libkface/facedetector.cpp b/extra/libkface/libkface/facedetector.cpp
+index ba40ac7..fb0e9c3 100644
+--- a/extra/libkface/libkface/facedetector.cpp
++++ b/extra/libkface/libkface/facedetector.cpp
+@@ -67,7 +67,9 @@ public:
+             cascadeDirs << KGlobal::dirs()->findDirs("data",         "libkface/haarcascades");
+ 
+             // Second try to find OpenCV shared files. Work only under Linux and OSX. OpenCV do not install XML files under Windows (checked with OpenCV 2.4.9)
++            // Try under both CamelCase *and* lowercase directories, as both seems to be used.
+             cascadeDirs << KGlobal::dirs()->findDirs("xdgdata-apps", "../OpenCV/haarcascades");
++            cascadeDirs << KGlobal::dirs()->findDirs("xdgdata-apps", "../opencv/haarcascades");
+             
+             // Last try to find OpenCV shared files, using cmake env variables.
+             cascadeDirs << QString("%1/haarcascades").arg(OPENCV_ROOT_PATH);
+-- 
+2.1.0
+