+2005-07-29 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * backend/ev-document-thumbnails.c:
+ (ev_document_thumbnails_get_thumbnail):
+ * backend/ev-document-thumbnails.h:
+ * backend/ev-document.c:
+ * backend/ev-document.h:
+ * backend/ev-ps-exporter.c: (ev_ps_exporter_do_page):
+ * backend/ev-ps-exporter.h:
+ * pdf/ev-poppler.cc:
+ * ps/ps-document.c: (ps_document_document_iface_init),
+ (ps_document_ps_export_do_page):
+ * shell/ev-jobs.c: (ev_job_thumbnail_new), (ev_job_thumbnail_run):
+ * shell/ev-jobs.h:
+ * shell/ev-page-cache.c: (ev_page_cache_get_size),
+ (ev_page_cache_get):
+ * shell/ev-page-cache.h:
+ * shell/ev-pixbuf-cache.c: (check_job_size_and_unref),
+ (add_job_if_needed), (ev_pixbuf_cache_add_jobs_if_needed),
+ (ev_pixbuf_cache_set_page_range), (new_selection_pixbuf_needed):
+ * shell/ev-pixbuf-cache.h:
+ * shell/ev-print-job.c: (idle_print_handler):
+ * shell/ev-sidebar-thumbnails.c: (add_range):
+ * shell/ev-view.c: (view_update_range_and_current_page),
+ (get_page_extents), (ev_view_size_request_dual_page),
+ (ev_view_size_request_single_page), (draw_one_page),
+ (clear_caches), (ev_view_set_orientation), (ev_view_rotate_right),
+ (ev_view_rotate_left), (ev_view_zoom_for_size_presentation),
+ (ev_view_zoom_for_size_dual_page),
+ (ev_view_zoom_for_size_single_page), (compute_new_selection_text),
+ (ev_view_select_all):
+ * thumbnailer/evince-thumbnailer.c: (evince_thumbnail_pngenc_get):
+ * tiff/tiff-document.c: (tiff_document_get_page_size),
+ (tiff_document_get_orientation), (rotate_pixbuf),
+ (tiff_document_render_pixbuf), (tiff_document_document_iface_init),
+ (tiff_document_thumbnails_get_thumbnail),
+ (tiff_document_ps_export_do_page), (tiff_document_init):
+
+ Really make use of the orientation bit of the render context.
+ Use the render context in a few more places in the backend API.
+ This regress orientation, but now it's done right. Will try to
+ fix it up asap...
+
2005-07-29 Marco Pesenti Gritti <mpg@redhat.com>
* shell/ev-view.c: (ensure_rectangle_is_visible):
GdkPixbuf *
ev_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
gint page,
+ EvOrientation orientation,
gint size,
gboolean border)
{
g_return_val_if_fail (EV_IS_DOCUMENT_THUMBNAILS (document), NULL);
iface = EV_DOCUMENT_THUMBNAILS_GET_IFACE (document);
- return iface->get_thumbnail (document, page, size, border);
+
+ return iface->get_thumbnail (document, page, orientation, size, border);
}
void
#include <gdk-pixbuf/gdk-pixbuf.h>
+#include "ev-render-context.h"
+
G_BEGIN_DECLS
#define EV_TYPE_DOCUMENT_THUMBNAILS (ev_document_thumbnails_get_type ())
/* Methods */
GdkPixbuf * (* get_thumbnail) (EvDocumentThumbnails *document,
gint page,
+ EvOrientation orientation,
gint size,
gboolean border);
void (* get_dimensions) (EvDocumentThumbnails *document,
GdkPixbuf *ev_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
gint page,
+ EvOrientation orientation,
gint size,
gboolean border);
void ev_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
return iface->get_orientation (document);
}
-void
-ev_document_set_orientation (EvDocument *document,
- EvOrientation orientation)
-{
- EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
-
- iface->set_orientation (document, orientation);
-}
-
void
ev_document_info_free (EvDocumentInfo *info)
{
}
void
-ev_ps_exporter_do_page (EvPSExporter *exporter, int page)
+ev_ps_exporter_do_page (EvPSExporter *exporter, EvRenderContext *rc)
{
EvPSExporterIface *iface = EV_PS_EXPORTER_GET_IFACE (exporter);
- iface->do_page (exporter, page);
+ iface->do_page (exporter, rc);
}
void
#include <glib-object.h>
+#include "ev-render-context.h"
+
G_BEGIN_DECLS
#define EV_TYPE_PS_EXPORTER (ev_ps_exporter_get_type ())
GTypeInterface base_iface;
/* Methods */
- void (* begin) (EvPSExporter *exporter,
- const char *filename,
- int first_page,
- int last_page,
- double paper_width,
- double paper_height,
- gboolean duplex);
- void (* do_page) (EvPSExporter *exporter,
- int page);
- void (* end) (EvPSExporter *exporter);
+ void (* begin) (EvPSExporter *exporter,
+ const char *filename,
+ int first_page,
+ int last_page,
+ double paper_width,
+ double paper_height,
+ gboolean duplex);
+ void (* do_page) (EvPSExporter *exporter,
+ EvRenderContext *rc);
+ void (* end) (EvPSExporter *exporter);
};
GType ev_ps_exporter_get_type (void);
int first_page, int last_page,
double paper_width, double paper_height,
gboolean duplex);
-void ev_ps_exporter_do_page (EvPSExporter *exporter, int page);
+void ev_ps_exporter_do_page (EvPSExporter *exporter, EvRenderContext *rc);
void ev_ps_exporter_end (EvPSExporter *exporter);
G_END_DECLS
PopplerPSFile *ps_file;
gchar *password;
- PopplerOrientation orientation;
- gboolean orientation_set;
-
PopplerFontInfo *font_info;
PopplerFontsIter *fonts_iter;
int fonts_scanned_pages;
/* FIXME This should not be necessary, poppler should rember it */
static void
-set_page_orientation (PdfDocument *pdf_document, PopplerPage *page)
+set_page_orientation (PdfDocument *pdf_document, PopplerPage *page, EvOrientation orientation)
{
- if (pdf_document->orientation_set) {
- poppler_page_set_orientation (page, pdf_document->orientation);
+ PopplerOrientation poppler_orientation;
+
+ switch (orientation) {
+ case EV_ORIENTATION_PORTRAIT:
+ poppler_orientation = POPPLER_ORIENTATION_PORTRAIT;
+ break;
+ case EV_ORIENTATION_LANDSCAPE:
+ poppler_orientation = POPPLER_ORIENTATION_LANDSCAPE;
+ break;
+ case EV_ORIENTATION_UPSIDEDOWN:
+ poppler_orientation = POPPLER_ORIENTATION_UPSIDEDOWN;
+ break;
+ case EV_ORIENTATION_SEASCAPE:
+ poppler_orientation = POPPLER_ORIENTATION_SEASCAPE;
+ break;
+ default:
+ g_assert_not_reached ();
}
+
+ poppler_page_set_orientation (page, poppler_orientation);
}
static void
PopplerPage *poppler_page;
poppler_page = poppler_document_get_page (pdf_document->document, page);
- set_page_orientation (pdf_document, poppler_page);
poppler_page_get_size (poppler_page, width, height);
g_object_unref (poppler_page);
}
pdf_document = PDF_DOCUMENT (document);
poppler_page = poppler_document_get_page (pdf_document->document,
rc->page);
- set_page_orientation (pdf_document, poppler_page);
+ set_page_orientation (pdf_document, poppler_page, rc->orientation);
poppler_page_get_size (poppler_page, &width_points, &height_points);
width = (int) ((width_points * rc->scale) + 0.5);
char *text;
poppler_page = poppler_document_get_page (pdf_document->document, page);
- set_page_orientation (pdf_document, poppler_page);
g_return_val_if_fail (poppler_page != NULL, NULL);
poppler_page_get_size (poppler_page, NULL, &height);
EvOrientation result;
PdfDocument *pdf_document = PDF_DOCUMENT (document);
- if (!pdf_document->orientation_set) {
- pdf_document->orientation = get_document_orientation (pdf_document);
- }
-
- switch (pdf_document->orientation) {
+ switch (get_document_orientation (pdf_document)) {
case POPPLER_ORIENTATION_PORTRAIT:
result = EV_ORIENTATION_PORTRAIT;
break;
return result;
}
-static void
-pdf_document_set_orientation (EvDocument *document, EvOrientation orientation)
-{
- PdfDocument *pdf_document = PDF_DOCUMENT (document);
- PopplerOrientation poppler_orientation;
-
- switch (orientation) {
- case EV_ORIENTATION_PORTRAIT:
- poppler_orientation = POPPLER_ORIENTATION_PORTRAIT;
- break;
- case EV_ORIENTATION_LANDSCAPE:
- poppler_orientation = POPPLER_ORIENTATION_LANDSCAPE;
- break;
- case EV_ORIENTATION_UPSIDEDOWN:
- poppler_orientation = POPPLER_ORIENTATION_UPSIDEDOWN;
- break;
- case EV_ORIENTATION_SEASCAPE:
- poppler_orientation = POPPLER_ORIENTATION_SEASCAPE;
- break;
- default:
- g_assert_not_reached ();
- }
-
- pdf_document->orientation = poppler_orientation;
- pdf_document->orientation_set = TRUE;
-}
-
static void
pdf_document_document_iface_init (EvDocumentIface *iface)
{
iface->get_text = pdf_document_get_text;
iface->can_get_text = pdf_document_can_get_text;
iface->get_info = pdf_document_get_info;
- iface->set_orientation = pdf_document_set_orientation;
iface->get_orientation = pdf_document_get_orientation;
};
}
static GdkPixbuf *
-make_thumbnail_for_size (PdfDocument *pdf_document,
- gint page,
- gint size,
- gboolean border)
+make_thumbnail_for_size (PdfDocument *pdf_document,
+ gint page,
+ EvOrientation orientation,
+ gint size,
+ gboolean border)
{
PopplerPage *poppler_page;
GdkPixbuf *pixbuf, *sub_pixbuf;
gdouble unscaled_width, unscaled_height;
poppler_page = poppler_document_get_page (pdf_document->document, page);
- set_page_orientation (pdf_document, poppler_page);
+ set_page_orientation (pdf_document, poppler_page, orientation);
g_return_val_if_fail (poppler_page != NULL, NULL);
- pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page, size, &width, &height);
+ pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page,
+ size, &width, &height);
poppler_page_get_size (poppler_page, &unscaled_width, &unscaled_height);
scale = width / unscaled_width;
static GdkPixbuf *
pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
gint page,
+ EvOrientation orientation,
gint size,
gboolean border)
{
pdf_document = PDF_DOCUMENT (document_thumbnails);
poppler_page = poppler_document_get_page (pdf_document->document, page);
- set_page_orientation (pdf_document, poppler_page);
+ set_page_orientation (pdf_document, poppler_page, orientation);
g_return_val_if_fail (poppler_page != NULL, NULL);
pixbuf = poppler_page_get_thumbnail (poppler_page);
}
} else {
/* There is no provided thumbnail. We need to make one. */
- pixbuf = make_thumbnail_for_size (pdf_document, page, size, border);
+ pixbuf = make_thumbnail_for_size (pdf_document, page, orientation, size, border);
}
g_object_unref (poppler_page);
pdf_document = PDF_DOCUMENT (document_thumbnails);
poppler_page = poppler_document_get_page (pdf_document->document, page);
- set_page_orientation (pdf_document, poppler_page);
g_return_if_fail (width != NULL);
g_return_if_fail (height != NULL);
page = poppler_document_get_page (search->document->document,
search->search_page);
- set_page_orientation (pdf_document, page);
ev_document_doc_mutex_lock ();
matches = poppler_page_find_text (page, search->text);
return FALSE;
poppler_page = poppler_document_get_page (pdf_document->document, page);
- set_page_orientation (pdf_document, poppler_page);
poppler_page_get_size (poppler_page, NULL, &height);
rectangle->x1 = r->x1;
rectangle->y1 = height - r->y2;
}
static void
-pdf_document_ps_exporter_do_page (EvPSExporter *exporter, int page)
+pdf_document_ps_exporter_do_page (EvPSExporter *exporter, EvRenderContext *rc)
{
PdfDocument *pdf_document = PDF_DOCUMENT (exporter);
PopplerPage *poppler_page;
g_return_if_fail (pdf_document->ps_file != NULL);
- poppler_page = poppler_document_get_page (pdf_document->document, page);
- set_page_orientation (pdf_document, poppler_page);
+ poppler_page = poppler_document_get_page (pdf_document->document, rc->page);
+ set_page_orientation (pdf_document, poppler_page, rc->orientation);
poppler_page_render_to_ps (poppler_page, pdf_document->ps_file);
g_object_unref (poppler_page);
}
pdf_document = PDF_DOCUMENT (selection);
poppler_page = poppler_document_get_page (pdf_document->document,
rc->page);
- set_page_orientation (pdf_document, poppler_page);
+ set_page_orientation (pdf_document, poppler_page, rc->orientation);
poppler_page_get_size (poppler_page, &width_points, &height_points);
width = (int) ((width_points * rc->scale) + 0.5);
pdf_document = PDF_DOCUMENT (selection);
poppler_page = poppler_document_get_page (pdf_document->document,
rc->page);
- set_page_orientation (pdf_document, poppler_page);
+ set_page_orientation (pdf_document, poppler_page, rc->orientation);
retval = poppler_page_get_selection_region (poppler_page, rc->scale, (PopplerRectangle *) points);
g_object_unref (poppler_page);
pdf_document = PDF_DOCUMENT (selection);
poppler_page = poppler_document_get_page (pdf_document->document,
rc->page);
- set_page_orientation (pdf_document, poppler_page);
+ set_page_orientation (pdf_document, poppler_page, rc->orientation);
points.x1 = 0.0;
points.y1 = 0.0;
return orientation;
}
-static void
-ps_document_set_orientation (EvDocument *document, EvOrientation orientation)
-{
- PSDocument *ps = PS_DOCUMENT (document);
-
- g_return_if_fail (ps != NULL);
-
- switch (orientation) {
- case EV_ORIENTATION_PORTRAIT:
- ps->orientation = GTK_GS_ORIENTATION_PORTRAIT;
- break;
- case EV_ORIENTATION_LANDSCAPE:
- ps->orientation = GTK_GS_ORIENTATION_LANDSCAPE;
- break;
- case EV_ORIENTATION_UPSIDEDOWN:
- ps->orientation = GTK_GS_ORIENTATION_UPSIDEDOWN;
- break;
- case EV_ORIENTATION_SEASCAPE:
- ps->orientation = GTK_GS_ORIENTATION_SEASCAPE;
- break;
- }
-}
-
static void
ps_document_document_iface_init (EvDocumentIface *iface)
{
iface->get_n_pages = ps_document_get_n_pages;
iface->get_page_size = ps_document_get_page_size;
iface->get_info = ps_document_get_info;
- iface->set_orientation = ps_document_set_orientation;
iface->get_orientation = ps_document_get_orientation;
}
}
static void
-ps_document_ps_export_do_page (EvPSExporter *exporter, int page)
+ps_document_ps_export_do_page (EvPSExporter *exporter, EvRenderContext *rc)
{
PSDocument *document = PS_DOCUMENT (exporter);
- document->ps_export_pagelist[page] = 1;
+ document->ps_export_pagelist[rc->page] = 1;
}
static void
}
EvJob *
-ev_job_thumbnail_new (EvDocument *document,
- gint page,
- gint requested_width)
+ev_job_thumbnail_new (EvDocument *document,
+ gint page,
+ EvOrientation orientation,
+ gint requested_width)
{
EvJobThumbnail *job;
EV_JOB (job)->document = g_object_ref (document);
job->page = page;
+ job->orientation = orientation;
job->requested_width = requested_width;
return EV_JOB (job);
job->thumbnail =
ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB (job)->document),
job->page,
+ job->orientation,
job->requested_width,
TRUE);
EV_JOB (job)->finished = TRUE;
EvJob parent;
gint page;
+ EvOrientation orientation;
gint requested_width;
GdkPixbuf *thumbnail;
};
GType ev_job_thumbnail_get_type (void);
EvJob *ev_job_thumbnail_new (EvDocument *document,
gint page,
+ EvOrientation orientation,
gint requested_width);
void ev_job_thumbnail_run (EvJobThumbnail *thumbnail);
}
void
-ev_page_cache_get_size (EvPageCache *page_cache,
- gint page,
- gfloat scale,
- gint *width,
- gint *height)
+ev_page_cache_get_size (EvPageCache *page_cache,
+ gint page,
+ EvOrientation orientation,
+ gfloat scale,
+ gint *width,
+ gint *height)
{
g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
g_return_if_fail (page >= 0 && page < page_cache->n_pages);
return page_cache;
}
-
-void
-ev_page_cache_clear (EvDocument *document)
-{
- g_return_if_fail (EV_IS_DOCUMENT (document));
-
- g_object_set_data (G_OBJECT (document), PAGE_CACHE_STRING, NULL);
-}
GType ev_page_cache_get_type (void) G_GNUC_CONST;
/* Used by ev-document.c only */
-EvPageCache *ev_page_cache_new (EvDocument *document);
-gint ev_page_cache_get_n_pages (EvPageCache *page_cache);
-const char *ev_page_cache_get_title (EvPageCache *page_cache);
-void ev_page_cache_get_size (EvPageCache *page_cache,
- gint page,
- gfloat scale,
- gint *width,
- gint *height);
-void ev_page_cache_get_max_width (EvPageCache *page_cache,
- gfloat scale,
- gint *width);
-void ev_page_cache_get_max_height (EvPageCache *page_cache,
- gfloat scale,
- gint *height);
-void ev_page_cache_get_height_to_page (EvPageCache *page_cache,
- gint page,
- gfloat scale,
- gint *height,
- gint *dual_height);
-gint ev_page_cache_get_max_label_chars (EvPageCache *page_cache);
-char *ev_page_cache_get_page_label (EvPageCache *page_cache,
- gint page);
+EvPageCache *ev_page_cache_new (EvDocument *document);
+gint ev_page_cache_get_n_pages (EvPageCache *page_cache);
+const char *ev_page_cache_get_title (EvPageCache *page_cache);
+void ev_page_cache_get_size (EvPageCache *page_cache,
+ gint page,
+ EvOrientation orientation,
+ gfloat scale,
+ gint *width,
+ gint *height);
+void ev_page_cache_get_max_width (EvPageCache *page_cache,
+ gfloat scale,
+ gint *width);
+void ev_page_cache_get_max_height (EvPageCache *page_cache,
+ gfloat scale,
+ gint *height);
+void ev_page_cache_get_height_to_page (EvPageCache *page_cache,
+ gint page,
+ gfloat scale,
+ gint *height,
+ gint *dual_height);
+gint ev_page_cache_get_max_label_chars (EvPageCache *page_cache);
+char *ev_page_cache_get_page_label (EvPageCache *page_cache,
+ gint page);
gboolean ev_page_cache_has_nonnumeric_page_labels (EvPageCache *page_cache);
const EvDocumentInfo *ev_page_cache_get_info (EvPageCache *page_cache);
gboolean ev_page_cache_prev_page (EvPageCache *page_cache);
EvPageCache *ev_page_cache_get (EvDocument *document);
-void ev_page_cache_clear (EvDocument *document);
G_END_DECLS
ev_page_cache_get_size (page_cache,
EV_JOB_RENDER (job_info->job)->rc->page,
+ EV_JOB_RENDER (job_info->job)->rc->orientation,
scale,
&width, &height);
CacheJobInfo *job_info,
EvPageCache *page_cache,
gint page,
+ EvOrientation orientation,
gfloat scale,
EvJobPriority priority)
{
if (job_info->job)
return;
- ev_page_cache_get_size (page_cache,
- page, scale,
- &width, &height);
+ ev_page_cache_get_size (page_cache, page, orientation,
+ scale, &width, &height);
if (job_info->pixbuf &&
gdk_pixbuf_get_width (job_info->pixbuf) == width &&
/* make a new job now */
if (job_info->rc == NULL) {
- job_info->rc = ev_render_context_new (EV_ORIENTATION_PORTRAIT,
- page, scale);
+ job_info->rc = ev_render_context_new (orientation, page, scale);
} else {
ev_render_context_set_page (job_info->rc, page);
ev_render_context_set_scale (job_info->rc, scale);
+ ev_render_context_set_orientation (job_info->rc, orientation);
}
/* Figure out what else we need for this job */
static void
ev_pixbuf_cache_add_jobs_if_needed (EvPixbufCache *pixbuf_cache,
+ EvOrientation orientation,
gfloat scale)
{
EvPageCache *page_cache;
page = pixbuf_cache->start_page + i;
add_job_if_needed (pixbuf_cache, job_info,
- page_cache, page, scale,
+ page_cache, page, orientation, scale,
EV_JOB_PRIORITY_HIGH);
}
page = pixbuf_cache->start_page - pixbuf_cache->preload_cache_size + i;
add_job_if_needed (pixbuf_cache, job_info,
- page_cache, page, scale,
+ page_cache, page, orientation, scale,
EV_JOB_PRIORITY_LOW);
}
page = pixbuf_cache->end_page + 1 + i;
add_job_if_needed (pixbuf_cache, job_info,
- page_cache, page, scale,
+ page_cache, page, orientation, scale,
EV_JOB_PRIORITY_LOW);
}
ev_pixbuf_cache_set_page_range (EvPixbufCache *pixbuf_cache,
gint start_page,
gint end_page,
+ EvOrientation orientation,
gfloat scale,
GList *selection_list)
{
/* Finally, we add the new jobs for all the sizes that don't have a
* pixbuf */
- ev_pixbuf_cache_add_jobs_if_needed (pixbuf_cache, scale);
+ ev_pixbuf_cache_add_jobs_if_needed (pixbuf_cache, orientation, scale);
}
GdkPixbuf *
if (job_info->selection) {
page_cache = ev_page_cache_get (pixbuf_cache->document);
- ev_page_cache_get_size (page_cache, page, scale,
- &width, &height);
+ ev_page_cache_get_size (page_cache, page, job_info->rc->orientation,
+ scale, &width, &height);
if (width != gdk_pixbuf_get_width (job_info->selection) ||
height != gdk_pixbuf_get_height (job_info->selection))
void ev_pixbuf_cache_set_page_range (EvPixbufCache *pixbuf_cache,
gint start_page,
gint end_page,
+ EvOrientation orientation,
gfloat scale,
GList *selection_list);
GdkPixbuf *ev_pixbuf_cache_get_pixbuf (EvPixbufCache *pixbuf_cache,
}
if (job->next_page <= job->last_page) {
+ EvRenderContext *rc;
#if 0
g_printerr ("Printing page %d\n", job->next_page);
#endif
+ rc = ev_render_context_new (EV_ORIENTATION_PORTRAIT,
+ job->next_page, 1.0);
+
ev_document_doc_mutex_lock ();
- ev_ps_exporter_do_page (EV_PS_EXPORTER (job->document),
- job->next_page);
+ ev_ps_exporter_do_page (EV_PS_EXPORTER (job->document), rc);
ev_document_doc_mutex_unlock ();
+
+ g_object_unref (rc);
+
job->next_page++;
return TRUE;
} else { /* no more pages */
-1);
if (job == NULL && !thumbnail_set) {
- job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, THUMBNAIL_WIDTH);
+ job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, THUMBNAIL_WIDTH,
+ EV_ORIENTATION_PORTRAIT);
ev_job_queue_add_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH);
g_object_set_data_full (G_OBJECT (job), "tree_iter",
gtk_tree_iter_copy (&iter),
int find_result;
int spacing;
+ EvOrientation orientation;
double scale;
gboolean continuous;
ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
view->start_page,
view->end_page,
+ view->orientation,
view->scale,
view->selection_info.selections);
}
/* Get the size of the page */
ev_page_cache_get_size (view->page_cache, page,
+ view->orientation,
view->scale,
&width, &height);
compute_border (view, width, height, border);
if (other_page < ev_page_cache_get_n_pages (view->page_cache)) {
ev_page_cache_get_size (view->page_cache,
other_page,
+ view->orientation,
view->scale,
&width_2, &height_2);
if (width_2 > width)
/* Find the largest of the two. */
ev_page_cache_get_size (view->page_cache,
view->current_page,
+ view->orientation,
view->scale,
&width, &height);
if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache)) {
gint width_2, height_2;
ev_page_cache_get_size (view->page_cache,
view->current_page + 1,
+ view->orientation,
view->scale,
&width_2, &height_2);
if (width_2 > width) {
ev_page_cache_get_size (view->page_cache,
view->current_page,
+ view->orientation,
view->scale,
&width, &height);
compute_border (view, width, height, &border);
selection = find_selection_for_page (view, page);
ev_page_cache_get_size (view->page_cache,
- page, view->scale,
+ page, view->orientation,
+ view->scale,
&width, &height);
/* Render the document itself */
real_page_area = *page_area;
view->pixbuf_cache = NULL;
}
- if (view->document) {
- ev_page_cache_clear (view->document);
+ if (view->page_cache) {
+ g_object_unref (view->page_cache);
+ view->page_cache = NULL;
}
}
ev_view_set_orientation (EvView *view,
EvOrientation orientation)
{
- ev_document_set_orientation (view->document, orientation);
-
- clear_caches (view);
- setup_caches (view);
+ view->orientation = orientation;
gtk_widget_queue_resize (GTK_WIDGET (view));
}
void
ev_view_rotate_right (EvView *view)
{
- EvOrientation orientation, new_orientation;
+ EvOrientation orientation;
- orientation = ev_document_get_orientation (view->document);
- if (orientation == EV_ORIENTATION_PORTRAIT) {
- new_orientation = EV_ORIENTATION_LANDSCAPE;
- } else if (orientation == EV_ORIENTATION_LANDSCAPE) {
- new_orientation = EV_ORIENTATION_UPSIDEDOWN;
- } else if (orientation == EV_ORIENTATION_UPSIDEDOWN) {
- new_orientation = EV_ORIENTATION_SEASCAPE;
+ if (view->orientation == EV_ORIENTATION_PORTRAIT) {
+ orientation = EV_ORIENTATION_LANDSCAPE;
+ } else if (view->orientation == EV_ORIENTATION_LANDSCAPE) {
+ orientation = EV_ORIENTATION_UPSIDEDOWN;
+ } else if (view->orientation == EV_ORIENTATION_UPSIDEDOWN) {
+ orientation = EV_ORIENTATION_SEASCAPE;
} else {
- new_orientation = EV_ORIENTATION_PORTRAIT;
+ orientation = EV_ORIENTATION_PORTRAIT;
}
- ev_view_set_orientation (view, new_orientation);
+
+ ev_view_set_orientation (view, orientation);
}
void
ev_view_rotate_left (EvView *view)
{
- EvOrientation orientation, new_orientation;
+ EvOrientation orientation;
- orientation = ev_document_get_orientation (view->document);
- if (orientation == EV_ORIENTATION_PORTRAIT) {
- new_orientation = EV_ORIENTATION_SEASCAPE;
- } else if (orientation == EV_ORIENTATION_SEASCAPE) {
- new_orientation = EV_ORIENTATION_UPSIDEDOWN;
- } else if (orientation == EV_ORIENTATION_UPSIDEDOWN) {
- new_orientation = EV_ORIENTATION_LANDSCAPE;
+ if (view->orientation == EV_ORIENTATION_PORTRAIT) {
+ orientation = EV_ORIENTATION_SEASCAPE;
+ } else if (view->orientation == EV_ORIENTATION_SEASCAPE) {
+ orientation = EV_ORIENTATION_UPSIDEDOWN;
+ } else if (view->orientation == EV_ORIENTATION_UPSIDEDOWN) {
+ orientation = EV_ORIENTATION_LANDSCAPE;
} else {
- new_orientation = EV_ORIENTATION_PORTRAIT;
+ orientation = EV_ORIENTATION_PORTRAIT;
}
- ev_view_set_orientation (view, new_orientation);
+
+ ev_view_set_orientation (view, orientation);
}
static double
ev_page_cache_get_size (view->page_cache,
view->current_page,
+ view->orientation,
1.0,
&doc_width,
&doc_height);
/* Find the largest of the two. */
ev_page_cache_get_size (view->page_cache,
view->current_page,
+ view->orientation,
1.0,
&doc_width, &doc_height);
gint width_2, height_2;
ev_page_cache_get_size (view->page_cache,
other_page,
+ view->orientation,
1.0,
&width_2, &height_2);
if (width_2 > doc_width)
ev_page_cache_get_size (view->page_cache,
view->current_page,
+ view->orientation,
1.0,
&doc_width,
&doc_height);
GdkPoint *point;
ev_page_cache_get_size (view->page_cache, i,
+ view->orientation,
1.0, &width, &height);
selection = g_new0 (EvViewSelection, 1);
EvViewSelection *selection;
ev_page_cache_get_size (view->page_cache,
+ view->orientation,
i, 1.0, &width, &height);
selection = g_new0 (EvViewSelection, 1);
}
pixbuf = ev_document_thumbnails_get_thumbnail
- (EV_DOCUMENT_THUMBNAILS (document), 0, size, FALSE);
+ (EV_DOCUMENT_THUMBNAILS (document), 0,
+ EV_ORIENTATION_PORTRAIT, size, FALSE);
if (pixbuf != NULL) {
const char *overlaid_icon_name = NULL;
TIFF *tiff;
gint n_pages;
- EvOrientation orientation;
TIFF2PSContext *ps_export_ctx;
};
TIFFGetField (tiff_document->tiff, TIFFTAG_YRESOLUTION, &y_res);
h = h * (x_res / y_res);
- if (tiff_document->orientation == EV_ORIENTATION_PORTRAIT ||
- tiff_document->orientation == EV_ORIENTATION_UPSIDEDOWN) {
- *width = w;
- *height = h;
- } else {
- *width = h;
- *height = w;
- }
+ *width = w;
+ *height = h;
+
pop_handlers ();
}
static EvOrientation
tiff_document_get_orientation (EvDocument *document)
{
- TiffDocument *tiff_document = TIFF_DOCUMENT (document);
-
- return tiff_document->orientation;
-}
-
-static void
-tiff_document_set_orientation (EvDocument *document,
- EvOrientation orientation)
-{
- TiffDocument *tiff_document = TIFF_DOCUMENT (document);
-
- tiff_document->orientation = orientation;
+ return EV_ORIENTATION_PORTRAIT;
}
static GdkPixbuf *
-rotate_pixbuf (EvDocument *document, GdkPixbuf *pixbuf)
+rotate_pixbuf (EvDocument *document, EvOrientation orientation, GdkPixbuf *pixbuf)
{
TiffDocument *tiff_document = TIFF_DOCUMENT (document);
- switch (tiff_document->orientation)
+ switch (orientation)
{
case EV_ORIENTATION_LANDSCAPE:
return gdk_pixbuf_rotate_simple (pixbuf, 90);
GDK_INTERP_BILINEAR);
g_object_unref (pixbuf);
- rotated_pixbuf = rotate_pixbuf (document, scaled_pixbuf);
+ rotated_pixbuf = rotate_pixbuf (document, rc->orientation, scaled_pixbuf);
g_object_unref (scaled_pixbuf);
return rotated_pixbuf;
iface->render_pixbuf = tiff_document_render_pixbuf;
iface->get_info = tiff_document_get_info;
iface->get_orientation = tiff_document_get_orientation;
- iface->set_orientation = tiff_document_set_orientation;
}
static GdkPixbuf *
tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
gint page,
+ EvOrientation orientation,
gint size,
gboolean border)
{
}
static void
-tiff_document_ps_export_do_page (EvPSExporter *exporter, int page)
+tiff_document_ps_export_do_page (EvPSExporter *exporter, EvRenderContext *rc)
{
TiffDocument *document = TIFF_DOCUMENT (exporter);
if (document->ps_export_ctx == NULL)
return;
- if (TIFFSetDirectory (document->tiff, page) != 1)
+ if (TIFFSetDirectory (document->tiff, rc->page) != 1)
return;
tiff2ps_process_page (document->ps_export_ctx, document->tiff,
0, 0, 0, 0, 0);
tiff_document_init (TiffDocument *tiff_document)
{
tiff_document->n_pages = -1;
- tiff_document->orientation = EV_ORIENTATION_PORTRAIT;
}
https://www.fi.muni.cz/~kas/git / evince.git / commitdiff