X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-page-cache.c;h=eb88ed9d607880b346382bc6378e848a1d40c5ae;hb=55c3c48147392c17582340cf20f6e1a35e1c015a;hp=1b0f8e4604adc130f952c3e5f94b8ef8fed3ba42;hpb=646b17b09453da438218e6b86a2b8b830e5b73c0;p=evince.git

diff --git a/shell/ev-page-cache.c b/shell/ev-page-cache.c
index 1b0f8e46..eb88ed9d 100644
--- a/shell/ev-page-cache.c
+++ b/shell/ev-page-cache.c
@@ -33,7 +33,7 @@ struct _EvPageCache
 	double* height_to_page;
 	double* dual_height_to_page;
 
-	EvOrientation orientation;
+	int rotation;
 
 	EvPageCacheInfo *size_cache;
 	EvDocumentInfo *page_info;
@@ -111,8 +111,8 @@ build_height_to_page (EvPageCache *page_cache)
 	double uniform_height, page_height, next_page_height;
 	double saved_height;
 
-	swap = (page_cache->orientation == EV_ORIENTATION_LANDSCAPE ||
-		page_cache->orientation == EV_ORIENTATION_SEASCAPE);
+	swap = (page_cache->rotation == 90 ||
+		page_cache->rotation == 270);
 
 	g_free (page_cache->height_to_page);
 	g_free (page_cache->dual_height_to_page);
@@ -130,7 +130,7 @@ build_height_to_page (EvPageCache *page_cache)
 			}
 			page_cache->height_to_page [i] = (i + 1) * uniform_height;
 		} else {
-			if (swap) {
+			if (!swap) {
 				page_height = page_cache->size_cache [i].height;
 			} else {
 				page_height = page_cache->size_cache [i].width;
@@ -186,7 +186,6 @@ ev_page_cache_new (EvDocument *document)
 	/* Assume all pages are the same size until proven otherwise */
 	page_cache->uniform = TRUE;
 	page_cache->has_labels = FALSE;
-	page_cache->orientation = ev_document_get_orientation (document);
 	page_cache->n_pages = ev_document_get_n_pages (document);
 	page_cache->page_labels = g_new0 (char *, page_cache->n_pages);
 	page_cache->max_width = 0;
@@ -262,7 +261,7 @@ ev_page_cache_new (EvDocument *document)
 	/* make some sanity check assertions */
 	if (! page_cache->uniform)
 		g_assert (page_cache->size_cache != NULL);
-	if (page_cache->uniform)
+	if (page_cache->uniform && page_cache->n_pages > 0)
 		g_assert (page_cache->uniform_width > 0 && page_cache->uniform_height > 0);
 
 	ev_document_doc_mutex_unlock ();
@@ -363,55 +362,50 @@ ev_page_cache_get_title (EvPageCache *page_cache)
 void
 ev_page_cache_get_size (EvPageCache  *page_cache,
 			gint          page,
-			EvOrientation orientation,
+			gint          rotation,
 			gfloat        scale,
 			gint         *width,
 			gint         *height)
 {
+	int w, h;
+
 	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
 	g_return_if_fail (page >= 0 && page < page_cache->n_pages);
 
 	if (page_cache->uniform) {
-		if (width)
-			*width = page_cache->uniform_width;
-		if (height)
-			*height = page_cache->uniform_height;
+		w = page_cache->uniform_width;
+		h = page_cache->uniform_height;
 	} else {
 		EvPageCacheInfo *info;
 
 		info = &(page_cache->size_cache [page]);
 		
-		if (width)
-			*width = info->width;
-		if (height)
-			*height = info->height;
+		w = info->width;
+		h = info->height;
 	}
 
-	if (orientation == EV_ORIENTATION_PORTRAIT ||
-	    orientation == EV_ORIENTATION_UPSIDEDOWN) {
-		if (width)
-			*width = (int) ((*width) * scale + 0.5);
-		if (height)
-			*height = (int) ((*height) * scale + 0.5);
+	w = (int) (w * scale + 0.5);
+	h = (int) (h * scale + 0.5);
+
+	if (rotation == 0 || rotation == 180) {
+		if (width) *width = w;
+		if (height) *height = h;
 	} else {
-		if (width)
-			*width = (int) ((*height) * scale + 0.5);
-		if (height)
-			*height = (int) ((*width) * scale + 0.5);
+		if (width) *width = h;
+		if (height) *height = w;
 	}
 }
 
 void
 ev_page_cache_get_max_width (EvPageCache   *page_cache,
-			     EvOrientation  orientation,
+			     gint	    rotation,
 			     gfloat         scale,
 			     gint          *width)
 {
 	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
 
 	if (width) {
-		if (orientation == EV_ORIENTATION_PORTRAIT ||
-		    orientation == EV_ORIENTATION_UPSIDEDOWN) {
+		if (rotation == 0 || rotation == 180) {
 			*width = page_cache->max_width * scale;
 		} else {
 			*width = page_cache->max_height * scale;
@@ -421,15 +415,14 @@ ev_page_cache_get_max_width (EvPageCache   *page_cache,
 
 void
 ev_page_cache_get_max_height (EvPageCache   *page_cache,
-			      EvOrientation  orientation,
+			      gint           rotation,
 			      gfloat         scale,
 			      gint          *height)
 {
 	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
 
 	if (height) {
-		if (orientation == EV_ORIENTATION_PORTRAIT ||
-		    orientation == EV_ORIENTATION_UPSIDEDOWN) {
+		if (rotation == 0 || rotation == 180) {
 			*height = page_cache->max_height * scale;
 		} else {
 			*height = page_cache->max_width * scale;
@@ -440,7 +433,7 @@ ev_page_cache_get_max_height (EvPageCache   *page_cache,
 void    
 ev_page_cache_get_height_to_page (EvPageCache   *page_cache,
 				  gint           page,
-				  EvOrientation  orientation,
+				  gint           rotation,
 				  gfloat         scale,
 				  gint          *height,
 				  gint 	        *dual_height)
@@ -450,8 +443,8 @@ ev_page_cache_get_height_to_page (EvPageCache   *page_cache,
 	
 	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
 
-	if (page_cache->orientation != orientation) {
-		page_cache->orientation = orientation;
+	if (page_cache->rotation != rotation) {
+		page_cache->rotation = rotation;
 		build_height_to_page (page_cache);
 	}