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
30c6cf636c
make path replace portable
2015-02-10 23:49:00 -08:00
Dane Springmeyer
7d2b34d654
finish fixing windows build - closes #2698
2015-02-10 19:02:32 -08:00
Dane Springmeyer
8608ea3308
only enable geojson memory mapped files if SHAPE_MEMORY_MAPPED_FILE defined (TODO: rename this define) - refs #2698
2015-02-10 18:50:27 -08:00
Dane Springmeyer
1dc5452c74
msvs 2014 compile fixes
2015-02-10 18:20:08 -08:00
Dane Springmeyer
e475464bc9
bootstrap: no trailing slashes in PROJ_LIB and ICU_DATA
2015-02-10 15:18:47 -08:00
Dane Springmeyer
d08e84794f
use curl for nose download
2015-02-10 12:51:22 -08:00
Dane Springmeyer
2042ffd824
avoid need to instanciate expensive svg_path_generator twice
2015-02-10 12:16:01 -08:00
Artem Pavlenko
4e5522756a
Merge pull request #2688 from mapnik/vertex_adapter
...
implement vertex interface in vertex_adapter and make mapnik::geometry_type immutable
2015-02-10 19:09:22 +01:00
artemp
109e104971
Merge branch 'master' into vertex_adapter
2015-02-10 15:13:23 +01:00
Artem Pavlenko
38aff0a2a2
Merge pull request #2697 from mapycz/std-replace
...
prefer stl over boost
2015-02-10 15:12:41 +01:00
Jiri Drbalek
310011a8b9
prefer stl over boost
2015-02-10 12:46:10 +00:00
Dane Springmeyer
6d611b8e1a
cleanup commented code
2015-02-09 23:28:27 -08:00
Dane Springmeyer
41ed56df14
Merge branch 'master' of github.com:mapnik/mapnik into vertex_adapter
2015-02-09 18:16:57 -08:00
Dane Springmeyer
2bc761d99a
fixup harfbuzz version check - refs #2694 #2544
2015-02-09 17:52:09 -08:00
Dane Springmeyer
ec2d644f6b
Merge pull request #2694 from mapycz/scons-harfbuzz-version
...
scons: check for harfbuzz version
2015-02-09 17:28:52 -08:00
Dane Springmeyer
59f9d802ed
Merge pull request #2696 from mapnik/ogr-extra-meta
...
Report proj4 string in extra metadata for ogr plugin - refs #2650
2015-02-09 16:30:01 -08:00
Dane Springmeyer
578f8a7c29
report proj4 string in extra metadata for ogr plugin - refs #2650
2015-02-09 15:46:00 -08:00
Dane Springmeyer
0e137cd6ee
iwyu
2015-02-09 14:18:15 -08:00
Blake Thompson
d31bf5b171
Updated tests from cast to copy
2015-02-09 13:46:48 -08:00
Dane Springmeyer
56d1818862
Makefile clean: remove duplicate pyc cleanup
2015-02-09 13:20:39 -08:00
Jiri Drbalek
4fcf0ea3e8
scons: check for harfbuzz version
2015-02-09 14:15:22 +00:00
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
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
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
