[ease] Fixed build on Fedora 13.



commit 4d898cdd9fce41dee208dad22a6a659fdcdc7eb5
Author: Nate Stedman <natesm gmail com>
Date:   Tue Jun 22 13:53:10 2010 -0400

    Fixed build on Fedora 13.

 src/ease-editor-embed.vala     |    4 ++--
 src/ease-scrollable-embed.vala |    8 ++++----
 src/ease-slide-actor.vala      |    4 ++--
 src/ease-utilities.vala        |   15 +++++++++++++++
 src/ease-welcome-actor.vala    |    4 ++--
 src/ease-welcome-window.vala   |    4 ++--
 6 files changed, 27 insertions(+), 12 deletions(-)
---
diff --git a/src/ease-editor-embed.vala b/src/ease-editor-embed.vala
index 1049d11..19dd2a0 100644
--- a/src/ease-editor-embed.vala
+++ b/src/ease-editor-embed.vala
@@ -327,11 +327,11 @@ public class Ease.EditorEmbed : ScrollableEmbed
 		
 		slide_actor.set_scale_full(zoom, zoom, 0, 0);
 
-		slide_actor.x = Math.roundf(w < width
+		slide_actor.x = roundd(w < width
 		                            ? width / 2 - w / 2
 	                                : 0);
 		        
-		slide_actor.y = Math.roundf(h < height
+		slide_actor.y = roundd(h < height
 		                            ? height / 2 - h / 2
 		                            : 0);
 		              
diff --git a/src/ease-scrollable-embed.vala b/src/ease-scrollable-embed.vala
index 971d96e..3bbb289 100644
--- a/src/ease-scrollable-embed.vala
+++ b/src/ease-scrollable-embed.vala
@@ -151,14 +151,14 @@ public class Ease.ScrollableEmbed : Gtk.HBox
 			switch (event.direction)
 			{
 				case Gdk.ScrollDirection.UP:
-					v_adjust.value = Math.fmin(v_adjust.upper,
-					                 Math.fmax(v_adjust.lower,
+					v_adjust.value = dmin(v_adjust.upper,
+					                 dmax(v_adjust.lower,
 					                           v_adjust.value -
 					                           v_adjust.step_increment));
 					break;
 				case Gdk.ScrollDirection.DOWN:
-					v_adjust.value = Math.fmin(v_adjust.upper,
-					                 Math.fmax(v_adjust.lower,
+					v_adjust.value = dmin(v_adjust.upper,
+					                 dmax(v_adjust.lower,
 					                           v_adjust.value +
 					                           v_adjust.step_increment));
 					break;
diff --git a/src/ease-slide-actor.vala b/src/ease-slide-actor.vala
index 2620bca..8529dbd 100644
--- a/src/ease-slide-actor.vala
+++ b/src/ease-slide-actor.vala
@@ -390,7 +390,7 @@ public class Ease.SlideActor : Clutter.Group
 	public void transition(SlideActor new_slide,
 	                       Clutter.Group container)
 	{
-		uint length = (uint)Math.fmax(1, slide.transition_time * 1000);
+		uint length = (uint)dmax(1, slide.transition_time * 1000);
 
 		animation_time = new Clutter.Timeline(length);
 
@@ -1335,7 +1335,7 @@ public class Ease.SlideActor : Clutter.Group
 	 */
 	private static uint8 clamp_opacity(double o)
 	{
-		return (uint8)(Math.fmax(0, Math.fmin(255, o)));
+		return (uint8)(dmax(0, dmin(255, o)));
 	}
 }
 
diff --git a/src/ease-utilities.vala b/src/ease-utilities.vala
index 89453f6..3965390 100644
--- a/src/ease-utilities.vala
+++ b/src/ease-utilities.vala
@@ -57,4 +57,19 @@ namespace Ease
 		
 		return null;
 	}
+
+	public double dmax(double a, double b)
+	{
+		return a > b ? a : b;
+	}
+
+	public double dmin(double a, double b)
+	{
+		return a < b ? a : b;
+	}
+	
+	public int roundd(double num)
+	{
+		return (int)(num - (int)num < 0.5 ? num : num + 1);
+	}
 }
diff --git a/src/ease-welcome-actor.vala b/src/ease-welcome-actor.vala
index 020731c..1e6a533 100644
--- a/src/ease-welcome-actor.vala
+++ b/src/ease-welcome-actor.vala
@@ -98,8 +98,8 @@ public class Ease.WelcomeActor : Clutter.Group
 		rect.width = w;
 		rect.height = h;
 		
-		text.x = Math.roundf(rect.width / 2 - text.width / 2);
-		text.y = Math.roundf(h + TEXT_OFFSET);
+		text.x = roundd(rect.width / 2 - text.width / 2);
+		text.y = roundd(h + TEXT_OFFSET);
 		
 		if (slide_actor != null)
 		{
diff --git a/src/ease-welcome-window.vala b/src/ease-welcome-window.vala
index 0582672..3b0d1e8 100644
--- a/src/ease-welcome-window.vala
+++ b/src/ease-welcome-window.vala
@@ -375,8 +375,8 @@ public class Ease.WelcomeWindow : Gtk.Window
 			float x_pixels = x_origin + x_position *
 			                  (PREVIEW_PADDING + preview_width);
 			
-			float x_round = Math.roundf(x_pixels);
-			float y_round = Math.roundf(y_pixels);
+			float x_round = roundd(x_pixels);
+			float y_round = roundd(y_pixels);
 			
 			if (animate_resize)
 			{	



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]