]> git.pld-linux.org Git - packages/agg.git/blob - cxx.patch
- cxx fixes for gcc 8
[packages/agg.git] / cxx.patch
1 diff -ur agg-2.5/include/agg_renderer_outline_aa.h agg-2.5.c++/include/agg_renderer_outline_aa.h
2 --- agg-2.5/include/agg_renderer_outline_aa.h   2006-10-09 06:07:08.000000000 +0200
3 +++ agg-2.5.c++/include/agg_renderer_outline_aa.h       2018-09-03 11:45:56.795337176 +0200
4 @@ -1375,7 +1375,7 @@
5          //---------------------------------------------------------------------
6          void profile(const line_profile_aa& prof) { m_profile = &prof; }
7          const line_profile_aa& profile() const { return *m_profile; }
8 -        line_profile_aa& profile() { return *m_profile; }
9 +        const line_profile_aa& profile() { return *m_profile; }
10  
11          //---------------------------------------------------------------------
12          int subpixel_width() const { return m_profile->subpixel_width(); }
13 diff -ur agg-2.5/include/agg_scanline_u.h agg-2.5.c++/include/agg_scanline_u.h
14 --- agg-2.5/include/agg_scanline_u.h    2006-10-09 06:07:10.000000000 +0200
15 +++ agg-2.5.c++/include/agg_scanline_u.h        2018-09-03 11:48:04.543654164 +0200
16 @@ -476,18 +476,19 @@
17          scanline32_u8_am() : base_type(), m_alpha_mask(0) {}
18          scanline32_u8_am(const AlphaMask& am) : base_type(), m_alpha_mask(&am) {}
19  
20 +       base_type b;
21          //--------------------------------------------------------------------
22          void finalize(int span_y)
23          {
24 -            base_type::finalize(span_y);
25 +            b.finalize(span_y);
26              if(m_alpha_mask)
27              {
28 -                typename base_type::iterator span = base_type::begin();
29 -                unsigned count = base_type::num_spans();
30 +                typename base_type::iterator span = b.begin();
31 +                unsigned count = b.num_spans();
32                  do
33                  {
34                      m_alpha_mask->combine_hspan(span->x, 
35 -                                                base_type::y(), 
36 +                                                b.y(), 
37                                                  span->covers, 
38                                                  span->len);
39                      ++span;
This page took 0.063215 seconds and 3 git commands to generate.