[Libreoffice-commits] core.git: vcl/headless

David Tardon dtardon at redhat.com
Sun Nov 22 12:53:57 PST 2015


 vcl/headless/svpgdi.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 0c54f1978f0e95ca0e88e326a6ef52b10ee2f343
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 22 21:52:27 2015 +0100

    blind attempt to fix build on Linux-rpm_deb-x86 at 71-TDF-dbg
    
    Change-Id: I00c2ba6d65dde76eeea127c541810edd93ef9a1c

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 569a21f..60a1b9d 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -132,6 +132,16 @@ void SvpSalGraphics::clipRegion(cairo_t* cr)
 }
 namespace
 {
+#if CAIRO_VERSION_MAJOR == 1 && CAIRO_VERSION_MINOR < 10
+    struct cairo_rectangle_int_t
+    {
+        double x;
+        double y;
+        double width;
+        double height;
+    }
+#endif
+
     cairo_rectangle_int_t getFillDamage(cairo_t* cr)
     {
         cairo_rectangle_int_t extents;
@@ -139,6 +149,7 @@ namespace
 
         cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
         extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1;
+#if CAIRO_VERSION_MAJOR > 1 || (CAIRO_VERSION_MAJOR == 1 && CAIRO_VERSION_MINOR >= 10)
         cairo_region_t *region = cairo_region_create_rectangle(&extents);
 
         cairo_fill_extents(cr, &x1, &y1, &x2, &y2);
@@ -147,6 +158,7 @@ namespace
 
         cairo_region_get_extents(region, &extents);
         cairo_region_destroy(region);
+#endif
 
         return extents;
     }


More information about the Libreoffice-commits mailing list