[maemo-commits] [maemo-commits] r16924 - projects/haf/trunk/hildon-thumbnail/thumbs

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-12-10 11:10:35 +0200 (Wed, 10 Dec 2008)
New Revision: 16924

Modified:
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
Log:
Bugfix

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c	2008-12-10 09:06:13 UTC (rev 16923)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c	2008-12-10 09:10:35 UTC (rev 16924)
@@ -119,7 +119,7 @@
 
 		if (item->flags & HILDON_THUMBNAIL_FLAG_CROP) {
 			path = g_strdup (cropped);
-		} else if (item->width >= 128) {
+		} else if (item->width > 128 || item->height > 128) {
 			path = g_strdup (large);
 		} else {
 			path = g_strdup (normal);
@@ -221,7 +221,7 @@
 
 			if (item->flags & HILDON_THUMBNAIL_FLAG_CROP) {
 				path = cropped;
-			} else if (item->width >= 128 || item->height >= 128) {
+			} else if (item->width > 128 || item->height > 128) {
 				path = large;
 			} else {
 				path = normal;
@@ -494,7 +494,7 @@
 		if (flags & HILDON_THUMBNAIL_FLAG_CROP) {
 			if (g_file_test (cropped, G_FILE_TEST_EXISTS))
 				break;
-		} else if (width >= 128 || height >= 128) {
+		} else if (width > 128 || height > 128) {
 			if (g_file_test (large, G_FILE_TEST_EXISTS))
 				break;
 		} else {
@@ -514,7 +514,7 @@
 		if (flags & HILDON_THUMBNAIL_FLAG_CROP) {
 			path = cropped;
 			luri = local_cropped;
-		} else if (width >= 128) {
+		} else if (width > 128) {
 			path = large;
 			luri = local_large;
 		} else {
@@ -852,7 +852,7 @@
 			path = g_strdup (cropped);
 		g_object_unref (fcropped);
 
-	} else if (width < 128 || height < 128) {
+	} else if (width <= 128 || height <= 128) {
 
 		GFile *fnormal = g_file_new_for_uri (local_normal);
 		if (g_file_query_exists (fnormal, NULL))

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2008-12-10 09:06:13 UTC (rev 16923)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2008-12-10 09:10:35 UTC (rev 16924)
@@ -126,7 +126,7 @@
 			g_object_unref (temp);
 		} else
 			filei = temp;
-	} else if (r_priv->width >= 128) {
+	} else if (r_priv->width > 128 || r_priv->height > 128) {
 		GFile *temp = g_file_new_for_uri (lpaths[0]);
 		if (!g_file_query_exists (temp, NULL)) {
 			filei = g_file_new_for_path (paths[0]);
@@ -150,7 +150,7 @@
 		} else {
 			filei = local;
 		}
-	} else if (r_priv->width >= 128 || r_priv->height >= 128) {
+	} else if (r_priv->width > 128 || r_priv->height > 128) {
 		local = g_file_new_for_uri (lpaths[1]);
 		if (!g_file_query_exists (local, NULL)) {
 			filei = g_file_new_for_path (paths[1]);