Changeset 1079

Timestamp:

04/07/09 19:06:51 (16 months ago)

Author:

dane

Message:

Apply patch from Marcin to handle smooth transitions between raster layers for both gdal and raster plugin - closed #295

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• plugins/input/gdal/gdal_featureset.cpp (modified) (1 diff)
• plugins/input/raster/raster_featureset.cpp (modified) (1 diff)
• src/agg_renderer.cpp (modified) (2 diffs)
• src/cairo_renderer.cpp (modified) (1 diff)

trunk/CHANGELOG

@@ -14 +14 @@
 0.6.1 SVN
 ---------
+
+- Rasters: Handle rounding to allow better alignment of raster layers (r1079) (#295)
 
 - AGG Renderer: Added option to control output JPEG quality (r1078) (#198)

trunk/plugins/input/gdal/gdal_featureset.cpp

@@ -126 +126 @@
       Envelope<double> box = t.forward(intersection);
       
-      int start_x = int(box.minx());
-      int start_y = int(box.miny());
-      int width = int(box.width());
-      int height = int(box.height());
+      int start_x = int(box.minx()+0.5);
+      int start_y = int(box.miny()+0.5);
+      int width = int(box.width()+0.5);
+      int height = int(box.height()+0.5);
       
       if (width > 0 && height > 0)

trunk/plugins/input/raster/raster_featureset.cpp

@@ -69 +69 @@
                Envelope<double> ext=t.forward(intersect);
                     
-               ImageData32 image((int)ext.width(),(int)ext.height());
-               reader->read((int)ext.minx(),(int)ext.miny(),image);
+               ImageData32 image((int)(ext.width()+0.5),(int)(ext.height()+0.5));
+               reader->read((int)(ext.minx()+0.5),(int)(ext.miny()+0.5),image);
                feature->set_raster(mapnik::raster_ptr(new raster(intersect,image)));
             }

trunk/src/agg_renderer.cpp

@@ -670 +670 @@
          Envelope<double> ext=t_.forward(raster->ext_);
          ImageData32 target(int(ext.width() + 0.5),int(ext.height() + 0.5));
+         int start_x = int(ext.minx()+0.5);
+         int start_y = int(ext.miny()+0.5);
 
          if (sym.get_scaling() == "fast"){
@@ -683 +685 @@
          if (sym.get_mode() == "normal"){
              if (sym.get_opacity() == 1.0) {
-                pixmap_.set_rectangle(int(ext.minx()),int(ext.miny()),target);
+                pixmap_.set_rectangle(start_x,start_y,target);
              } else {
-                pixmap_.set_rectangle_alpha2(target,int(ext.minx()),int(ext.miny()), sym.get_opacity());
+                pixmap_.set_rectangle_alpha2(target,start_x,start_y, sym.get_opacity());
              }
          } else if (sym.get_mode() == "grain_merge"){
-            pixmap_.template merge_rectangle<MergeGrain> (target,int(ext.minx()),int(ext.miny()), sym.get_opacity());
+            pixmap_.template merge_rectangle<MergeGrain> (target,start_x,start_y, sym.get_opacity());
          } else if (sym.get_mode() == "grain_merge2"){
-            pixmap_.template merge_rectangle<MergeGrain2> (target,int(ext.minx()),int(ext.miny()), sym.get_opacity());
+            pixmap_.template merge_rectangle<MergeGrain2> (target,start_x,start_y, sym.get_opacity());
          } else if (sym.get_mode() == "multiply"){
-            pixmap_.template merge_rectangle<Multiply> (target,int(ext.minx()),int(ext.miny()), sym.get_opacity());
+            pixmap_.template merge_rectangle<Multiply> (target,start_x,start_y, sym.get_opacity());
          } else if (sym.get_mode() == "multiply2"){
-            pixmap_.template merge_rectangle<Multiply2> (target,int(ext.minx()),int(ext.miny()), sym.get_opacity());
+            pixmap_.template merge_rectangle<Multiply2> (target,start_x,start_y, sym.get_opacity());
          } else if (sym.get_mode() == "divide"){
-            pixmap_.template merge_rectangle<Divide> (target,int(ext.minx()),int(ext.miny()), sym.get_opacity());
+            pixmap_.template merge_rectangle<Divide> (target,start_x,start_y, sym.get_opacity());
          } else if (sym.get_mode() == "divide2"){
-            pixmap_.template merge_rectangle<Divide2> (target,int(ext.minx()),int(ext.miny()), sym.get_opacity());
+            pixmap_.template merge_rectangle<Divide2> (target,start_x,start_y, sym.get_opacity());
          } else if (sym.get_mode() == "screen"){
-            pixmap_.template merge_rectangle<Screen> (target,int(ext.minx()),int(ext.miny()), sym.get_opacity());
+            pixmap_.template merge_rectangle<Screen> (target,start_x,start_y, sym.get_opacity());
          } else if (sym.get_mode() == "hard_light"){
-            pixmap_.template merge_rectangle<HardLight> (target,int(ext.minx()),int(ext.miny()), sym.get_opacity());
+            pixmap_.template merge_rectangle<HardLight> (target,start_x,start_y, sym.get_opacity());
          } else {
              if (sym.get_opacity() == 1.0){
-                 pixmap_.set_rectangle(int(ext.minx()),int(ext.miny()),target);
+                 pixmap_.set_rectangle(start_x,start_y,target);
              } else {
-                pixmap_.set_rectangle_alpha2(target,int(ext.minx()),int(ext.miny()), sym.get_opacity());
+                pixmap_.set_rectangle_alpha2(target,start_x,start_y, sym.get_opacity());
              }
          }

trunk/src/cairo_renderer.cpp

@@ -988 +988 @@
 
          //TODO -- support for advanced image merging
-         context.add_image(int(ext.minx()), int(ext.miny()), target, sym.get_opacity());
+         context.add_image(int(ext.minx()+0.5), int(ext.miny()+0.5), target, sym.get_opacity());
       }
    }