[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-77-g9ea1bcc

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=9ddff3d

The following commit has been merged in the master branch:
commit 9ddff3da040674104247df3618510763c8b9e4e4
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jun 24 14:36:56 2014 +0200

    New patch: upstream_fix_using_a_transaction_in_the_filter_op.patch
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 +
 ..._fix_using_a_transaction_in_the_filter_op.patch | 34 ++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ef3d22d..0631d06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ calligra (1:2.8.3-1) UNRELEASED; urgency=medium
   * New patch: install_images_in_datadir
   * Bump libkdcraw and marble b-d, to help the kde4.12 transition.
   * Refresh patches for 2.8.3.
+  * New patch: upstream_fix_using_a_transaction_in_the_filter_op.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 15 May 2014 17:21:04 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 9d4f941..c367cdb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ eigen3_in_tests
 disable_convolution_failling_tests
 temporarily_disable_failing_tests
 calligra_imports_search_path
+upstream_fix_using_a_transaction_in_the_filter_op.patch
diff --git a/debian/patches/upstream_fix_using_a_transaction_in_the_filter_op.patch b/debian/patches/upstream_fix_using_a_transaction_in_the_filter_op.patch
new file mode 100644
index 0000000..1f19ab0
--- /dev/null
+++ b/debian/patches/upstream_fix_using_a_transaction_in_the_filter_op.patch
@@ -0,0 +1,34 @@
+commit 13657911836f1996de6154b305386c3e72944c34
+Author: Dmitry Kazakov <dimula73 at gmail.com>
+Date:   Mon May 5 12:50:00 2014 +0400
+
+    Fix using a transaction in the Filter Op
+    
+    Otherwise the filters like Gaussian Blur and Unsharp Mask will not work
+    correctly.
+    
+    BUG:332130
+
+diff --git a/krita/plugins/paintops/filterop/kis_filterop.cpp b/krita/plugins/paintops/filterop/kis_filterop.cpp
+index c42757a..1c6e413 100644
+--- a/krita/plugins/paintops/filterop/kis_filterop.cpp
++++ b/krita/plugins/paintops/filterop/kis_filterop.cpp
+@@ -45,6 +45,7 @@
+ #include <kis_filterop_settings.h>
+ #include <kis_iterator_ng.h>
+ #include <kis_fixed_paint_device.h>
++#include <kis_transaction.h>
+ 
+ KisFilterOp::KisFilterOp(const KisFilterOpSettings *settings, KisPainter *painter, KisImageWSP image)
+     : KisBrushBasedPaintOp(settings, painter)
+@@ -123,7 +124,10 @@ KisSpacingInformation KisFilterOp::paintAt(const KisPaintInformation& info)
+         p.setCompositeOp(COMPOSITE_COPY);
+     }
+     p.bitBltOldData(neededRect.topLeft() - dstRect.topLeft(), source(), neededRect);
++
++    KisTransaction transaction("", m_tmpDevice);
+     m_filter->process(m_tmpDevice, dabRect, m_filterConfiguration, 0);
++    transaction.end();
+ 
+ 
+     painter()->

-- 
Calligra suite packaging