X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-jobs.c;h=20f4ee21775719e6620dd4adafe58a2a13b5a73b;hb=f9c2880d31bb2f5d4411849b9207c5d26a5c616a;hp=d13c06b27abb828268d22082e34b7405a8df1fae;hpb=3a8589a7c5e0394df456074048845cddd04bc43d;p=evince.git diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c index d13c06b2..20f4ee21 100644 --- a/libview/ev-jobs.c +++ b/libview/ev-jobs.c @@ -448,12 +448,8 @@ ev_job_render_dispose (GObject *object) job = EV_JOB_RENDER (object); - if (job->ev_page) { - ev_debug_message (DEBUG_JOBS, "page: %d (%p)", job->ev_page->index, job); - g_object_unref (job->ev_page); - job->ev_page = NULL; - } - + ev_debug_message (DEBUG_JOBS, "page: %d (%p)", job->page, job); + if (job->surface) { cairo_surface_destroy (job->surface); job->surface = NULL; @@ -476,6 +472,7 @@ static gboolean ev_job_render_run (EvJob *job) { EvJobRender *job_render = EV_JOB_RENDER (job); + EvPage *ev_page; EvRenderContext *rc; ev_debug_message (DEBUG_JOBS, "page: %d (%p)", job_render->page, job); @@ -487,9 +484,10 @@ ev_job_render_run (EvJob *job) ev_document_fc_mutex_lock (); - job_render->ev_page = ev_document_get_page (job->document, job_render->page); - rc = ev_render_context_new (job_render->ev_page, job_render->rotation, job_render->scale); - + ev_page = ev_document_get_page (job->document, job_render->page); + rc = ev_render_context_new (ev_page, job_render->rotation, job_render->scale); + g_object_unref (ev_page); + job_render->surface = ev_document_render (job->document, rc); /* If job was cancelled during the page rendering, * we return now, so that the thread is finished ASAP @@ -600,7 +598,7 @@ ev_job_page_data_run (EvJob *job) ev_selection_get_selection_map (EV_SELECTION (job->document), ev_page); if ((job_pd->flags & EV_PAGE_DATA_INCLUDE_LINKS) && EV_IS_DOCUMENT_LINKS (job->document)) job_pd->link_mapping = - ev_document_links_get_links (EV_DOCUMENT_LINKS (job->document), job_pd->page); + ev_document_links_get_links (EV_DOCUMENT_LINKS (job->document), ev_page); if ((job_pd->flags & EV_PAGE_DATA_INCLUDE_FORMS) && EV_IS_DOCUMENT_FORMS (job->document)) job_pd->form_field_mapping = ev_document_forms_get_form_fields (EV_DOCUMENT_FORMS (job->document), @@ -608,7 +606,7 @@ ev_job_page_data_run (EvJob *job) if ((job_pd->flags & EV_PAGE_DATA_INCLUDE_IMAGES) && EV_IS_DOCUMENT_IMAGES (job->document)) job_pd->image_mapping = ev_document_images_get_image_mapping (EV_DOCUMENT_IMAGES (job->document), - job_pd->page); + ev_page); if ((job_pd->flags & EV_PAGE_DATA_INCLUDE_ANNOTS) && EV_IS_DOCUMENT_ANNOTATIONS (job->document)) job_pd->annot_mapping = ev_document_annotations_get_annotations (EV_DOCUMENT_ANNOTATIONS (job->document),