r15239 - in software/ui: debian src

[Petter Reinholdtsen]

Author: pere
Date: 2014-09-29 14:38:06 +0000 (Mon, 29 Sep 2014)
New Revision: 15239

Modified:
   software/ui/debian/changelog
   software/ui/src/pkgbrowser.cpp
Log:
Rewrite code comparing image count to avoid comparing signed and
unsigned values, fixing build failures on some architectures.

Modified: software/ui/debian/changelog
===================================================================
--- software/ui/debian/changelog	2014-09-29 10:50:14 UTC (rev 15238)
+++ software/ui/debian/changelog	2014-09-29 14:38:06 UTC (rev 15239)
@@ -1,3 +1,10 @@
+goplay (0.7+nmu1) UNRELEASED; urgency=medium
+
+  * Rewrite code comparing image count to avoid comparing signed and
+    unsigned values, fixing build failures on some architectures.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Mon, 29 Sep 2014 14:37:40 +0000
+
 goplay (0.7) unstable; urgency=medium
 
   * Reinsert fluid build dependency left out by mistake.

Modified: software/ui/src/pkgbrowser.cpp
===================================================================
--- software/ui/src/pkgbrowser.cpp	2014-09-29 10:50:14 UTC (rev 15238)
+++ software/ui/src/pkgbrowser.cpp	2014-09-29 14:38:06 UTC (rev 15239)
@@ -357,7 +357,7 @@
 		if (steps < 0 ) steps = 100;
 		if (after && *after=='/')
 			bar = strtol(after+1, &after, 10);
-		if (bar >= num_bar_images ) bar = num_bar_images - 1;
+		if (bar - num_bar_images >= 0 ) bar = num_bar_images - 1;
 		if (bar < 0 ) bar = 0;
 
 		if (bar_images[bar*2] && bar_images[bar*2]->w() > last_w) last_w = bar_images[bar*2]->w();
@@ -457,7 +457,7 @@
 			if (steps < 0 ) steps = 100;
 			if (after && *after=='/')
 				bar = strtol(after+1, &after, 10);
-			if (bar >= num_bar_images ) bar = num_bar_images - 1;
+			if (bar - num_bar_images >= 0) bar = num_bar_images - 1;
 			if (bar < 0 ) bar = 0;
 			int n = (percent + (50/steps))* steps / 100; // convert to num of steps, round instead of just floor
 			if (n < 0) n = 0;