Changeset 1681

Timestamp:

03/11/10 18:19:12 (5 months ago)

Author:

dane

Message:

+ use rint(v) instead of int(round(v)) + add rint implementation - msvc hasn't got one + minor cleanups

Location:

trunk

Files:

• include/mapnik/global.hpp (modified) (1 diff)
• include/mapnik/graphics.hpp (modified) (2 diffs)
• include/mapnik/image_util.hpp (modified) (2 diffs)
• src/agg_renderer.cpp (modified) (3 diffs)

trunk/include/mapnik/global.hpp

@@ -160 +160 @@
         return val;
     }
+
+#ifdef _WINDOWS
+// msvc doesn't have rint in <cmath>
+inline int rint( double val)
+{
+    return int(floor(val + 0.5));
+}
+#endif
+
 }
 

trunk/include/mapnik/graphics.hpp

@@ -370 +370 @@
                     unsigned b0 = (rgba0 >> 8) & 0xff;
 
-                    r0 = uint8_t(((r1 - r0) * a1 + (r0 << 8)) >> 8);
-                    g0 = uint8_t(((g1 - g0) * a1 + (g0 << 8)) >> 8);
-                    b0 = uint8_t(((b1 - b0) * a1 + (b0 << 8)) >> 8);
-                    a0 = uint8_t((a1 + a0) - ((a1 * a0 + 255) >> 8));
+                    r0 = byte(((r1 - r0) * a1 + (r0 << 8)) >> 8);
+                    g0 = byte(((g1 - g0) * a1 + (g0 << 8)) >> 8);
+                    b0 = byte(((b1 - b0) * a1 + (b0 << 8)) >> 8);
+                    a0 = byte((a1 + a0) - ((a1 * a0 + 255) >> 8));
 
                     row_to[x] = (a0)| (b0 << 8) |  (g0 << 16) | (r0 << 24) ;
@@ -388 +388 @@
                     unsigned b0 = (rgba0 >> 16) & 0xff;
 
-                    r0 = uint8_t(((r1 - r0) * a1 + (r0 << 8)) >> 8);
-                    g0 = uint8_t(((g1 - g0) * a1 + (g0 << 8)) >> 8);
-                    b0 = uint8_t(((b1 - b0) * a1 + (b0 << 8)) >> 8);
-                    a0 = uint8_t((a1 + a0) - ((a1 * a0 + 255) >> 8));
+                    r0 = byte(((r1 - r0) * a1 + (r0 << 8)) >> 8);
+                    g0 = byte(((g1 - g0) * a1 + (g0 << 8)) >> 8);
+                    b0 = byte(((b1 - b0) * a1 + (b0 << 8)) >> 8);
+                    a0 = byte((a1 + a0) - ((a1 * a0 + 255) >> 8));
                     
                     row_to[x] = (a0 << 24)| (b0 << 16) |  (g0 << 8) | (r0) ;

trunk/include/mapnik/image_util.hpp

@@ -233 +233 @@
     int tw2 = target_width/2;
     int th2 = target_height/2;
-    int offs_x = int(round((source_width-target_width-x_off_f*2*source_width)/2));
-    int offs_y = int(round((source_height-target_height-y_off_f*2*source_height)/2));
+    int offs_x = rint((source_width-target_width-x_off_f*2*source_width)/2);
+    int offs_y = rint((source_height-target_height-y_off_f*2*source_height)/2);
     unsigned yprt, yprt1, xprt, xprt1;
 
@@ -320 +320 @@
     int tw2 = target_width/2;
     int th2 = target_height/2;
-    int offs_x = int(round((source_width-target_width-x_off_f*2*source_width)/2));
-    int offs_y = int(round((source_height-target_height-y_off_f*2*source_height)/2));
+    int offs_x = rint((source_width-target_width-x_off_f*2*source_width)/2);
+    int offs_y = rint((source_height-target_height-y_off_f*2*source_height)/2);
     unsigned yprt, yprt1, xprt, xprt1;
 

trunk/src/agg_renderer.cpp

@@ -76 +76 @@
 #include <iostream>
 #endif
+
+#include <cmath>
 
 namespace mapnik
@@ -596 +598 @@
                                 {
                                     //pixmap_.set_rectangle_alpha(px,py,*data);
-                                    pixmap_.set_rectangle_alpha2(*(*data),px,py,sym.get_opacity());
+                                    pixmap_.set_rectangle_alpha2(*(*data),px,py,float(sym.get_opacity()));
                                     box2d<double> dim = ren.prepare_glyphs(&text_placement.placements[0]);
                                     ren.render(x,y);
@@ -750 +752 @@
         box2d<double> ext=t_.forward(raster->ext_);
         
-        int start_x = int(round(ext.minx()));
-        int start_y = int(round(ext.miny()));
-        int raster_width = int(round(ext.width()));
-        int raster_height = int(round(ext.height()));
+        int start_x = rint(ext.minx());
+        int start_y = rint(ext.miny());
+        int raster_width = rint(ext.width());
+        int raster_height = rint(ext.height());
         int end_x = start_x + raster_width;
         int end_y = start_y + raster_height;