[SCM] okular packaging branch, master, updated. debian/4.8.4-2-6-g0124db1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/okular.git;a=commitdiff;h=d964176

The following commit has been merged in the master branch:
commit d9641760440d561273d69944f79b7a433b6b71cb
Author: Pino Toscano <pino at debian.org>
Date:   Sun Oct 7 15:44:19 2012 +0200

    fix the extraction of the page bounding box (#686642)
    
    ... used by the trimming function;
    backport upstream commit edbb4ef9f5aa8f120558b9d4f4b9f68970100c4b
---
 debian/changelog                                   |    4 ++
 debian/patches/series                              |    1 +
 ...tor-signalPixmapRequestDone-_after_-savin.patch |   40 ++++++++++++++++++++
 3 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf8c566..1aba7de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ okular (4:4.8.4-3) UNRELEASED; urgency=low
     by the okularpart has been dropped.
   * The two changes above will make sure to avoid different versions of
     libokularcore and okular at the same time. (Closes: #680946)
+  * Backport upstream commit edbb4ef9f5aa8f120558b9d4f4b9f68970100c4b to fix
+    the extraction of the page bounding box, used by the trimming function;
+    patch upstream_Call-Generator-signalPixmapRequestDone-_after_-savin.patch.
+    (Closes: #686642)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 Jul 2012 15:24:28 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..8bc2492 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Call-Generator-signalPixmapRequestDone-_after_-savin.patch
diff --git a/debian/patches/upstream_Call-Generator-signalPixmapRequestDone-_after_-savin.patch b/debian/patches/upstream_Call-Generator-signalPixmapRequestDone-_after_-savin.patch
new file mode 100644
index 0000000..c28ba2c
--- /dev/null
+++ b/debian/patches/upstream_Call-Generator-signalPixmapRequestDone-_after_-savin.patch
@@ -0,0 +1,40 @@
+From edbb4ef9f5aa8f120558b9d4f4b9f68970100c4b Mon Sep 17 00:00:00 2001
+From: Fabio D'Urso <fabiodurso at hotmail.it>
+Date: Tue, 17 Jul 2012 20:35:54 +0200
+Subject: [PATCH] Call Generator::signalPixmapRequestDone _after_ saving the
+ calculated bounding box
+
+Fixes a bug that causes the extraction of a wrong bounding box:
+
+If the request queue is not empty, signalPixmapRequestDone causes a new
+pixmap request to be started, thus overwriting mPixmapGenerationThread's
+mCalcBoundingBox before it is read by the if in the next line.
+
+Now signalPixmapRequestDone is called after the bounding box is saved,
+so that new requests are started only after all data from
+mPixmapGenerationThread have been saved.
+
+BUG: 257370
+REVIEW: 105600
+---
+ core/generator.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/generator.cpp b/core/generator.cpp
+index 0073943..72993c0 100644
+--- a/core/generator.cpp
++++ b/core/generator.cpp
+@@ -103,9 +103,9 @@ void GeneratorPrivate::pixmapGenerationFinished()
+     request->page()->setPixmap( request->id(), new QPixmap( QPixmap::fromImage( img ) ) );
+     const int pageNumber = request->page()->number();
+ 
+-    q->signalPixmapRequestDone( request );
+     if ( mPixmapGenerationThread->calcBoundingBox() )
+         q->updatePageBoundingBox( pageNumber, mPixmapGenerationThread->boundingBox() );
++    q->signalPixmapRequestDone( request );
+ }
+ 
+ void GeneratorPrivate::textpageGenerationFinished()
+-- 
+1.7.10.4
+

-- 
okular packaging