From 15f932d3ff4e86286b8ebea63ed8540eba21e5c9 Mon Sep 17 00:00:00 2001
From: "Larsson@.(none)" <Larsson@.(none)>
Date: Fri, 26 Feb 2010 08:52:38 +0100
Subject: [PATCH] Have only one copy of ROUND macro and cast to int explicitly

---
 cairo_canvas.c | 2 --
 canvas_base.c  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/cairo_canvas.c b/cairo_canvas.c
index 15e4e24..addb3d4 100644
--- a/cairo_canvas.c
+++ b/cairo_canvas.c
@@ -26,8 +26,6 @@
 #include "lines.h"
 #include "pixman_utils.h"
 
-#define ROUND(_x) floor((_x) + 0.5)
-
 struct CairoCanvas {
     CanvasBase base;
     uint32_t *private_data;
diff --git a/canvas_base.c b/canvas_base.c
index 09fdca0..23039eb 100644
--- a/canvas_base.c
+++ b/canvas_base.c
@@ -76,7 +76,7 @@
 #define MAX(x, y) (((x) >= (y)) ? (x) : (y))
 #endif
 
-#define ROUND(_x) floor((_x) + 0.5)
+#define ROUND(_x) ((int)floor((_x) + 0.5))
 
 #ifdef WIN32
 typedef struct  __declspec (align(1)) LZImage {