Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

is_solid to image_util #2637

Merged
merged 12 commits into from
Jan 15, 2015
Merged

is_solid to image_util #2637

merged 12 commits into from
Jan 15, 2015

Conversation

flippmoke
Copy link
Member

Migrated is_solid to image_util.hpp

Please review @springmeyer or @artemp. Feel free to merge if you are happy with the changes.

Ref #2633

@flippmoke
Added is_solid to image_utils. It is currently built to support the e…
4b25c75 
…ventual use of image_view_any and image_data_any, but for a limited time supports the passing of image_view_rgba8 and image_data_rgba8.

Ref #2633
@springmeyer
Copy link
Member

Looking good. I'd like to compile and try it out next.

@springmeyer
Copy link
Member

508521d was to dodge:

Undefined symbols for architecture x86_64:
  "bool mapnik::is_solid<mapnik::image_data<unsigned int, 65535ul> >(mapnik::image_data<unsigned int, 65535ul> const&)", referenced from:
      is_solid(mapnik::image_32 const&) in mapnik_image.os
  "bool mapnik::is_solid<mapnik::image_view<mapnik::image_data<unsigned int, 65535ul> > >(mapnik::image_view<mapnik::image_data<unsigned int, 65535ul> > const&)", referenced from:
      is_solid(mapnik::image_view<mapnik::image_data<unsigned int, 65535ul> > const&) in mapnik_image_view.os

Just so I could run the visual tests (which look good). Feel free to move back to cpp file once things have settled out.

@springmeyer
Copy link
Member

I think this is ready to merge into release/image_data_any, @flippmoke go ahead and do that when you are ready tomorrow.

flippmoke added a commit that referenced this pull request Jan 15, 2015
@flippmoke
Merge pull request #2637 from mapnik/feature/is_solid_move
58f5812 
is_solid to image_util
@flippmoke flippmoke merged commit 58f5812 into release/image_data_any Jan 15, 2015
@flippmoke flippmoke deleted the feature/is_solid_move branch January 15, 2015 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@flippmoke @springmeyer