aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Fabbro <bicatali@gentoo.org>2013-08-06 21:03:53 -0700
committerSébastien Fabbro <bicatali@gentoo.org>2013-08-06 21:03:53 -0700
commite847e78fd3ee987d1b00c67917f702a7ca150c40 (patch)
tree50b4a871709dd12533fadd0689b72eb3a3703819 /x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch
parentsci-libs/openblas: Version bump (diff)
downloadsci-e847e78fd3ee987d1b00c67917f702a7ca150c40.tar.gz
sci-e847e78fd3ee987d1b00c67917f702a7ca150c40.tar.bz2
sci-e847e78fd3ee987d1b00c67917f702a7ca150c40.zip
x11-libs/agg: Import all fedora patches. Add static-libs flag, switch to EAPI5 and autotools-utils eclass
Package-Manager: portage-2.2.01.22124-prefix
Diffstat (limited to 'x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch')
-rw-r--r--x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch b/x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch
new file mode 100644
index 000000000..f38f7c40d
--- /dev/null
+++ b/x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch
@@ -0,0 +1,52 @@
+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
+