Attachment 40757 Details for Bug 32068 – Create cairo image surface in case of a8

[patch] Create cairo image surface in case of a8

patch_cairo_qt_a8.diff (text/plain), 1.39 KB, created by Oleg Romashin on 2010-12-02 23:21:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Romashin

Created: 2010-12-02 23:21:41 UTC

Size: 1.39 KB

patch

obsolete

>diff --git a/src/cairo-qt-surface.cpp b/src/cairo-qt-surface.cpp
>index 5b61b42..5635f2a 100644
>--- a/src/cairo-qt-surface.cpp
>+++ b/src/cairo-qt-surface.cpp
>@@ -473,7 +473,7 @@ _cairo_qt_surface_finish (void *abstract_surface)
>     /* Only delete p if we created it */
>     if (qs->image || qs->pixmap)
>         delete qs->p;
>-    else
>+    else if (qs->p)
> 	qs->p->restore ();
> 
>     if (qs->image_equiv)
>@@ -750,7 +750,7 @@ _cairo_qt_surface_set_clip (cairo_qt_surface_t *qs,
> {
>     cairo_int_status_t status;
> 
>-    D(fprintf(stderr, "q[%p] intersect_clip_path %s\n", abstract_surface, path ? "(path)" : "(clear)"));
>+    D(fprintf(stderr, "q[%p] intersect_clip_path %s\n", qs, clip ? "(path)" : "(clear)"));
> 
>     if (clip == NULL) {
> 	_cairo_surface_clipper_reset (&qs->clipper);
>@@ -1654,6 +1654,15 @@ cairo_qt_surface_create_with_qimage (cairo_format_t format,
>     _cairo_surface_clipper_init (&qs->clipper,
> 				 _cairo_qt_surface_clipper_intersect_clip_path);
> 
>+    if (CAIRO_FORMAT_A8 == format) {
>+        qs->image = NULL;
>+        qs->image_equiv = cairo_image_surface_create(format,
>+                                                     width, height);
>+        qs->p = NULL;
>+        qs->supports_porter_duff = false;
>+        qs->window = QRect(0, 0, width, height);
>+        return &qs->base;
>+    }
> 
>     QImage *image = new QImage (width, height,
> 				_qimage_format_from_cairo_format (format));

Actions: View | Splinter Review

Attachments on bug 32068: 40757

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.