diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-05-11 13:55:05 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-05-11 13:55:05 +0000 |
| commit | 6e6cf820a8d00e4202f007cfd7b9ee440acfb8fd (patch) | |
| tree | 0756656f1c38f5ece4080380216d708510f1db10 /media-libs | |
| parent | Add 'video-thumbnails' USE flag, fix maintainer information (diff) | |
| download | gentoo-2-6e6cf820a8d00e4202f007cfd7b9ee440acfb8fd.tar.gz gentoo-2-6e6cf820a8d00e4202f007cfd7b9ee440acfb8fd.tar.bz2 gentoo-2-6e6cf820a8d00e4202f007cfd7b9ee440acfb8fd.zip | |
Backport patch from upstream to solve performance issue wrt bug #549146.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libkface/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/libkface/files/libkface-4.7.0-histogram.patch | 30 | ||||
| -rw-r--r-- | media-libs/libkface/libkface-4.7.0-r1.ebuild (renamed from media-libs/libkface/libkface-4.7.0.ebuild) | 4 |
3 files changed, 41 insertions, 2 deletions
diff --git a/media-libs/libkface/ChangeLog b/media-libs/libkface/ChangeLog index e41ee212b783..38bf6b53204b 100644 --- a/media-libs/libkface/ChangeLog +++ b/media-libs/libkface/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/libkface # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/ChangeLog,v 1.53 2015/02/21 10:32:21 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/ChangeLog,v 1.54 2015/05/11 13:55:05 kensington Exp $ + +*libkface-4.7.0-r1 (11 May 2015) + + 11 May 2015; Michael Palimaka <kensington@gentoo.org> + +files/libkface-4.7.0-histogram.patch, +libkface-4.7.0-r1.ebuild, + -libkface-4.7.0.ebuild: + Backport patch from upstream to solve performance issue wrt bug #549146. *libkface-4.7.0 (21 Feb 2015) diff --git a/media-libs/libkface/files/libkface-4.7.0-histogram.patch b/media-libs/libkface/files/libkface-4.7.0-histogram.patch new file mode 100644 index 000000000000..d65ac2d2ec5b --- /dev/null +++ b/media-libs/libkface/files/libkface-4.7.0-histogram.patch @@ -0,0 +1,30 @@ +From 916b00af31981a0729e05a92ae212f05279e730f Mon Sep 17 00:00:00 2001 +From: Gilles Caulier <caulier.gilles@gmail.com> +Date: Sat, 21 Mar 2015 14:57:53 +0100 +Subject: [PATCH] apply patch #91657 to fix libkface histogram DB table grawing + at each registration of data. CCBUGS: 338176 + +--- + libkface/recognition-opencv-lbph/lbphfacemodel.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libkface/recognition-opencv-lbph/lbphfacemodel.cpp b/libkface/recognition-opencv-lbph/lbphfacemodel.cpp +index 72a3635..af8c6a5 100644 +--- a/libkface/recognition-opencv-lbph/lbphfacemodel.cpp ++++ b/libkface/recognition-opencv-lbph/lbphfacemodel.cpp +@@ -160,9 +160,12 @@ void LBPHFaceModel::setHistograms(const QList<OpenCVMatData>& histograms, const + newHistograms.push_back(histogram.toMat()); + } + ++ m_histogramMetadata.clear(); ++ + foreach (const LBPHistogramMetadata& metadata, histogramMetadata) + { + newLabels.push_back(metadata.identity); ++ m_histogramMetadata << metadata; + } + + std::vector<cv::Mat> currentHistograms = ptr()->get<std::vector<cv::Mat> >("histograms"); +-- +2.3.6 + diff --git a/media-libs/libkface/libkface-4.7.0.ebuild b/media-libs/libkface/libkface-4.7.0-r1.ebuild index d1e6a10172f1..5bb6bcde6a39 100644 --- a/media-libs/libkface/libkface-4.7.0.ebuild +++ b/media-libs/libkface/libkface-4.7.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-4.7.0.ebuild,v 1.1 2015/02/21 10:32:21 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libkface/libkface-4.7.0-r1.ebuild,v 1.1 2015/05/11 13:55:05 kensington Exp $ EAPI=5 @@ -24,3 +24,5 @@ DEPEND=">=media-libs/opencv-2.4.9" RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P}/extra/${PN} + +PATCHES=( "${FILESDIR}/${P}-histogram.patch" ) |