Hello community,

here is the log from the commit of package cairo for openSUSE:Factory checked 
in at 2015-01-08 23:05:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cairo (Old)
 and      /work/SRC/openSUSE:Factory/.cairo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "cairo"

Changes:
--------
--- /work/SRC/openSUSE:Factory/cairo/cairo.changes      2014-11-13 
09:16:44.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cairo.new/cairo.changes 2015-01-08 
23:05:23.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan  7 13:30:28 UTC 2015 - dims...@opensuse.org
+
+- Add cairo-tor-scan-convertor.patch: tor-scan-converter: can't
+  do_fullrow when intersection in row + 0.5subrow (fdo#85151).
+
+-------------------------------------------------------------------

New:
----
  cairo-tor-scan-convertor.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cairo.spec ++++++
--- /var/tmp/diff_new_pack.nnTOPK/_old  2015-01-08 23:05:26.000000000 +0100
+++ /var/tmp/diff_new_pack.nnTOPK/_new  2015-01-08 23:05:26.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cairo
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,8 @@
 Patch2:         cairo-render-thin-lines.patch
 # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 
fcro...@suse.com -- Fix crash when client and server have different endianness
 Patch3:         cairo-xlib-endianness.patch
+# PATCH-FIX-UPSTREAM cairo-tor-scan-convertor.patch fdo#85151 
dims...@opensuse.org -- tor-scan-converter: can't do_fullrow when intersection 
in row + 0.5subrow
+Patch4:         cairo-tor-scan-convertor.patch
 # These libraries are needed only for tests.
 # Do not enable tests in build systems, it causes build loop!
 #BuildRequires:  librsvg-devel poppler-devel
@@ -160,6 +162,7 @@
 # fix_for_fdo77298.patch
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # Needed by patch0 and patch1

++++++ cairo-tor-scan-convertor.patch ++++++
>From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001
From: Massimo Valentini <mvalent...@src.gnome.org>
Date: Sun, 19 Oct 2014 09:19:10 +0200
Subject: tor-scan-converter: can't do_fullrow when intersection in row +
 0.5subrow

the active edges list must be left sorted at the next possible use
and since full_row does not deal with intersections it is not usable
when there is an intersection in the top half of the next row first
subrow

Reported-and-tested-by: Matthew Leach
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85151
Reviewed-by: Chris Wilson <ch...@chris-wilson.co.uk>

diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c
index 4adcafb..14922d0 100644
--- a/src/cairo-tor-scan-converter.c
+++ b/src/cairo-tor-scan-converter.c
@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active)
 
        if (e->dy) {
            struct quorem x = e->x;
-           x.quo += e->dxdy_full.quo - e->dxdy.quo/2;
-           x.rem += e->dxdy_full.rem - e->dxdy.rem/2;
+           x.quo += e->dxdy_full.quo;
+           x.rem += e->dxdy_full.rem;
            if (x.rem < 0) {
                x.quo--;
                x.rem += e->dy;
-- 
cgit v0.10.2


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to