From b8c43fb0ba13af0cc2b1050f48f81d76d2fdf0c7 Mon Sep 17 00:00:00 2001

From: Tom Hughes <tom@compton.nu>

Date: Sun, 19 May 2013 15:04:05 +0100

Subject: [PATCH 05/15] Remove VC++ 6 workaround

---

 include/agg_renderer_scanline.h | 29 +----------------------------

 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/include/agg_renderer_scanline.h b/include/agg_renderer_scanline.h

index c3bb6f0..c27ca60 100644

--- a/include/agg_renderer_scanline.h

+++ b/include/agg_renderer_scanline.h

@@ -79,34 +79,7 @@ namespace agg

             sl.reset(ras.min_x(), ras.max_x());

             while(ras.sweep_scanline(sl))

             {

-                //render_scanline_aa_solid(sl, ren, ren_color);

-

-                // This code is equivalent to the above call (copy/paste). 

-                // It's just a "manual" optimization for old compilers,

-                // like Microsoft Visual C++ v6.0

-                //-------------------------------

-                int y = sl.y();

-                unsigned num_spans = sl.num_spans();

-                typename Scanline::const_iterator span = sl.begin();

-

-                for(;;)

-                {

-                    int x = span->x;

-                    if(span->len > 0)

-                    {

-                        ren.blend_solid_hspan(x, y, (unsigned)span->len, 

-                                              ren_color, 

-                                              span->covers);

-                    }

-                    else

-                    {

-                        ren.blend_hline(x, y, (unsigned)(x - span->len - 1), 

-                                        ren_color, 

-                                        *(span->covers));

-                    }

-                    if(--num_spans == 0) break;

-                    ++span;

-                }

+                render_scanline_aa_solid(sl, ren, ren_color);

             }

         }

     }

-- 

1.8.1.4