]> www.fi.muni.cz Git - evince.git/commitdiff
[djvu] Do not alloc image buffer, let cairo do that
authorCarlos Garcia Campos <carlosgc@gnome.org>
Sun, 21 Feb 2010 14:35:35 +0000 (15:35 +0100)
committerCarlos Garcia Campos <carlosgc@gnome.org>
Mon, 22 Feb 2010 18:36:04 +0000 (19:36 +0100)
backend/djvu/djvu-document.c

index e26db4a693530fe3f952bd721812afd656bbf8d9..7ab5c76cc00f35b40439f7360f6bba3d07c2e361 100644 (file)
@@ -323,7 +323,6 @@ djvu_document_render (EvDocument      *document,
        ddjvu_page_t *d_page;
        ddjvu_page_rotation_t rotation;
        double page_width, page_height, tmp;
-       static const cairo_user_data_key_t key;
 
        d_page = ddjvu_page_create_by_pageno (djvu_document->d_document, rc->page->index);
        
@@ -355,19 +354,12 @@ djvu_document_render (EvDocument      *document,
                default:
                        rotation = DDJVU_ROTATE_0;
        }
-#ifdef HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH
-       rowstride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, page_width);
-#else
-       rowstride = page_width * 4;
-#endif
-       pixels = (gchar *) g_malloc (page_height * rowstride);
-       surface = cairo_image_surface_create_for_data ((guchar *)pixels,
-                                                      CAIRO_FORMAT_RGB24,
-                                                      page_width,
-                                                      page_height,
-                                                      rowstride);
-       cairo_surface_set_user_data (surface, &key,
-                                    pixels, (cairo_destroy_func_t)g_free);
+
+       surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
+                                             page_width, page_height);
+       rowstride = cairo_image_surface_get_stride (surface);
+       pixels = (gchar *)cairo_image_surface_get_data (surface);
+
        prect.x = 0;
        prect.y = 0;
        prect.w = page_width;
@@ -383,6 +375,8 @@ djvu_document_render (EvDocument      *document,
                           rowstride,
                           pixels);
 
+       cairo_surface_mark_dirty (surface);
+
        return surface;
 }