diff options
author | Carlos Garcia Campos <carlosgc@gnome.org> | 2008-04-14 17:07:39 (GMT) |
---|---|---|
committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2008-04-14 17:07:39 (GMT) |
commit | b8aebf2e1ba5b4f9ff1e1256b28acb3e23947c51 (patch) | |
tree | f7d8b818735e00a7411fc902af3048df8d0459ac /shell/ev-jobs.c | |
parent | 1aac2d41f056e15fefd248d67b2765da3a03ca1d (diff) |
Add EvPage so that we can hold a reference to the backend page. Form
2008-04-14 Carlos Garcia Campos <carlosgc@gnome.org>
* libdocument/Makefile.am:
* libdocument/ev-page.[ch]:
* libdocument/ev-render-context.[ch]: (ev_render_context_dispose),
(ev_render_context_new), (ev_render_context_set_page):
* libdocument/ev-form-field.[ch]: (ev_form_field_init),
(ev_form_field_finalize), (ev_form_field_class_init):
* libdocument/ev-document-forms.[ch]:
(ev_document_forms_get_form_fields):
* libdocument/ev-document.[ch]: (ev_document_get_page),
(ev_document_get_page_size), (ev_document_get_page_label):
* shell/ev-jobs.[ch]: (ev_job_thumbnail_dispose),
(ev_job_render_run), (ev_job_thumbnail_new),
(ev_job_thumbnail_run), (ev_job_print_run):
* shell/ev-page-cache.c: (ev_page_cache_new):
* shell/ev-pixbuf-cache.c: (job_page_ready_cb), (job_finished_cb),
(check_job_size_and_unref), (add_job):
* shell/ev-sidebar-thumbnails.c: (add_range):
* shell/ev-view.c: (ev_view_form_field_get_region),
(ev_view_form_field_button_create_widget),
(ev_view_form_field_text_save), (ev_view_form_field_choice_save),
(ev_view_handle_form_field), (ev_view_size_allocate),
(get_selected_text):
* shell/ev-window.c: (ev_window_refresh_window_thumbnail):
* backend/pdf/ev-poppler.cc: (pdf_document_get_page_size),
(pdf_document_get_page), (pdf_document_get_page_label),
(pdf_document_render), (pdf_document_get_info),
(pdf_document_document_iface_init),
(pdf_document_thumbnails_get_thumbnail),
(pdf_document_thumbnails_get_dimensions),
(pdf_document_file_exporter_do_page),
(pdf_selection_render_selection),
(pdf_selection_get_selected_text),
(pdf_selection_get_selection_region),
(pdf_selection_get_selection_map),
(pdf_document_forms_get_form_fields),
(pdf_document_forms_form_field_text_get_text),
(pdf_document_forms_form_field_text_set_text),
(pdf_document_forms_form_field_button_set_state),
(pdf_document_forms_form_field_button_get_state),
(pdf_document_forms_form_field_choice_get_item),
(pdf_document_forms_form_field_choice_get_n_items),
(pdf_document_forms_form_field_choice_is_item_selected),
(pdf_document_forms_form_field_choice_select_item),
(pdf_document_forms_form_field_choice_toggle_item),
(pdf_document_forms_form_field_choice_unselect_all),
(pdf_document_forms_form_field_choice_set_text),
(pdf_document_forms_form_field_choice_get_text):
* backend/ps/ev-spectre.c: (ps_document_get_page),
(ps_document_get_page_size), (ps_document_get_page_label),
(ps_document_render), (ps_document_document_iface_init),
(ps_document_file_exporter_do_page):
* backend/tiff/tiff-document.c: (tiff_document_get_page_size),
(tiff_document_render), (tiff_document_render_pixbuf),
(tiff_document_file_exporter_do_page):
* backend/pixbuf/pixbuf-document.c:
(pixbuf_document_get_page_size):
* backend/comics/comics-document.c:
(comics_document_get_page_size), (comics_document_render_pixbuf):
* backend/djvu/djvu-document.c: (djvu_document_get_page_size),
(djvu_document_render), (djvu_selection_get_selected_text),
(djvu_document_thumbnails_get_thumbnail),
(djvu_document_file_exporter_do_page),
(djvu_document_find_get_result):
* backend/dvi/dvi-document.c: (dvi_document_get_page_size),
(dvi_document_render), (dvi_document_thumbnails_get_dimensions),
(dvi_document_thumbnails_get_thumbnail),
(dvi_document_file_exporter_do_page):
* backend/impress/impress-document.c:
(impress_document_get_page_size),
(impress_document_render_pixbuf):
* thumbnailer/evince-thumbnailer.c: (evince_thumbnail_pngenc_get):
Add EvPage so that we can hold a reference to the backend
page. Form fields keep now a reference to the poppler page
improving performance since we don't have to create/destroy the
poppler field for every form operation. This will be needed for
annotations too.
svn path=/trunk/; revision=3004
Diffstat (limited to 'shell/ev-jobs.c')
-rw-r--r-- | shell/ev-jobs.c | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c index f6328af..7a642a2 100644 --- a/shell/ev-jobs.c +++ b/shell/ev-jobs.c @@ -184,11 +184,6 @@ ev_job_thumbnail_dispose (GObject *object) job->thumbnail = NULL; } - if (job->rc) { - g_object_unref (job->rc); - job->rc = NULL; - } - (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object); } @@ -362,7 +357,7 @@ ev_job_render_run (EvJobRender *job) if (EV_JOB (job)->async) { EvAsyncRenderer *renderer = EV_ASYNC_RENDERER (EV_JOB (job)->document); - ev_async_renderer_render_pixbuf (renderer, job->rc->page, job->rc->scale, + ev_async_renderer_render_pixbuf (renderer, job->rc->page->index, job->rc->scale, job->rc->rotation); g_signal_connect (EV_JOB (job)->document, "render_finished", G_CALLBACK (render_finished_cb), job); @@ -396,15 +391,15 @@ ev_job_render_run (EvJobRender *job) if (job->include_links && EV_IS_DOCUMENT_LINKS (EV_JOB (job)->document)) job->link_mapping = ev_document_links_get_links (EV_DOCUMENT_LINKS (EV_JOB (job)->document), - job->rc->page); + job->rc->page->index); if (job->include_forms && EV_IS_DOCUMENT_FORMS (EV_JOB (job)->document)) job->form_field_mapping = - ev_document_forms_get_form_fields (EV_DOCUMENT_FORMS (EV_JOB(job)->document), + ev_document_forms_get_form_fields (EV_DOCUMENT_FORMS (EV_JOB (job)->document), job->rc->page); if (job->include_images && EV_IS_DOCUMENT_IMAGES (EV_JOB (job)->document)) job->image_mapping = ev_document_images_get_image_mapping (EV_DOCUMENT_IMAGES (EV_JOB (job)->document), - job->rc->page); + job->rc->page->index); EV_JOB (job)->finished = TRUE; } @@ -412,15 +407,19 @@ ev_job_render_run (EvJobRender *job) } EvJob * -ev_job_thumbnail_new (EvDocument *document, - EvRenderContext *rc) +ev_job_thumbnail_new (EvDocument *document, + gint page, + gint rotation, + gdouble scale) { EvJobThumbnail *job; job = g_object_new (EV_TYPE_JOB_THUMBNAIL, NULL); EV_JOB (job)->document = g_object_ref (document); - job->rc = g_object_ref (rc); + job->page = page; + job->rotation = rotation; + job->scale = scale; return EV_JOB (job); } @@ -428,16 +427,24 @@ ev_job_thumbnail_new (EvDocument *document, void ev_job_thumbnail_run (EvJobThumbnail *job) { + EvRenderContext *rc; + EvPage *page; + g_return_if_fail (EV_IS_JOB_THUMBNAIL (job)); ev_document_doc_mutex_lock (); + page = ev_document_get_page (EV_JOB (job)->document, job->page); + rc = ev_render_context_new (page, job->rotation, job->scale); + g_object_unref (page); + job->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB (job)->document), - job->rc, TRUE); - EV_JOB (job)->finished = TRUE; - + rc, TRUE); + g_object_unref (rc); ev_document_doc_mutex_unlock (); + + EV_JOB (job)->finished = TRUE; } static void ev_job_fonts_init (EvJobFonts *job) { /* Do Nothing */ } @@ -917,7 +924,7 @@ ev_job_print_run (EvJobPrint *job) fc.duplex = FALSE; fc.pages_per_sheet = MAX (1, job->pages_per_sheet); - rc = ev_render_context_new (0, 0, 1.0); + rc = ev_render_context_new (NULL, 0, 1.0); ev_document_doc_mutex_lock (); ev_file_exporter_begin (EV_FILE_EXPORTER (document), &fc); @@ -937,12 +944,17 @@ ev_job_print_run (EvJobPrint *job) ev_file_exporter_begin_page (EV_FILE_EXPORTER (document)); for (j = 0; j < job->pages_per_sheet; j++) { + EvPage *ev_page; + gint p = page + j; if (p < 0 || p >= n_pages) break; + + ev_page = ev_document_get_page (document, page_list[p]); + ev_render_context_set_page (rc, ev_page); + g_object_unref (ev_page); - ev_render_context_set_page (rc, page_list[p]); ev_file_exporter_do_page (EV_FILE_EXPORTER (document), rc); } |