Dane Springmeyer
f8ea04f85f
fix -pthread issue on linux - closes #2132
2014-01-23 13:06:07 -08:00
Dane Springmeyer
1155a6e33d
better library sort
2014-01-23 00:42:41 -08:00
Dane Springmeyer
cd4c645032
boost threads are no longer needed
2014-01-23 00:42:05 -08:00
Dane Springmeyer
499d485151
another try to fix linking order on linux
2014-01-23 00:13:39 -08:00
Dane Springmeyer
83bde5fef2
use premultiplied renderer for points/shields - closes #2117
2014-01-22 22:44:33 -08:00
Dane Springmeyer
7bcbcb0c4f
use premultiplied renderer for points/shields - closes #2117
2014-01-22 22:44:04 -08:00
Dane Springmeyer
4731baab93
use premultiplied renderer for points/shields - closes #2117
2014-01-22 22:43:34 -08:00
Dane Springmeyer
b3ca4fb15f
fix cairo road-casings-non-grouped-rendering test by matching agg clipping behavior
2014-01-22 22:24:47 -08:00
Dane Springmeyer
7520c15e86
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
2014-01-22 20:48:07 -08:00
Dane Springmeyer
97d737fa7b
scons: fix variable name
2014-01-22 00:10:28 -08:00
Dane Springmeyer
4742aea92b
scons: fix variable name
2014-01-22 00:10:11 -08:00
Dane Springmeyer
7ad2e5b43d
finish support for disabling soname on linux
2014-01-21 21:35:10 -08:00
Dane Springmeyer
4fda93bf3e
finish support for disabling soname on linux
2014-01-21 21:34:43 -08:00
Dane Springmeyer
edd0f24997
add ENABLE_SONAME option + embed rpath/loader_path by default - closes #1225
2014-01-21 21:12:55 -08:00
Dane Springmeyer
99bf263afd
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
2014-01-21 21:01:48 -08:00
Dane Springmeyer
0e38731152
add ENABLE_SONAME option + embed rpath/loader_path by default - closes #1225
2014-01-20 20:16:08 -08:00
Dane Springmeyer
2a826e7fc8
fix linux linking order in python bindings
2014-01-20 11:15:10 -08:00
Dane Springmeyer
6c12904eda
fix jpeg reading regression after #1805 - closes #2123 (patch from @clundgren)
2014-01-18 20:40:00 -08:00
Dane Springmeyer
cff13c0ff6
fix jpeg reading regression after #1805 - closes #2123 (patch from @clundgren)
2014-01-18 20:31:47 -08:00
Dane Springmeyer
2b08987903
Merge branch 'master' into expr-v2
2014-01-17 19:59:05 -08:00
artemp
3628b5f237
halo-transform initial impl
2014-01-17 11:47:18 +00:00
Matt Amos
8467d20854
Fixed compile error due to typo in svg_renderer.cpp
2014-01-07 15:38:02 +00:00
Dane Springmeyer
453c29c09f
accept woff (web font) format - closes #2113
2013-12-20 17:19:49 -05:00
Dane Springmeyer
448d093f77
accept woff (web font) format - closes #2113
2013-12-20 17:15:41 -05:00
Matt Amos
6479785648
Merge remote-tracking branch 'upstream/expr-v2' into mla-expr-v2-renderer-common
2013-12-19 14:09:09 +00:00
artemp
f21152a6a9
register target type for symbolizer properties
2013-12-11 17:27:52 -05:00
artemp
7cf452da77
generic ``to_integral
`` helper function (convert strongly typed enumeration values to underlying type)
2013-12-11 17:27:52 -05:00
Dane Springmeyer
6a0e593d87
fix svg_renderer
2013-12-11 07:26:32 -08:00
Dane Springmeyer
d3836bc71a
c++11
2013-12-11 07:25:23 -08:00
Matt Amos
5e13658cf9
Merge remote-tracking branch 'upstream/expr-v2' into mla-expr-v2-renderer-common
2013-12-10 11:47:36 +00:00
artemp
5393a0a9fe
c++11 : use ``constexpr name2int
` switch instead of if/else
2013-12-09 16:15:24 -05:00
Matt Amos
ceaea9a948
Factored out common implementation of polygon symbolizer.
2013-12-09 20:42:00 +00:00
artemp
8e6e6d8c1e
c++11 style for loop
2013-12-09 15:09:37 -05:00
Dane Springmeyer
eca1c6e46b
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
src/load_map.cpp
2013-12-09 11:40:55 -08:00
Matt Amos
dd9584bdd6
Factored out markers symbolizer logic.
...
It's not ideal - there's still a bunch of "dispatch" objects from
which the common elements could be factored for greater
readability.
2013-12-09 18:50:00 +00:00
Matt Amos
f01953e8f7
Factored out common implementation of raster symbolizer.
2013-12-06 18:09:24 +00:00
Matt Amos
da5574d247
Factored out common implementation of point symbolizer.
2013-12-06 17:30:06 +00:00
Matt Amos
05982c4caf
Factored out common code for building symbolizer.
...
There's a lot of code common between symbolizers which do things
like layout, setup, etc... So it seems sensible to extract the
common operations & loops into a single place which is
independent of the actual renderer.
I've started doing this with C++11 lambdas, although that might
not be the best implementation long term. Should be easy enough
to change, though.
2013-12-06 16:33:26 +00:00
Matt Amos
a9627f835b
Factored common renderer code from SVG renderer.
2013-12-06 14:14:14 +00:00
Matt Amos
4f871d1fc7
Factored out common fields from grid renderer.
2013-12-05 19:34:32 +00:00
Matt Amos
ee018dc589
Factor common fields out of cairo renderer.
...
This involved making the freetype engine stack allocated and
accessible via a `shared_ptr` because `FT_Face` elements stored
in it are referenced from cairo structures which persist beyond
the lifetime of the `cairo_renderer` object.
Hopefully this can be resolved in a future commit.
2013-12-05 18:39:09 +00:00
artemp
ca7dfb3428
store meta by const ref
2013-12-05 16:25:56 +00:00
Matt Amos
a76e441174
Factored out common renderer fields.
...
The idea here is that much of the code in the renderers and the
various `process_*` rendering methods is shared, but this sharing
is obfuscated by the lack of sharing of renderer fields and
methods.
This is the first step in trying to factor out commonalities in
order to simplify the implementation of the renderers and make
them easier to understand and modify.
2013-12-05 16:21:55 +00:00
artemp
12bbf55c81
two step parameter parsing and various syntactic sugar tweaks
2013-12-04 16:11:11 +00:00
artemp
37fea12091
load_map : allow optional expressions in symbolizer properties (work-in-progress)
2013-12-04 11:47:36 +00:00
artemp
f83b272a98
fix boost include path
2013-12-03 09:10:51 +00:00
Dane Springmeyer
d13c889d30
fix #2090
2013-12-02 21:51:54 -08:00
Dane Springmeyer
a0d9977e5e
fix #2090
2013-12-02 21:47:25 -08:00
Matt Amos
d64b86dcdf
Updated grid renderer for expr-v2
branch.
...
All the grid visual tests pass.
One small issue is that in the grid line pattern symbolizer it
constructs a 'fake' line symbolizer to re-use code (as the grid
renderer cares nothing for patterns), but doesn't pass the
offset parameter to it. The tests currently require this
behaviour, but they should probably be changed as it seems
incorrect.
2013-12-02 13:49:53 +00:00
artemp
c57d88edb1
c++11 : style
2013-12-02 12:10:47 +00:00
artemp
c8466ae654
use static_assert
2013-11-29 17:00:40 +00:00
Matt Amos
ca3d66236c
Taking out unnecessary member variable added in 1a22a19a
.
2013-11-29 16:37:20 +00:00
Matt Amos
1a22a19a95
Update Cairo renderer so that it compiles.
2013-11-29 16:23:44 +00:00
Dane Springmeyer
e9ca9c8790
symbolizer-expressions replayed against latest master
2013-11-27 22:50:15 -08:00
artemp
eb3da7d32d
c++11 : use nullptr instead of NULL
2013-11-27 15:54:16 +00:00
Dane Springmeyer
64d5153aea
Improved support for international text
...
- Implementation by @herm for GSOC 2012 (http://mapnik.org/news/2012/10/06/gsoc2012-status9/ )
- C++11 port, improvements, optimizations by @artemp
- Testing and integration with master by @springmeyer
- Thank you to all the support from @behdad along the way
- Thanks for help testing @toton6868, @stephankn, @nirvn, @mfrasca, @simonsonc and many others
Refs: #2073,#2070,#2038,#2037,#1953,#1820,#1819,#1714,#1634,#1547,#1532,#1319,#1208,#1154,#1146
2013-11-22 00:06:32 -08:00
Dane Springmeyer
e5bb5ed8aa
backport geojson parsing/generation fixes from master to 2.3.x - refs #2083
2013-11-21 14:11:47 -08:00
artemp
f50e626661
Revert "geojson parser : support 'null' as valid coordinates property (empty geometry)"
...
Per GeoJSON spec :
```
A GeoJSON geometry object of any type other than "GeometryCollection" must have a member with the name "coordinates". The value of the coordinates member is always an array. The structure for the elements in this array is determined by the type of geometry.
```
This reverts commit f9ed2ce4e2d623c14df247db0025a549be29d75c.
2013-11-21 10:10:43 +00:00
artemp
132ace14ab
geojson parser : support 'null' as valid coordinates property (empty geometry)
2013-11-20 16:04:33 +00:00
Dane Springmeyer
03fdf7e596
Merge branch '2.3.x' of github.com:mapnik/mapnik
...
Conflicts:
src/deepcopy.cpp
src/expression.cpp
src/rule.cpp
2013-11-13 20:00:13 -08:00
Dane Springmeyer
5de5ffb764
remove unused and broken deepcopy support to be replaced in #2081 - refs #1390 and #946
2013-11-13 19:26:17 -08:00
Dane Springmeyer
2564c00420
expression parser - avoid extra level of indirection
2013-11-13 18:44:58 -08:00
Dane Springmeyer
2cc3d82a87
iwyu
2013-11-08 19:13:51 -08:00
Dane Springmeyer
c7a6265869
organize text code in subdirectory
2013-11-07 20:09:22 -08:00
Dane Springmeyer
08fa9fd8ec
Merge branch '2.3.x' of github.com:mapnik/mapnik
...
Conflicts:
bindings/python/mapnik_building_symbolizer.cpp
bindings/python/mapnik_debug_symbolizer.cpp
bindings/python/mapnik_line_pattern_symbolizer.cpp
bindings/python/mapnik_line_symbolizer.cpp
bindings/python/mapnik_markers_symbolizer.cpp
bindings/python/mapnik_point_symbolizer.cpp
bindings/python/mapnik_polygon_symbolizer.cpp
bindings/python/mapnik_python.cpp
bindings/python/mapnik_raster_symbolizer.cpp
bindings/python/mapnik_shield_symbolizer.cpp
bindings/python/mapnik_symbolizer.cpp
2013-11-07 09:21:05 -08:00
Dane Springmeyer
f49654b160
png_reader: quote filenames in error output
2013-11-06 16:26:42 -08:00
Dane Springmeyer
6c8a8007e4
best practice: lways define NOMINMAX when including windows.h
2013-11-06 15:34:53 -08:00
Dane Springmeyer
f66fe78c03
png_reader ensure we throw early if a file_source cannot be opened
2013-11-06 15:34:26 -08:00
Dane Springmeyer
d0619bc402
update copyright year for scons build files
2013-11-05 16:54:13 -08:00
Dane Springmeyer
0250538149
add support for geometry-transform in pattern symbolizers - closes #2065
2013-11-05 16:40:09 -08:00
Dane Springmeyer
2db7d7c390
use std namespace for math functions
2013-11-05 15:53:07 -08:00
artemp
afd58da6e2
geojson - feature_collection_parser
...
(allow single feature and geometry input)
2013-11-04 12:39:10 +00:00
Dane Springmeyer
f998b2bda6
Merge branch '2.3.x' of github.com:mapnik/mapnik
...
Conflicts:
deps/agg/build.py
deps/clipper/build.py
include/mapnik/feature_style_processor_impl.hpp
plugins/input/csv/csv_datasource.cpp
2013-11-03 23:10:21 -08:00
Dane Springmeyer
ae0a209295
fix -Wsign-conversion warnings
2013-11-03 23:07:02 -08:00
Dane Springmeyer
6ffd0e9bc2
map size calculations: be explicit about types
2013-11-03 23:07:02 -08:00
artemp
3837c68762
use non-zero filling rule when rasterising lines
2013-10-29 12:26:33 +00:00
artemp
c7a989ae83
first attempt to re-use generic JSON rules in geojson/topojson parsers
2013-10-28 15:57:51 +00:00
artemp
2eaf6a1ead
use even/odd polygon filling rule ref https://github.com/mapbox/tilemill/issues/2110
2013-10-28 15:57:35 +00:00
Dane Springmeyer
9755296091
Merge branch '2.3.x' of github.com:mapnik/mapnik
2013-10-24 00:00:53 -07:00
Dane Springmeyer
dcbbcdd8a9
make label-position-tolerance a double, as it should have been all along
2013-10-23 23:48:24 -07:00
Dane Springmeyer
730f8e36e2
remove dead code
2013-10-23 18:24:35 -07:00
Dane Springmeyer
f14854912c
backport ecf8c20938
from master
2013-10-23 18:24:04 -07:00
Dane Springmeyer
ecf8c20938
completely fix (across various g++ versions) clipping regression - closes #2049
2013-10-23 18:09:22 -07:00
Vross
771964a770
datasource_cache: display correctly the error message
2013-10-23 17:44:27 -07:00
Dane Springmeyer
cb04fc0b34
apply bbox clipping fix to shield symbolizer as applied to text in 96fff72837
- refs #2049
2013-10-23 17:41:24 -07:00
Dane Springmeyer
bc2ee11d9a
fix text related test failures on ubuntu precise/g++-4.7 - refs #2049
2013-10-23 17:41:15 -07:00
Dane Springmeyer
78f7de16b8
apply bbox clipping fix to shield symbolizer as applied to text in 96fff72837
- refs #2049
2013-10-23 17:39:46 -07:00
Dane Springmeyer
96fff72837
fix text related test failures on ubuntu precise/g++-4.7 - refs #2049
2013-10-24 00:33:26 +00:00
Dane Springmeyer
8272b0b3db
remove dead code
2013-10-22 21:13:02 -07:00
Dane Springmeyer
710d558218
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
Vross
43735a65d4
datasource_cache: display correctly the error message
2013-10-21 19:26:40 +02:00
artemp
7adee4ab36
c++11 : remove boost::make_shared includes
2013-10-17 15:09:56 +01:00
artemp
e231117504
== c++11
...
+ remove remaining boost::thread usage
+ don't link to boost_thread
2013-10-11 14:18:35 +01:00
artemp
582ca02f44
remove unused boost.thread includes
2013-10-11 13:39:39 +01:00
artemp
0e40b3c87d
== c++11
...
use std::thread (removes boost.thread dependency)
2013-10-11 13:20:46 +01:00
artemp
3edfc69c81
== c++11
...
use std::tuple with std::get<>
2013-10-11 12:36:04 +01:00
artemp
7f035f9226
+ remove unused vertex tags
2013-10-10 13:43:59 +01:00
artemp
89586fbdf1
+ only extract expected types from mapnik::parameters
...
aka mapnik::value_xxx types
2013-10-09 15:32:47 +01:00
Dane Springmeyer
ddf2226b6f
merge with branch 2.3.x
2013-10-05 15:37:29 -07:00
Dane Springmeyer
2b1a725f15
handle conditional compile of webp options not available before webp-v0.1.99
2013-10-04 13:34:07 -07:00
Dane Springmeyer
cd27e521d4
update webp defaults to use WebPConfigInit
2013-10-04 12:59:47 -07:00
Dane Springmeyer
0c1fcd7098
expose all remaining webp encoding options except for 'show_compression' - refs #1964
2013-10-04 01:03:20 -07:00
Dane Springmeyer
732fefb9e1
webp: use WebPConfig instead of custom options struct
2013-10-04 00:24:30 -07:00
Dane Springmeyer
be7d0a55c2
webp: cleanup option handling
2013-10-03 23:59:10 -07:00
Dane Springmeyer
0fb718a4fd
default to hextree encoding for 'png' format + png options cleanup
2013-10-03 23:40:19 -07:00
Dane Springmeyer
0224ce3019
add support for seamless blurring - closes #1478
2013-10-03 16:37:09 -07:00
Dane Springmeyer
8e9028e931
use std::fabs not fabs
2013-10-03 13:28:42 -07:00
Dane Springmeyer
f9e630bbd3
Merge remote-tracking branch 'origin/2.3.x'
2013-10-02 18:23:09 -07:00
Dane Springmeyer
d84443b4f3
fix unsigned integer overflow when passing args to composite_bitmap
2013-10-01 21:29:22 -07:00
Dane Springmeyer
61dde4b093
fix several -Wsign-compare warnings
2013-10-01 11:48:27 -07:00
Dane Springmeyer
3dba53e333
fix several -Wsign-compare warnings
2013-10-01 11:47:47 -07:00
Dane Springmeyer
c34c8a568f
merge with branch 2.3.x
2013-09-30 13:33:28 -07:00
Dane Springmeyer
82e1b37281
allow single color colorize-alpha
2013-09-27 16:11:23 -07:00
Dane Springmeyer
2010f5f1d9
Merge branch '2.3.x' of github.com:mapnik/mapnik
2013-09-26 20:08:01 -07:00
Dane Springmeyer
68ff3ceead
add color-to-alpha image-filter - closes #2023
2013-09-26 16:14:40 -07:00
Dane Springmeyer
0f4ba4dfd5
sync with 2.3.x branch
2013-09-25 20:04:31 -07:00
Dane Springmeyer
8e047aa98e
raster_colorizer: avoid color copy by return unsigned from get_color
2013-09-25 14:58:32 -07:00
Dane Springmeyer
7aeff3fb59
followup nodata refactor - refs #2023
2013-09-25 14:38:07 -07:00
Dane Springmeyer
681f8853d3
pull in changes from master
2013-09-24 22:57:01 -07:00
Dane Springmeyer
2c46300f61
remove dead code (colorize-alpha is now officially an image-filter)
2013-09-24 17:18:14 -07:00
artemp
f76b020e5e
+ remove redundant identity matrix and pass 0 to FT_Set_Transform
2013-09-24 14:44:47 +01:00
Dane Springmeyer
63f97fa4aa
lessen header interdependence between placement_finder.hpp and symbolizer_helpers.hpp
2013-09-23 11:42:47 -07:00
Dane Springmeyer
a1bf65210d
Merge branch 'master' of github.com:mapnik/mapnik
2013-09-22 22:07:55 -07:00
Dane Springmeyer
85fc82c03b
fix #2018
2013-09-22 22:07:35 -07:00
artemp
0eada70845
+ use const std::unique_ptr< []> instead of boost::scoped_array
2013-09-20 15:01:58 +01:00
artemp
09ce29489e
use const std::unique_ptr<> instead of boost::scoped_ptr<>
2013-09-20 14:22:58 +01:00
artemp
62af2e6765
+ replace <boost/shared_ptr.hpp> with <memory>
2013-09-20 14:13:23 +01:00
artemp
b315eb2167
+ use std::shared_ptr and std::make_shared
2013-09-20 14:01:27 +01:00
Dane Springmeyer
b0436a3ad1
scons: unbreak memory mapped access for shapefiles by fixing the setting of SHAPE_MEMORY_MAPPED_FILE
2013-09-19 20:51:49 -07:00
Dane Springmeyer
0619477238
optimize rule::active which is called in loop in feature_style_processor_impl
2013-09-19 20:24:59 -07:00
Dane Springmeyer
9df4deac73
consistent use of agg::rgba8_pre to construct premultiplied colors - refs #2011
2013-09-19 19:41:46 -07:00
Dane Springmeyer
5b78b6b2dc
fix #2011
2013-09-19 19:19:11 -07:00
Dane Springmeyer
576271d5ca
merge
2013-09-19 18:40:48 -07:00
Dane Springmeyer
9bd3dd0e21
fix viewer compile
2013-09-19 18:39:44 -07:00
Dane Springmeyer
25ee36f74e
merge
2013-09-18 20:41:20 -07:00
Dane Springmeyer
1b3e07ef23
c++ style
2013-09-18 20:35:14 -07:00
Dane Springmeyer
df352efc8f
use std::size_t in wkb parser
2013-09-18 20:31:59 -07:00
Dane Springmeyer
35a42b49e6
cast to int
2013-09-18 20:29:59 -07:00
Dane Springmeyer
9aff3c596b
better type handling/casts
2013-09-18 20:29:26 -07:00
Dane Springmeyer
69cdca27a2
merge with master
2013-09-18 19:54:49 -07:00
Dane Springmeyer
111bdccebc
various post-merge fixes
2013-09-18 19:51:14 -07:00
Dane Springmeyer
5cd2152866
fix failing halo rendering visual tests
2013-09-18 19:50:30 -07:00
Dane Springmeyer
ee2378a6d2
port minor fixes around type handling from c++11 branch
2013-09-18 19:50:04 -07:00
Dane Springmeyer
d3d750ebf7
merge with master
2013-09-18 19:06:11 -07:00
Dane Springmeyer
30c8ca5f66
minor formatting to sync cleaner with master
2013-09-18 19:04:44 -07:00
Dane Springmeyer
9770985ead
port box2d cleanups from c++11 branch to master
2013-09-18 19:04:20 -07:00
Dane Springmeyer
d2f50a0158
no need to define BOOST_SPIRIT_USE_PHOENIX_V3 in each header, it is now set in SConstruct
2013-09-18 18:27:04 -07:00
Dane Springmeyer
33766e9370
merge with master
2013-09-18 13:56:23 -07:00
artemp
ec0bdb21ad
Merge branch 'geometry-types' into c++11
2013-09-16 14:18:22 +01:00
Dane Springmeyer
d3ab601e30
integrate various minor c++ style and cast fixes into master from c++11 branch
2013-09-15 23:08:04 -07:00
Dane Springmeyer
b6040ac324
correct return type from std::string::substr
2013-09-15 21:12:12 -07:00
artemp
b690015d63
Merge branch 'master' into c++11
2013-09-09 12:32:47 +01:00
Dane Springmeyer
c5dd5487a5
Merge pull request #1966 from mapnik/background-image-comp-op
...
Map background-image-comp-op and background-image-opacity
2013-09-05 12:25:47 -07:00
artemp
d4b9a48cb1
+ geometry::types Exterior/Interior polygon loops
2013-09-03 12:15:31 +01:00
artemp
4ea16b596e
Merge branch 'master' into c++11
2013-09-02 09:50:59 +01:00
Dane Springmeyer
02f2fbdf8b
always link libdl on linux - needed on some systems after #1804 - closes #1998
2013-09-01 22:02:52 -07:00
artemp
4f4e2b001e
Merge branch 'master' into c++11
...
Conflicts:
SConstruct
benchmark/run.cpp
bindings/python/mapnik_datasource.cpp
bindings/python/mapnik_feature.cpp
bindings/python/python_optional.hpp
include/mapnik/css_color_grammar.hpp
include/mapnik/expression_grammar.hpp
include/mapnik/feature.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/image_filter_types.hpp
include/mapnik/image_util.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_grammar.hpp
include/mapnik/processed_text.hpp
include/mapnik/tiff_io.hpp
include/mapnik/util/geometry_svg_generator.hpp
include/mapnik/util/geometry_wkt_generator.hpp
include/mapnik/utils.hpp
include/mapnik/webp_io.hpp
include/mapnik/wkt/wkt_grammar.hpp
plugins/input/shape/shape_datasource.cpp
plugins/input/shape/shapefile.hpp
src/expression_grammar.cpp
src/expression_string.cpp
src/image_util.cpp
src/json/feature_collection_parser.cpp
src/json/feature_parser.cpp
src/miniz.c
src/symbolizer_helpers.cpp
src/tiff_reader.cpp
src/webp_reader.cpp
tests/cpp_tests/geometry_converters_test.cpp
tests/cpp_tests/image_io_test.cpp
tests/cpp_tests/map_request_test.cpp
tests/python_tests/image_test.py
tests/visual_tests/test.py
2013-08-30 09:46:09 +01:00
Petr Dlouhý
69185339a5
offset enabled for LinePatternSymbolizer
2013-08-22 10:35:44 +02:00
Dane Springmeyer
1a8287da06
Add support for webp:alpha=false to create rgb images without alpha + other webp encoding cleanups - closes #1986
2013-08-15 14:47:28 -04:00
Dane Springmeyer
5667343ad9
use U_NAMESPACE_QUALIFIER to most cleanly support when icu is built with -DU_USING_ICU_NAMESPACE=0 - refs #1985
2013-08-14 21:56:40 -04:00
Dane Springmeyer
750b4e144b
gracefully handle when icu is built without BreakIterator support: -DUCONFIG_NO_BREAK_ITERATION=1
2013-08-13 19:32:20 -04:00
Dane Springmeyer
b6df3848c4
use icu:: namespace
2013-08-13 19:20:13 -04:00
Dane Springmeyer
e0026f3df2
use icu:: namespace and start isolating icu impl by consistenly using mapnik::value_unicode_string
2013-08-13 18:52:04 -04:00
Dane Springmeyer
4eef244e73
move SHAPE_MEMORY_MAPPED_FILE to be a global define
2013-08-13 14:48:04 -04:00
Dane Springmeyer
134cbc3eec
forward declare mapped_region in mapped_memory_cache.hpp and other shared memory fixups
2013-08-13 14:13:56 -04:00
Dane Springmeyer
29abb9a7c0
remove unused typedefs - exposed by saucy g++ warnings
2013-08-07 20:59:28 -04:00
Dane Springmeyer
60b2cef365
remove unused typedef
2013-08-07 20:49:28 -04:00
Dane Springmeyer
78b4980352
finish exposing mapnik.Feature.from_geojson
2013-07-30 15:45:46 -04:00
Dane Springmeyer
844baa8c5b
scons: when linking statically on linux always link -ldl
2013-07-30 02:51:07 -04:00
Dane Springmeyer
4ee91a4a25
fix narrowing issue in miniz - closes #1967
2013-07-28 15:49:11 -04:00
Dane Springmeyer
889546ab05
fix up type casting
2013-07-28 15:45:36 -04:00
Dane Springmeyer
76f111cc97
support optionally compiling with -std=c++11 on OSX / clang / apple libc++ / boost 1.53 - refs #1683
2013-07-27 01:57:24 -04:00
Dane Springmeyer
4eda02592e
fix debug.cpp error output (now compiles against libc++)
2013-07-26 19:33:35 -04:00
Dane Springmeyer
fad9af5263
add support for applying custom comp_op and opacity when blending map background image into background color at render time - refs mapnik/mapnik-support#8
2013-07-25 01:00:38 -04:00
Dane Springmeyer
4f01eb05b1
scons: correctly propagate DEFINES across builds
2013-07-23 20:03:00 -04:00
Dane Springmeyer
ef4dfeb747
make it possible to disable compilation of grid_renderer - closes #1962
2013-07-23 19:37:25 -04:00
Dane Springmeyer
5ad2ebb30e
iwyu
2013-07-23 18:59:05 -04:00
Dane Springmeyer
cfc977e6cd
deal with various -Wunused-parameter warnings that are not important
2013-07-23 18:46:54 -04:00
Dane Springmeyer
827a9d147a
code cleanup
2013-07-23 18:46:40 -04:00
Dane Springmeyer
7a6117b18d
remove dead code and iwyu
2013-07-23 18:46:19 -04:00
Dane Springmeyer
c49d94fdf7
iwyu
2013-07-23 18:45:25 -04:00
Dane Springmeyer
84842f59c7
use pixfmt pre for the sake of clarity
2013-07-23 18:44:39 -04:00
Dane Springmeyer
6269b42ffc
iwyu
2013-07-23 18:41:59 -04:00
Dane Springmeyer
3bd2e6501f
fix a batch of unused variable warnings (leaving several with are true bugs/missing features)
2013-07-23 15:51:22 -04:00
Dane Springmeyer
4d3ab5e3aa
agg_renderer: remove uneeded define of AGG_RENDERING_BUFFER row_ptr_cache<int8u> since it is already hardcoded in agg_renderer_buffer.h and agg_config.h
2013-07-22 14:49:10 -04:00
Dane Springmeyer
236c8221af
miniz: remove MINIZ_NO_STDIO as it is uneeded since it is covered by catchall MINIZ_NO_ARCHIVE_APIS
2013-07-22 14:29:46 -04:00
Dane Springmeyer
5c13504cc0
remove unreachable break
2013-07-22 14:17:59 -04:00
Dane Springmeyer
1c6f449ba8
comment unused typedefs
2013-07-22 14:17:43 -04:00
Dane Springmeyer
3864fada72
pass string by const ref
2013-07-19 15:46:01 -04:00
Dane Springmeyer
6bbbe155fe
remove RENDERING_STATS compile time option - refs #1956
2013-07-19 15:09:59 -04:00
Dane Springmeyer
512f06fa44
scons: only compile optional cpp files that really can be built
2013-07-19 12:49:44 -04:00
Dane Springmeyer
f999615cec
ensure agg rendering buffer uses proper dimensions since these may become more dynamic in the near future - refs #1478
2013-07-19 01:29:01 -04:00
Dane Springmeyer
a141c5c27d
webp encoding/decoding support - refs #1955
2013-07-19 01:09:17 -04:00
Dane Springmeyer
0872061993
renable hsla filter as 'scale-hsla' - refs #1954
2013-07-19 00:37:51 -04:00
artemp
cbfe228790
+ improve c++ style
...
+ formatting
2013-07-16 11:16:52 +01:00
Dane Springmeyer
43723d3f81
scons: link zlib last
2013-07-15 00:19:03 -04:00
Dane Springmeyer
09aad15eb2
display png error when we cannot read a png
2013-07-14 16:32:32 -04:00
Dane Springmeyer
86bc7d6c11
fix svg parser to ignore empty groups - closes #1944
2013-07-10 17:25:34 -04:00
Dane Springmeyer
63a06a9aab
fix handling of opacity when rendering svg with cairo - closes #1943
2013-07-10 16:19:28 -04:00
Dane Springmeyer
c011524b67
add mapnik.Image.premultiplied() to query status of pixel premultiplication
2013-07-02 16:01:23 -04:00
Dane Springmeyer
3ae432ac96
fix behavior of marker-ignore-placement on lines - closes #1931
2013-06-28 15:53:08 -04:00
Dane Springmeyer
25dabd6f24
support scale_denominator override in save_to_cairo_file - closes #1930
2013-06-27 20:07:25 -04:00
Dane Springmeyer
fd428cf11b
svg_renderer: group layers in inkscape capatible way - refs #1917
2013-06-24 20:29:57 -07:00
Dane Springmeyer
4c4a63aa9c
svg_renderer: only process line/polygon symbolizers as <path> for now
2013-06-24 20:28:02 -07:00
Dane Springmeyer
d1f1104ebe
svg_renderer: start paying attention to scale_factor, collision, and fonts
2013-06-24 20:26:30 -07:00
Dane Springmeyer
18ab68f03f
iwyu
2013-06-21 12:00:48 -07:00
artemp
ed163817ab
+ fix typo in grammar
2013-06-21 19:37:56 +01:00
Dane Springmeyer
ecf0ce2d2d
catch boost::filesystem::directory_iterator::construct error and print warning rather than throwing exception - closes #1919 - refs mapbox/tilemill#1992
2013-06-21 11:18:42 -07:00
artemp
9b2703f557
+ to_string based on spirit::karma for completeness.
2013-06-21 14:47:38 +01:00
artemp
66185a2262
spirit::karma based to_hex_string generator
2013-06-21 11:33:26 +01:00
Dane Springmeyer
e3c5ae9cf4
svg_renderer: use precision of 4, accept map request/scale_factor, and fix output of multipart geometries
2013-06-20 21:27:42 -07:00
Dane Springmeyer
b1a50d1000
iwyu
2013-06-18 14:26:58 -07:00
Dane Springmeyer
215c9e9123
iwyu
2013-06-06 13:10:56 -07:00
Dane Springmeyer
ff14a8e350
revert f4d2fbac4
- refs #1177
2013-06-03 17:21:27 -07:00
Dane Springmeyer
c6da53af9a
fix spelling of error message in png reader - refs #1871
2013-06-03 15:38:30 -07:00
artemp
f4d2fbac43
+ #1177 via @springmeyer
...
(TODO: check if loading the whole font file is required for registering)
2013-06-03 09:15:37 +01:00
Dane Springmeyer
3b2bdba7b0
iwyu
2013-06-02 20:19:33 -07:00
Dane Springmeyer
205fe7eaf8
iwyu
2013-06-02 20:04:51 -07:00
Dane Springmeyer
0365d3e081
start centralizing filesystem operations in mapnik::util::fs - refs #1177
2013-06-02 19:28:24 -07:00
Dane Springmeyer
ff88efc1fd
proper c++ cast
2013-06-02 17:34:44 -07:00
Dane Springmeyer
1036eb1c99
support base_path adjustment when reading from xml file as well as from a string
2013-06-02 16:24:21 -07:00
Dane Springmeyer
e51c59aacc
fix #1886 - TODO - refactor base_path logic since it is confusingly written
2013-06-02 16:06:32 -07:00
Dane Springmeyer
ef1b99532b
scons: fix boost_regex and sqlite_rtree config checks and be resilient to plugins that cannot be built due to the boost version
2013-06-02 14:56:21 -07:00
Dane Springmeyer
7c8dbacdb6
fix compile against boost 1.47 - closes #1885
2013-06-02 13:32:15 -07:00
Dane Springmeyer
dcc4981b13
mapnik-config: report which plugins are statically compiled by providing defines
2013-06-02 13:30:46 -07:00
Dane Springmeyer
b0f15bf5de
avoid muffling proj_init at render time and instead catch at load_map - closes #646
2013-05-29 15:16:44 -07:00
Dane Springmeyer
7302b3b654
fix #1865
2013-05-24 16:45:02 -07:00
Dane Springmeyer
9107046508
avoid including cairo-ft in header
2013-05-22 23:23:22 -07:00
Dane Springmeyer
95d5b73d86
fix reading inline csv data and reading from an xml string when building with ptree/rapidxml - closes #1857 and closes #1856
2013-05-22 09:13:33 -07:00
artemp
a3eaebd5e1
feature_at_point
...
+ use 'tol' where possible
2013-05-22 16:40:26 +01:00
Dane Springmeyer
a6ef710f74
Add file I should have added in 8634a04938
2013-05-21 21:01:07 -07:00
Dane Springmeyer
ce34be6aab
fix #1853
2013-05-21 20:18:37 -07:00
Dane Springmeyer
8634a04938
add support for drawing all geometry verticies with debug symbolizer mode=vertex and expose in python - closes #1848
2013-05-21 19:21:35 -07:00
Dane Springmeyer
018bdc4f6d
fix interplay of point symbolizer/cairo/scale_factor
2013-05-21 08:46:07 -07:00
artem@windows
35a8582043
put implementatio into .cpp to avoid exposing <windows.h>
2013-05-20 13:43:31 -07:00
Dane Springmeyer
84a15f9090
iwyu
2013-05-20 12:50:26 -07:00
artem@windows
15e059a9ac
put implementatio into .cpp to avoid exposing <windows.h>
...
Conflicts:
include/mapnik/utils.hpp
2013-05-20 14:54:06 +01:00
Dane Springmeyer
a992ab4985
add missing file from 3fbf4df67d
2013-05-16 12:03:30 -07:00
Dane Springmeyer
3fbf4df67d
add support for statically linking datasource input plugins - closes #1810 and #1821 - refs #249
2013-05-16 11:55:58 -07:00
Dane Springmeyer
9c66d0ec1d
move expresion_grammar impl to impl header
2013-05-15 18:24:49 -07:00
Dane Springmeyer
bedcde02cb
rename css_color_grammar_def.hpp -> css_color_grammar_impl.hpp to be consistent with other headers
2013-05-15 18:23:46 -07:00
artemp
8d5b983cb6
Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max)
2013-05-14 15:02:05 +01:00
artemp
0e5013fb03
+ add feature_parser implementation
2013-05-14 14:55:08 +01:00
artemp
417ac21529
+ cleaup old comment
2013-05-14 14:53:27 +01:00
artemp
4948fd8992
+ add feature_parser.cpp
2013-05-14 14:52:58 +01:00
artemp
5d0c36fb65
Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max)
2013-05-14 14:51:28 +01:00
artemp
d83935a8e0
* restore operator%= support - explicit pnoenix::construct<mapnik::expr_node> on rhs
...
* move fwd decl into main mapnik namespace
* c++ style formatting
2013-05-14 12:28:13 +01:00
Dane Springmeyer
2ec04ab9e3
fix tiff compile against older than tiff 4.x
2013-05-13 11:00:21 -07:00
artemp
15ff3dcec4
TIFF I/O
...
+ use generic std::istream
+ add open from char const* and size factory method
2013-05-13 07:31:41 -07:00
artemp
245e71d735
TIFF I/O
...
+ use generic std::istream
+ add open from char const* and size factory method
2013-05-13 10:26:28 +01:00