Commit graph

3260 commits

Author SHA1 Message Date
Blake Thompson
fe01d52845 Removed unused resolution data from grids 2015-03-10 23:19:30 -05:00
Blake Thompson
f715f9cf22 Updated the name of methods in grids from properties to fields because they are an array rather then a map. 2015-03-10 19:59:46 -05:00
Blake Thompson
7ee9745a8f Updated param to allow value_boolean 2015-03-09 16:33:20 -05:00
Blake Thompson
e20c68d384 Corrected a bug in hsl2rgb where if s was equal to zero an incorrect result was achieved. 2015-03-09 12:07:39 -05:00
Blake Thompson
ffad24f31d Added bugfix for image_view where if an image of zero width or height created a view, it would cause a segfault because it created a 1,1 size view. 2015-03-08 23:28:56 -05:00
Blake Thompson
61abe608ee Added the ability to get_type from an image, fixed possible bugs associated with image copy. 2015-03-06 17:24:23 -06:00
Blake Thompson
ea6677df37 A fix to the jpeg driver making it operate with parameters like the other file formats. 2015-03-05 21:51:48 -06:00
artemp
87e9c64fc4 topojson grammar - add optional bbox element which is omitted 2015-03-04 14:55:13 +01:00
Dane Springmeyer
4afcac5563 try to solve #2714 2015-02-26 11:12:19 -08:00
Dane Springmeyer
dd0b8459f5 insert_marker to take rvalue it if is moved inside the function 2015-02-19 01:37:45 -08:00
Dane Springmeyer
cb869e60f3 no need for templated 'raster_marker_render_thunk' 2015-02-19 01:36:43 -08:00
Blake Thompson
744dc4472f Merge branch 'release/image_data_any' of github.com:mapnik/mapnik into release/image_data_any 2015-02-18 23:02:34 -06:00
Blake Thompson
390fbaac92 BOOM SHAKALAKA:
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
2015-02-18 22:58:33 -06:00
Dane Springmeyer
817489e97a functions fully defined in hpp do not need MAPNIK_DECL - refs #2708 2015-02-16 19:05:41 -08:00
Dane Springmeyer
842e4bebe6 start fixing windows compile - refs #2708 2015-02-16 18:48:14 -08:00
Blake Thompson
b2c1c86d99 Merge branch 'master' into release/image_data_Any
Conflicts:
	benchmark/test_polygon_clipping.cpp
2015-02-16 14:37:01 -06:00
Blake Thompson
0cd9c1fc34 Updated image_any building switch statement to support all the correct types, added tests for all the new data formats with get and set in python. 2015-02-16 14:23:55 -06:00
Dane Springmeyer
1ebd6afd9c improve sql subselect parsing + add tests - closes #2704 2015-02-13 01:26:19 -08:00
Dane Springmeyer
2aaaecbcaf initialize pos_ variable in path_iterator + fix spelling 2015-02-12 11:38:31 -08:00
Dane Springmeyer
58645c7842 json error handler: fix -Wunused-parameter warning 2015-02-11 23:13:59 -08:00
Dane Springmeyer
7fbc254673 fix polygon_clipper to work with vertex_adapter 2015-02-11 15:52:36 -08:00
Dane Springmeyer
89a58c5879 Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any 2015-02-11 10:01:42 -08:00
Dane Springmeyer
1dc5452c74 msvs 2014 compile fixes 2015-02-10 18:20:08 -08:00
Dane Springmeyer
2042ffd824 avoid need to instanciate expensive svg_path_generator twice 2015-02-10 12:16:01 -08:00
Dane Springmeyer
6d611b8e1a cleanup commented code 2015-02-09 23:28:27 -08:00
artemp
1ecf3f0889 use const ref when iterating over geometries in feature 2015-02-09 13:46:01 +01:00
Blake Thompson
6e0d6d423b Merge branch 'master' into release/image_data_any
Conflicts:
	include/mapnik/grid/grid_marker_helpers.hpp
2015-02-06 16:19:40 -06:00
Blake Thompson
9875335fb8 Renamed image_cast to image_copy 2015-02-06 15:27:19 -06:00
artemp
0f22fb596b enforce geometry_type const by removing ``inline geometry_type& get_geometry(std::size_t index)`` 2015-02-06 17:13:41 +01:00
artemp
e19fdad3a6 implement vertex interface in vertex_adapter and make mapnik::geometry_type immutable 2015-02-06 16:45:51 +01:00
Jordan Hollinger
187a42f006 Merge pull request #2680 from mapycz/rm-grid_marker_helpers
remove redundant header
2015-02-05 17:01:36 -05:00
Blake Thompson
04d51d3696 Another small change hopefully to fix linux build isssues. 2015-02-04 21:19:59 -06:00
Blake Thompson
5966b12973 Small changes to hopefully fix compile issues on linux 2015-02-04 20:48:59 -06:00
Blake Thompson
c0fcf48019 Fixed issues with SSE compare when the threshold is greater then zero. Added several new SSE methods for unsigned integers. 2015-02-04 17:46:18 -06:00
Blake Thompson
ffb34544e6 Merge branch 'master' into release/image_data_any 2015-02-04 15:46:54 -06:00
Blake Thompson
2b8bd59d82 A large set of updates:
* 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
2015-02-04 15:41:58 -06:00
artemp
ae9eafa2c1 allow "stringified" nested objects and arrays as feature property 2015-02-04 18:28:47 +01:00
Jiri Drbalek
f38ee06224 remove redundant header 2015-02-04 14:46:17 +00:00
Jiri Drbalek
1fcbdc3e98 add upright value auto-down 2015-02-03 16:08:36 +00:00
artemp
9f282af61a json - instantiate grammars using Iterator = char const* to avoid potentially expensive std::string allocations 2015-02-03 13:37:39 +01:00
Dane Springmeyer
71e7faed0d Merge branch 'master' of github.com:mapnik/mapnik into release/image_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
2015-02-03 00:05:15 -08:00
Dane Springmeyer
c361e538f7 Merge pull request #2671 from sarametz/png8_encoding_bug
Png8 encoding bug
2015-02-02 14:08:05 -08:00
Dane Springmeyer
074b1e2836 cleanup commented code after 89e516b493 2015-02-02 10:46:20 -08:00
artemp
d5ff3f5f2c fix bbox extractor 2015-02-02 18:44:56 +01:00
artemp
89e516b493 unicode string grammar via boost/libs/spirit/example/qi/json/json/parser/grammar.hpp
update json based grammars
2015-02-02 11:22:54 +01:00
Blake Thompson
5a4f9321d0 A few updates to attempt to fix pixel getting and setting 2015-01-29 16:10:56 -07:00
Sara Metz
f38d2ee69b Fixes bugs that cause tests in PR #2599 to fail 2015-01-30 10:40:50 +13:00
Jiri Drbalek
711fc8ccf2 fix gcc compile 2015-01-29 20:50:37 +00:00
Blake Thompson
826e13f911 Renamed background to fill, added numeric casting to fill utility, changed clog uses to MAPNIK_LOG, changed the implementation of fill some so that it only used a single template 2015-01-29 13:27:42 -07:00
artemp
e3c96666c4 json - make feature_collection_grammar "on-feature" callback based 2015-01-29 12:33:18 +01:00