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.

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

Release/image data any #2712

Merged
merged 122 commits into from Feb 19, 2015
Merged

Release/image data any #2712

merged 122 commits into from Feb 19, 2015

Conversation

flippmoke
Copy link
Member

Solves additional API needs for #2491

@springmeyer let the pull request begin.

artemp and others added 30 commits January 6, 2015 12:44
(NOTE: expression_evaluator requires  ```using result_type = T1;``` )
… way that saving images is processed in image_util.hpp and image_util.cpp.

 * Changed the passing of rgba_palette to a shared_ptr in order to better facilitate the use of a visitor pattern.
 * Moved PNG util processing into its own set of files so that image_util_impl.hpp would not have to depend on HAVE_PNG.
…st, T const& src,...) via providing const_rendering_buffer adapter
… way that saving images is processed in image_util.hpp and image_util.cpp.

 * Changed the passing of rgba_palette to a shared_ptr in order to better facilitate the use of a visitor pattern.
 * Moved PNG util processing into its own set of files so that image_util_impl.hpp would not have to depend on HAVE_PNG.
…am will be provided an image_data_any object.
…lders. Added the intial concepts for an image_view_any variant.
…d. Mostly modifications to the image_util_* files. Different processing based on the image type is now possible, and save_to_stream now could possibly accept grayscale with out breaking existing code.
Conflicts:
	include/mapnik/image_view.hpp
	src/image_util.cpp
…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
…he code. The image_data object is now responsible for keeping track of its own premultiplied_alpha status. Created a new utility method in image_util to preform premultiplication.

Added visitor pattern to several different methods as well to prepare for image_data_any including compositing.

Ref #2633
Dane Springmeyer and others added 25 commits February 3, 2015 00:05
…data_any

Conflicts:
	tests/python_tests/image_test.py
	tests/python_tests/image_tiff_test.py
	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-1.0-agg-reference.png
	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-2.0-agg-reference.png
* Added new gray data types adding those to the variants and updating all the code necessary for them
* Added basic SSE to the image compare method, (only for RGBA) must be enabled with the -DSSE_MATH flag this is not yet put into the build process in any location.
* Fixed the resulting image for some TIFF visual tests, most likely they were incorrect due to fixes in TIFF reader
* Added some MAPNIK_DECL where necessary to grid rendering.
* Added support for more data types in GDAL plugin with grayscale images.
* Added views for all the new gray data types
* Updated python bindings for new gray data types.

Ref #2681
…. Added several new SSE methods for unsigned integers.
Conflicts:
	include/mapnik/grid/grid_marker_helpers.hpp
…t types, added tests for all the new data formats with get and set in python.
Conflicts:
	benchmark/test_polygon_clipping.cpp
This update is in Ref #2649. It provides an update to markers and their processing such that:

 * All shared_ptrs are no longer required around markers
 * Markers are now const
flippmoke added a commit that referenced this pull request Feb 19, 2015
@flippmoke flippmoke merged commit dc0cfef into master Feb 19, 2015
@flippmoke flippmoke deleted the release/image_data_any branch February 19, 2015 19:56
@springmeyer springmeyer added this to the Mapnik 3.x milestone Feb 19, 2015
@springmeyer springmeyer mentioned this pull request Feb 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants