From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Tue, 1 Dec 2009 19:17:29 +0000 (+0100)
Subject: [libview] Remove unneeded redundant code
X-Git-Tag: EVINCE_2_29_4~36
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=cc46f6d515d9639f4fbca00118fb2c99c2a3bcd7;p=evince.git

[libview] Remove unneeded redundant code
---

diff --git a/libview/ev-view.c b/libview/ev-view.c
index 97ff0013..f039c0e5 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -5658,14 +5658,7 @@ zoom_for_size_fit_width (gdouble doc_width,
 			 int     target_width,
 			 int     target_height)
 {
-	double scale;
-
-	scale = (double)target_width / doc_width;
-
-	if (doc_height * scale > target_height)
-		scale = (double)target_width / doc_width;
-
-	return scale;
+	return (double)target_width / doc_width;
 }
 
 static double
@@ -5674,14 +5667,7 @@ zoom_for_size_fit_height (gdouble doc_width,
 			  int     target_width,
 			  int     target_height)
 {
-	double scale;
-
-	scale = (double)target_height / doc_height;
-
-	if (doc_width * scale > target_width)
-		scale = (double)target_height / doc_height;
-
-	return scale;
+	return (double)target_height / doc_height;
 }
 
 static double
@@ -5696,11 +5682,6 @@ zoom_for_size_best_fit (gdouble doc_width,
 	w_scale = (double)target_width / doc_width;
 	h_scale = (double)target_height / doc_height;
 
-	if (doc_height * w_scale > target_height)
-		w_scale = (double)target_width / doc_width;
-	if (doc_width * h_scale > target_width)
-		h_scale = (double)target_height / doc_height;
-
 	return MIN (w_scale, h_scale);
 }