sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12359 commits 112 branches 95 tags 181 MiB
Commit graph

12359 commits

This branch
This branch
All branches
Author SHA1 Message Date
artemp
960794b7a0 fix copyright 2015-02-09 13:47:29 +01:00
artemp
1ecf3f0889 use const ref when iterating over geometries in feature 2015-02-09 13:46:01 +01:00
artemp
146dc1c094 fix copyright 2015-02-09 11:38:08 +01:00
artemp
2ece72658a Merge branch 'master' into vertex_adapter 2015-02-09 10:05:02 +01:00
Artem Pavlenko
827e8a29a4 Merge pull request #2689 from mapycz/prefer-stl 
prefer STL implementation
 2015-02-09 10:03:59 +01:00
artemp
5e6468f9bf update viewer to use vertex_adapter 2015-02-09 10:01:31 +01:00
Jiri Drbalek
02dff77fff add visual test - marker direction 2015-02-07 12:23:36 +00:00
Jiri Drbalek
1cd5e69b3a add direction property for markers 2015-02-07 12:23:35 +00:00
Jiri Drbalek
87cc1347c7 move normalize_angle to utils 2015-02-07 12:23:17 +00: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
Jiri Drbalek
1bb1653e69 prefer STL implementation 2015-02-06 16:13:31 +00:00
artemp
e19fdad3a6 implement vertex interface in vertex_adapter and make mapnik::geometry_type immutable 2015-02-06 16:45:51 +01:00
Jiri Drbalek
35d6769448 update visual tests - prefer hyphens as word separator in enums 2015-02-06 15:42:43 +00:00
Jiri Drbalek
5418b8ea40 prefer hyphens as word separator for enum values 2015-02-06 15:37:28 +00:00
Even Rouault
7c44b2412e gdal.input: take into account nodata_tolerance in optimized code path 
Solves failures of https://travis-ci.org/mapnik/mapnik/jobs/49647112
on tiff-nodata-edge-rgba and tiff-nodata-tolerance tests
 2015-02-06 00:41:57 +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
Even Rouault
efdca26f2d gdal.input: optimize nodata handling in RGB case 
When the data type is Byte, instead of reading a first time
the red band to deduce the value of the alpha component of
the output image, read the RGB bands first.
 2015-02-05 20:38:27 +01:00
Even Rouault
073bad21c0 gdal.input: use GDALDataset::RasterIO() to read RGB sources 
Enabled when the R,G,B channels are bands 1, 2 and 3
And also read the alpha channel at the same time, if it is band 4
 2015-02-05 20:33:52 +01: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
06ef081282 Another set of fixes for the compare SSE code, added test where it was failing 2015-02-04 18:26:18 -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
8faf04663c update tests/python_tests/geojson_plugin_test.py 2015-02-04 18:34:53 +01:00
artemp
3331368e05 amend test 2015-02-04 18:29:03 +01: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
e14fc117fd Merge pull request #2652 from mapycz/add-text-upright-auto-down 
add text upright auto-down
 2015-02-04 07:44:27 +01:00
Jiri Drbalek
56adb32701 add visual test - text upright 2015-02-03 16:32:23 +00:00
Jiri Drbalek
1fcbdc3e98 add upright value auto-down 2015-02-03 16:08:36 +00:00
artemp
eec661d263 geojson plugin 
* use parse_geojson(Iterator start, Iterator end) signiture
* use Iterator = char const*
* remove unneeded I/O in 'initialise_index'
* use memory mapped file (currently #if/def)
 2015-02-03 13:37:49 +01: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
0e017be98d merge with master + fixups 2015-02-03 00:38:55 -08: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
192f62ecbf turn off default debug prints 2015-02-02 22:57:16 -08:00
Dane Springmeyer
5551cae0be cache GDALDataset object for re-use 2015-02-02 22:50:17 -08:00
Dane Springmeyer
a60a3855a1 travis cleanups 2015-02-02 22:09:03 -08:00
Dane Springmeyer
047a27925f bootstrap cleanups 2015-02-02 22:08:52 -08:00
Dane Springmeyer
cf38337121 Merge pull request #2676 from mapnik/pycairo 
Build and test against pycairo - refs #2675
 2015-02-02 21:31:41 -08:00
Dane Springmeyer
d915e1e634 update a few more visual tests 2015-02-02 21:26:09 -08:00
Dane Springmeyer
8670655012 build and test against pycairo - refs #2675 2015-02-02 20:30:59 -08:00
Dane Springmeyer
3e43c692cc update visual test images after #2671 2015-02-02 20:23:45 -08:00
Dane Springmeyer
d9e49fd09a tests: support regenerating test images in more python tests 2015-02-02 19:00:09 -08:00
Dane Springmeyer
f0b0ee3e7e scons: collect pycairo flags at configure time 2015-02-02 18:59:29 -08:00
Dane Springmeyer
8d956f3018 add @flippmoke to authors in alpha order 2015-02-02 14:11:57 -08:00
Dane Springmeyer
09914584ea Add @sarametz to authors - refs #2671 2015-02-02 14:10:24 -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