From af519a41a2012bcea359c3352fa2878c4049c9b0 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 21 Jun 2012 15:19:45 -0400
Subject: [PATCH] use the current buffer in markers, building, shield, and line
 pattern symbolizers to ensure that style level opacity and compositing work -
 refs #1262 and #314

---
 src/agg/process_building_symbolizer.cpp     | 2 +-
 src/agg/process_line_pattern_symbolizer.cpp | 2 +-
 src/agg/process_markers_symbolizer.cpp      | 2 +-
 src/agg/process_shield_symbolizer.cpp       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/agg/process_building_symbolizer.cpp b/src/agg/process_building_symbolizer.cpp
index 99d956062..7863fd566 100644
--- a/src/agg/process_building_symbolizer.cpp
+++ b/src/agg/process_building_symbolizer.cpp
@@ -51,7 +51,7 @@ void agg_renderer<T>::process(building_symbolizer const& sym,
     typedef agg::renderer_base<agg::pixfmt_rgba32> ren_base;
     typedef agg::renderer_scanline_aa_solid<ren_base> renderer;
 
-    agg::rendering_buffer buf(pixmap_.raw_data(),width_,height_, width_ * 4);
+    agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
     agg::pixfmt_rgba32 pixf(buf);
     ren_base renb(pixf);
 
diff --git a/src/agg/process_line_pattern_symbolizer.cpp b/src/agg/process_line_pattern_symbolizer.cpp
index 471183d59..4e4e07770 100644
--- a/src/agg/process_line_pattern_symbolizer.cpp
+++ b/src/agg/process_line_pattern_symbolizer.cpp
@@ -83,7 +83,7 @@ void  agg_renderer<T>::process(line_pattern_symbolizer const& sym,
 
     box2d<double> ext = query_extent_ * 1.0;
     
-    agg::rendering_buffer buf(pixmap_.raw_data(),width_,height_, width_ * 4);
+    agg::rendering_buffer buf(current_buffer_->raw_data(),width_,height_, width_ * 4);
     pixfmt_type pixf(buf);
     pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op()));
     renderer_base ren_base(pixf);
diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index e4b2df789..62925f707 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -67,7 +67,7 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
     ras_ptr->gamma(agg::gamma_power());
     agg::scanline_u8 sl;
     agg::scanline_p8 sl_line;
-    agg::rendering_buffer buf(pixmap_.raw_data(), width_, height_, width_ * 4);
+    agg::rendering_buffer buf(current_buffer_->raw_data(), width_, height_, width_ * 4);
     pixfmt_comp_type pixf(buf);
     pixf.comp_op(static_cast<agg::comp_op_e>(sym.comp_op()));
     renderer_base renb(pixf);
diff --git a/src/agg/process_shield_symbolizer.cpp b/src/agg/process_shield_symbolizer.cpp
index f0a5695b9..d579ca471 100644
--- a/src/agg/process_shield_symbolizer.cpp
+++ b/src/agg/process_shield_symbolizer.cpp
@@ -46,7 +46,7 @@ void  agg_renderer<T>::process(shield_symbolizer const& sym,
             scale_factor_,
             t_, font_manager_, *detector_, query_extent_);
 
-    text_renderer<T> ren(pixmap_, font_manager_, *(font_manager_.get_stroker()));
+    text_renderer<T> ren(*current_buffer_, font_manager_, *(font_manager_.get_stroker()));
 
     while (helper.next()) {
         placements_type &placements = helper.placements();