Opened 3 years ago

Closed 3 years ago

#12934 closed bug (fixed)

[Patch] agg_scanline_u.h: fix wrong base_type

Reported by: mt Owned by: waddlesplash
Priority: normal Milestone: Unscheduled
Component: - General Version: R1/Development
Keywords: agg libicon Cc:
Blocked By: Blocking:
Has a Patch: yes Platform: All

Description

As pointed out at [1] and by gcc trunk, modify base_type for scanline32_u8_am from scanline_u8 to scanline32_u8 at line 461 [2].

NOTE: agg 2.4 seems to be continued developing at [3], so we might update our agg from [3].

[1] https://sourceforge.net/p/agg/svn/37 [2] http://cgit.haiku-os.org/haiku/tree/headers/libs/agg/agg_scanline_u.h#n461 [3] https://sourceforge.net/projects/agg

In file included from /home/haiku/haiku/haiku/src/libs/icon/IconRenderer.h:18:0,
                 from /home/haiku/haiku/haiku/src/libs/icon/style/Style.h:18,
                 from /home/haiku/haiku/haiku/src/libs/icon/message/MessageImporter.cpp:24:
/home/haiku/haiku/haiku/headers/libs/agg/agg_scanline_u.h: In member function 'void agg::scanline32_u8_am<AlphaMask>::finalize(int)':
/home/haiku/haiku/haiku/headers/libs/agg/agg_scanline_u.h:480:32: error: 'agg::scanline_u8' is not a base of 'agg::scanline32_u8_am<AlphaMask>'
             this->scanline_u8::finalize(span_y);
                                ^~~~~~~~
/home/haiku/haiku/haiku/headers/libs/agg/agg_scanline_u.h:483:74: error: 'agg::scanline_u8' is not a base of 'agg::scanline32_u8_am<AlphaMask>'
                 typename scanline_u8::iterator span = this->scanline_u8::begin();
                                                                          ^~~~~
/home/haiku/haiku/haiku/headers/libs/agg/agg_scanline_u.h:484:53: error: 'agg::scanline_u8' is not a base of 'agg::scanline32_u8_am<AlphaMask>'
                 unsigned count = this->scanline_u8::num_spans();
                                                     ^~~~~~~~~
/home/haiku/haiku/haiku/headers/libs/agg/agg_scanline_u.h:488:68: error: 'agg::scanline_u8' is not a base of 'agg::scanline32_u8_am<AlphaMask>'
                                                 this->scanline_u8::y(),
                                                                    ^

Attachments (1)

0027-agg_scanline_u.h-fix-wrong-base_type.patch (928 bytes ) - added by mt 3 years ago.

Download all attachments as: .zip

Change History (5)

comment:1 by mt, 3 years ago

Has a Patch: set

comment:2 by pulkomandy, 3 years ago

Good news that AGG 2.4 development has resumed. I think we should outsource it (using the current sources) and then use it as a normal 3rd party library. Anyone wants to write a recipe?

There is a recipe for version 2.5, but it has a different license and is somewhat incompatible IIRC.

comment:3 by waddlesplash, 3 years ago

Owner: changed from nobody to waddlesplash
Status: newin-progress

Yes, looks like the newer AGG patches should be imported. I'm looking into it now.

comment:4 by waddlesplash, 3 years ago

Resolution: fixed
Status: in-progressclosed

Applied along with some other relevant AGG patches in hrev51000.

Note: See TracTickets for help on using tickets.