From 41229e9ef5135c93176acb6320f96abc7d624b0a Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 29 Jul 2005 16:02:28 +0000 Subject: Use rotation rather than orientation. It's easier and enough for our 2005-07-29 Marco Pesenti Gritti * 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-render-context.c: (ev_render_context_new), (ev_render_context_set_rotation): * backend/ev-render-context.h: * pdf/ev-poppler.cc: * ps/ps-document.c: (ps_document_document_iface_init): * shell/ev-jobs.c: (ev_job_thumbnail_new), (ev_job_thumbnail_run): * shell/ev-jobs.h: * shell/ev-page-cache.c: (build_height_to_page), (ev_page_cache_new), (ev_page_cache_get_size), (ev_page_cache_get_max_width), (ev_page_cache_get_max_height), (ev_page_cache_get_height_to_page): * 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), (ev_pixbuf_cache_get_selection_pixbuf): * 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_y_offset), (get_page_extents), (ev_view_size_request_continuous_dual_page), (ev_view_size_request_continuous), (ev_view_size_request_dual_page), (ev_view_size_request_single_page), (draw_one_page), (ev_view_set_rotation), (ev_view_rotate_right), (ev_view_rotate_left), (ev_view_zoom_for_size_presentation), (ev_view_zoom_for_size_continuous_and_dual_page), (ev_view_zoom_for_size_continuous), (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_render_pixbuf), (tiff_document_document_iface_init), (tiff_document_thumbnails_get_thumbnail): Use rotation rather than orientation. It's easier and enough for our needs. --- (limited to 'backend') diff --git a/backend/ev-document-thumbnails.c b/backend/ev-document-thumbnails.c index 9bf1695..f537afd 100644 --- a/backend/ev-document-thumbnails.c +++ b/backend/ev-document-thumbnails.c @@ -47,7 +47,7 @@ ev_document_thumbnails_get_type (void) GdkPixbuf * ev_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, gint page, - EvOrientation orientation, + int rotation, gint size, gboolean border) { @@ -57,7 +57,7 @@ ev_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, iface = EV_DOCUMENT_THUMBNAILS_GET_IFACE (document); - return iface->get_thumbnail (document, page, orientation, size, border); + return iface->get_thumbnail (document, page, rotation, size, border); } void diff --git a/backend/ev-document-thumbnails.h b/backend/ev-document-thumbnails.h index ea77629..6e15a32 100644 --- a/backend/ev-document-thumbnails.h +++ b/backend/ev-document-thumbnails.h @@ -44,7 +44,7 @@ struct _EvDocumentThumbnailsIface /* Methods */ GdkPixbuf * (* get_thumbnail) (EvDocumentThumbnails *document, gint page, - EvOrientation orientation, + gint rotation, gint size, gboolean border); void (* get_dimensions) (EvDocumentThumbnails *document, @@ -63,7 +63,7 @@ GType ev_document_thumbnails_get_type (void); GdkPixbuf *ev_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, gint page, - EvOrientation orientation, + gint rotation, gint size, gboolean border); void ev_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, diff --git a/backend/ev-document.c b/backend/ev-document.c index 2778f77..a800866 100644 --- a/backend/ev-document.c +++ b/backend/ev-document.c @@ -217,14 +217,6 @@ ev_document_render_pixbuf (EvDocument *document, return retval; } -EvOrientation -ev_document_get_orientation (EvDocument *document) -{ - EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); - - return iface->get_orientation (document); -} - void ev_document_info_free (EvDocumentInfo *info) { diff --git a/backend/ev-document.h b/backend/ev-document.h index b4668e7..2629a47 100644 --- a/backend/ev-document.h +++ b/backend/ev-document.h @@ -89,7 +89,6 @@ struct _EvDocumentIface int page); GdkPixbuf * (* render_pixbuf) (EvDocument *document, EvRenderContext *rc); - EvOrientation (* get_orientation) (EvDocument *document); EvDocumentInfo * (* get_info) (EvDocument *document); }; @@ -121,10 +120,6 @@ GList *ev_document_get_links (EvDocument *document, int page); GdkPixbuf *ev_document_render_pixbuf (EvDocument *document, EvRenderContext *rc); -EvOrientation ev_document_get_orientation (EvDocument *document); -void ev_document_set_orientation (EvDocument *document, - EvOrientation orientation); - gint ev_rect_cmp (EvRectangle *a, EvRectangle *b); diff --git a/backend/ev-render-context.c b/backend/ev-render-context.c index 2d09d44..a3969ad 100644 --- a/backend/ev-render-context.c +++ b/backend/ev-render-context.c @@ -35,7 +35,7 @@ ev_render_context_class_init (EvRenderContextClass *class) EvRenderContext * -ev_render_context_new (EvOrientation orientation, +ev_render_context_new (int rotation, gint page, gdouble scale) { @@ -43,7 +43,7 @@ ev_render_context_new (EvOrientation orientation, rc = (EvRenderContext *) g_object_new (EV_TYPE_RENDER_CONTEXT, NULL); - rc->orientation = orientation; + rc->rotation = rotation; rc->page = page; rc->scale = scale; @@ -60,12 +60,12 @@ ev_render_context_set_page (EvRenderContext *rc, } void -ev_render_context_set_orientation (EvRenderContext *rc, - EvOrientation orientation) +ev_render_context_set_rotation (EvRenderContext *rc, + int rotation) { g_return_if_fail (rc != NULL); - rc->orientation = orientation; + rc->rotation = rotation; } void diff --git a/backend/ev-render-context.h b/backend/ev-render-context.h index 7bd73d6..636f02f 100644 --- a/backend/ev-render-context.h +++ b/backend/ev-render-context.h @@ -32,15 +32,6 @@ typedef struct _EvRenderContextClass EvRenderContextClass; #define EV_RENDER_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_RENDER_CONTEXT, EvRenderContext)) #define EV_IS_RENDER_CONTEXT(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_RENDER_CONTEXT)) -typedef enum -{ - EV_ORIENTATION_PORTRAIT, - EV_ORIENTATION_LANDSCAPE, - EV_ORIENTATION_UPSIDEDOWN, - EV_ORIENTATION_SEASCAPE -} EvOrientation; - - struct _EvRenderContextClass { GObjectClass klass; @@ -49,7 +40,7 @@ struct _EvRenderContextClass struct _EvRenderContext { GObject parent; - EvOrientation orientation; + int rotation; gint page; gdouble scale; @@ -59,13 +50,13 @@ struct _EvRenderContext GType ev_render_context_get_type (void) G_GNUC_CONST; -EvRenderContext *ev_render_context_new (EvOrientation orientation, +EvRenderContext *ev_render_context_new (int rotation, gint page, gdouble scale); void ev_render_context_set_page (EvRenderContext *rc, gint page); -void ev_render_context_set_orientation (EvRenderContext *rc, - EvOrientation orientation); +void ev_render_context_set_rotation (EvRenderContext *rc, + int rotation); void ev_render_context_set_scale (EvRenderContext *rc, gdouble scale); -- cgit v0.9.1