Paul Norman
eeec7850d0
Don't hard-code bash path in mapnik-config
...
[[ is a bashism, so this script needs bash, but shouldn't assume a location.
2015-05-24 13:16:31 -07:00
artemp
2565dc0975
remove unused boost::tokenizer headers from mapnik/utils
2015-05-15 16:55:30 +01:00
Blake Thompson
0eecbd3e0f
Modified marker cache to store shared_ptrs in order to prevent threading issues and to close #2713
2015-05-04 14:11:41 -05:00
artemp
470da20d53
fix remanining cAmEl case names
2015-05-04 12:49:11 +02:00
artemp
081cf02dcf
fix method signitures to use std::size_t
...
rename getSize() -> size(), getRowSize() -> row_size
2015-05-04 10:57:57 +02:00
Dane Springmeyer
2de1805aa3
make mapnik-config able to report relative paths to share/ data
2015-04-27 16:02:41 -07:00
Dane Springmeyer
0685c43802
followup after #2773 : remove python from install doc,static datasources, utils
2015-04-25 08:21:59 +02:00
Dane Springmeyer
8bb605e2e9
move python bindings out of core #2773 - now at https://github.com/mapnik/python-mapnik
2015-04-24 09:04:00 +02:00
Blake Thompson
87fb41907a
Added template to geometries
2015-04-09 15:22:51 -05:00
Dane Springmeyer
852776d5e3
geometry is_empty refactoring
2015-03-24 14:16:58 -07:00
artemp
4389c80d84
and finaly, rename 'new_geometry' namespace to 'geometry'
2015-03-24 14:21:28 +01:00
artemp
7e03d41606
rename geometry_impl.hpp to geometry.hpp
2015-03-24 13:32:05 +01:00
Dane Springmeyer
95ca3a02f8
update pgsql2sqlite to new geometry
2015-03-22 12:14:11 -07:00
artemp
642bdfa78c
fix geometry_to_wkb utility
2015-03-16 16:14:54 +01:00
artemp
7031099b76
Merge branch 'master' into mapnik-geometry
2015-02-20 17:03:46 +01:00
Blake Thompson
2ebce8e7e1
Updated svg2png for new markers
2015-02-19 12:19:01 -06:00
artemp
5678e55abf
shapeindex - use range based for
loop
2015-02-19 11:04:13 +01: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
Dane Springmeyer
5424c350cd
avoid inf loop on empty point3d shapefile
2015-02-13 00:04:09 -08:00
artemp
884de5a044
fix condition for skipping M (measure) in PointZ
2015-02-12 22:18:00 +01: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
artemp
e19fdad3a6
implement vertex interface in vertex_adapter and make mapnik::geometry_type immutable
2015-02-06 16:45:51 +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
956d936162
fix pep8 linter command + update a few linted files
2015-02-02 10:38:08 -08:00
Blake Thompson
bc28c12572
Found more situations where getRowSize should be used over multiplying the width by the pixel size.
2015-01-27 15:29:43 -06:00
Blake Thompson
22a384ef33
Moved image_data_rgba8 to image_rgba8. Ref #2633
2015-01-21 20:31:02 -06:00
Blake Thompson
93f835177b
Removed all the code for the previous type of image and image_32. Ref #2633
2015-01-21 17:57:16 -06:00
Blake Thompson
badb0c9a97
This is a complete removal of code that utilizes image_32 in the library. It is a sweeping change that does some of the following:
...
* Changes all agg_renderers to use a image_data_any variant (only image_data_rgba8 is implemented currently)
* Changes the marker and marker_cache to use image_data_any images
* Changes the symbolizers so that they must be aware of the source data type they are attempting to render and the render type that is expected to be rendered into.
* Moves many utilities into image_utils, that were previously in image_32.
The kicker is that this still isn't working perfectly yet, but I am commiting so I don't have tears in case everything is lost on my computer.
Ref #2633
2015-01-20 18:30:10 -06:00
Dane Springmeyer
1f25bae0f4
fix compile of svg2png
2015-01-14 21:03:35 -08:00
Dane Springmeyer
fbecd5ff33
always pass image_data to save_to_string/file
2015-01-08 13:54:43 -08:00
artemp
5361d21beb
move mapnik::noncopyable to mapnik::util::noncopyable where it belongs
2015-01-07 13:11:09 +01:00
artemp
18554ec0b1
remove static_visitor usage and rely on automatic result type deduction
...
(NOTE: expression_evaluator requires ```using result_type = T1;``` )
Conflicts:
src/image.cpp
2015-01-07 11:39:06 +01:00
artemp
38da080f82
make concrete image_data type names more expressive and explicit about color channels/depth:
...
image_data_32 -> image_data_rgba8
image_data_8 -> image_data_gray8
image_data_16 -> image_data_gray16
image_data_float32 -> image_data_gray32f
NOTE: currently image_data_gray16::pixel_type = std::int16_t (signed 16 bit int) to match GDAL
should we support unsigned types?
2014-12-04 11:02:42 +01:00
artemp
333965b588
update copyright year
2014-11-20 15:25:50 +01:00
Dane Springmeyer
58f13823af
remove debug print
2014-11-05 13:41:30 -05:00
Dane Springmeyer
c4e4bbf350
nik2img: make params as variables opt-in
2014-11-05 13:41:30 -05:00
Dane Springmeyer
5cd2cd629f
nik2img: optionally make map parameters available as variables
2014-11-04 15:31:51 -05:00
Dane Springmeyer
38cb85a7df
avoid a few more boost warnings
2014-10-27 10:30:36 -07:00
Dane Springmeyer
2ce6a317dd
better defaults for git metadata
2014-10-23 01:00:35 -07:00
Dane Springmeyer
036a3bb14f
only report git metadata for git checkout builds
2014-10-23 00:42:10 -07:00
Dane Springmeyer
a0dc3df575
move mapnik-config back to utils/
2014-10-22 23:46:33 -07:00
Dane Springmeyer
83588937b9
silence boost warnings
2014-10-21 16:37:27 -07:00
Dane Springmeyer
4c07585312
fix #2464
2014-09-30 21:16:29 -07:00
Dane Springmeyer
dc57849b7d
geometry container typedef fixing
2014-09-29 18:40:57 -07:00
Dane Springmeyer
f888e0a9f6
link shapeindex to libicuuc - fixes #2419
2014-09-18 14:29:22 -07:00
Dane Springmeyer
6c4b51eb56
remove unneeded inclusion of box2d.cpp in shapeindex
2014-09-11 10:15:27 -07:00
Dane Springmeyer
afee619e63
support windows in nik2img.cpp
2014-08-31 17:32:48 -07:00
Dane Springmeyer
4f773309f1
fix mapnik::logger usage
2014-08-28 13:59:48 -07:00
Dane Springmeyer
b85ac0d6a5
register fonts in nik2img util
2014-08-22 13:22:12 -07:00
artemp
9f8b88ae4d
we do need <iostrea> in non-debug
2014-08-12 20:08:52 +01:00
artemp
fb2dd283c0
fix DEBUG=yes compilation
2014-08-12 19:10:32 +01:00
artemp
95cea92a4a
convert all boost::variant to util::variant
...
apart from topojson (TODO)
2014-08-12 13:40:45 +01:00
artemp
18a7731d42
AGG line/polygon_pattern_symbolizer add support for SVG patterns
2014-07-31 15:25:22 +01:00
artemp
fe215a684e
c++11 style : replace (almost) all typedef with type alias's
2014-07-07 18:23:15 +01:00
Dane Springmeyer
d0b357cab7
scons: support MAPNIK_NAME option to customize libmapnik name for custom packaging
2014-06-09 13:55:56 -07:00
Dane Springmeyer
57c9aee63d
shapeindex: more consistent error output
2014-05-11 12:41:08 -07:00
Dane Springmeyer
404e221c25
fix #2239
2014-05-11 12:40:24 -07:00
artemp
99bbb10290
c++11 : use int types from <cstdint>
2014-05-06 18:06:47 +01:00
Dane Springmeyer
9e9747ffad
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
src/agg/process_building_symbolizer.cpp
src/cairo_context.cpp
src/cairo_renderer.cpp
src/grid/process_building_symbolizer.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.png
tests/python_tests/images/support/marker-text-line-scale-factor-10.png
tests/python_tests/images/support/marker-text-line-scale-factor-100.png
tests/python_tests/images/support/marker-text-line-scale-factor-2.png
tests/python_tests/images/support/marker-text-line-scale-factor-5.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/test.py
2014-04-24 21:44:28 -07:00
Dane Springmeyer
2e6de5cc97
remove unused variables
2014-03-18 14:09:44 -07:00
Dane Springmeyer
0a26485d28
add simple, c++ version of nik2img
2014-02-10 10:46:48 -08:00
Dane Springmeyer
f286363ad0
more consistent memset/memcpy usage
2014-01-28 15:05:10 -08:00
Dane Springmeyer
777e067770
remove workaround for boost less than 1.46 since 1.47 is now the min needed - refs #1082
2014-01-27 12:24:20 -08:00
artemp
eb3da7d32d
c++11 : use nullptr instead of NULL
2013-11-27 15:54:16 +00:00
Dane Springmeyer
66347f78e6
rework tests: always run locally
2013-11-22 12:01:02 -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
d0619bc402
update copyright year for scons build files
2013-11-05 16:54:13 -08:00
Dane Springmeyer
710d558218
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
Dane Springmeyer
153c7cce60
fix compile of pgsql2sqlite
2013-09-23 11:37:16 -07:00
artemp
0eada70845
+ use const std::unique_ptr< []> instead of boost::scoped_array
2013-09-20 15:01: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
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
Dane Springmeyer
4f01eb05b1
scons: correctly propagate DEFINES across builds
2013-07-23 20:03:00 -04:00
Dane Springmeyer
2533e8137f
fix syntax
2013-07-14 15:28:22 -04:00
Dane Springmeyer
0fa2d4aca7
fix syntax
2013-07-14 15:27:58 -04:00
Dane Springmeyer
75f3eaed67
scons: more linux static linking fixes
2013-07-14 15:26:24 -04:00
Dane Springmeyer
e02a4ebd9d
shapeindex: if statically linking then bring in mapnik dep libs
2013-07-14 13:01:26 -04:00
Dane Springmeyer
4bc28d547b
handle lacking return value handling caught by coverity
2013-07-04 14:31:46 -04:00
Dane Springmeyer
0365d3e081
start centralizing filesystem operations in mapnik::util::fs - refs #1177
2013-06-02 19:28:24 -07:00
Dane Springmeyer
fe6d860fa4
remove mapnik-config.bat (for windows only) which is now versioned in mapnik-packaging repo: 173186c77b
2013-05-23 16:06:07 -07:00
Dane Springmeyer
47e62804be
rundemo.gyp now working on windows
2013-05-23 00:46:55 -07:00
Dane Springmeyer
d5bf5e86c6
fix plugins and fonts path in mapnik-config.bat
2013-05-22 23:46:57 -07:00
Dane Springmeyer
019873a9d2
further fixes to mapnik-config.bat
2013-05-22 22:27:38 -07:00
Dane Springmeyer
a20adb86be
add agg includes directory
2013-05-22 22:12:09 -07:00
Dane Springmeyer
fa7e4e2494
excape path separators to be more gyp friendly
2013-05-22 22:07:00 -07:00
Dane Springmeyer
00035b92d7
add static version of mapnik-config.bat for windows
2013-05-22 21:40:14 -07:00
Dane Springmeyer
bd3ba15638
improve reporting in mapnik-config of new options at 2.0.0
2013-05-21 14:09:49 -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
101ea276d1
add mapnik version number reporting to mapnik-config
2013-05-10 13:45:18 -07:00
Dane Springmeyer
55519212f7
add --all-flags to mapnik-config - closes #1839
2013-05-10 13:27:44 -07:00
Dane Springmeyer
7518c9c2c2
default to clang++ on OS X and start reporting CXX compiler used in mapnik-config - closes #1839
2013-05-10 13:24:41 -07:00
artemp
58927b404c
c++11
...
+ replace BOOST_FOREACH with for( : )
+ remove boost/foreach.hpp
+ fix benchmarks (17,18)
2013-04-24 16:40:35 +01:00
Dane Springmeyer
c55002e9b7
mapnik-config: start reporting dependency link flags again as they are needed to link command line apps (though not for bundles)
2013-04-10 17:05:33 -07:00
Dane Springmeyer
faa78864b6
mapnik-config also add cxxflags to cflags for full backwards compatibility with previous behavior
2013-03-19 00:15:04 -07:00
Dane Springmeyer
28d59decb8
mapnik-utils: make fonts/inputplugins actually relative and dynamically constructed if they can be
2013-03-15 13:31:10 -07:00
Dane Springmeyer
1056038163
formatting
2013-03-14 18:34:21 -07:00
Dane Springmeyer
e2c7283522
Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443
2013-03-13 19:49:59 -07:00
Dane Springmeyer
bdc262d711
remove old versioning strings
2013-03-13 13:06:10 -07:00
Dane Springmeyer
e703629b47
add --cflags - to make things will break without out - we can remove at 3.x
2013-03-02 23:17:03 -05:00
artemp
5826c1c6ec
+ add deps/agg directory
2013-03-01 11:08:58 -05:00
artemp
7ad2d12633
+ treat .h as c++
2013-02-28 13:59:12 -05:00
artemp
0745d07a79
+ use cxxflags option
2013-02-27 10:01:39 -05:00
Dane Springmeyer
4543032a0d
fix dynamic prefix detection on linux - closes #1701
2013-01-25 01:18:29 -08:00
Dane Springmeyer
6f91aaa77d
supress ldflags and dep-libs in mapnik-config if we are statically linking deps
2013-01-23 22:00:25 -08:00
Dane Springmeyer
98a145acd0
avoid hardcoding prefix that mapnik-config knows about and rather determine on the fly based on where it is installed (helps with package building and should be harmless otherwise)
2013-01-23 21:58:04 -08:00
Dane Springmeyer
0e8d224ecb
remove uneeded usage of boost::lexical_cast - refs #1687
2013-01-11 11:11:20 -08:00
Dane Springmeyer
94ff584190
finish complete removal of any trace of cairomm/libsigc++ - amends f25d4d9279
and closes #1681
2013-01-09 12:49:39 -08:00
Dane Springmeyer
d44b4f5749
copy numeric2string function to pgsql2sqlite code (no need to keep in sql_utils.hpp) and fix compile
2013-01-09 11:06:22 -08:00
Dane Springmeyer
bb27156df0
use internal noncopyable class to speed up compile times slightly
2012-12-16 18:19:52 -08:00
artemp
7fd96359dd
+ more tests
2012-12-10 22:06:55 +00:00
artemp
d0de7e872f
+ better stdout
2012-12-03 18:21:32 +00:00
artemp
40175253d6
+ more checks
2012-12-03 18:15:34 +00:00
artemp
46d6026356
+ verify content lengths
2012-12-03 17:47:59 +00:00
artemp
a571aab548
+ utility for interrogating ESRI shape files
2012-12-03 16:49:36 +00:00
Dane Springmeyer
5da14ef9e9
handle demultiplying the png before saving - solves gray halo reported in #1312 (when testing with svg2png utility)
2012-10-03 14:00:48 -07:00
artemp
967d6110bf
+ singleton: return ref from instance() method
2012-09-07 16:23:03 +01:00
Dane Springmeyer
a56c63bed1
start installing agg headers so that c++ programs using mapnik can use more of the mapnik api - closes #1383
2012-08-27 18:45:04 -07:00
Dane Springmeyer
5120d0398d
add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438
2012-08-27 17:58:49 -07:00
Dane Springmeyer
ac418a7d4e
remote the last references
2012-08-27 16:43:40 -07:00
Dane Springmeyer
d9fa1cb0c2
remove old $ cruft
2012-08-24 13:49:28 -07:00
Dane Springmeyer
0533b76a98
fix spelling in mapnik-config
2012-08-24 09:47:59 -07:00
Dane Springmeyer
909802983c
make sure mapnik-config can still report the git revision if git or its metadata is not available via a special file we will create a tagging/tarball stage - closes #1170
2012-08-22 14:44:58 -07:00
Dane Springmeyer
cbd45941b1
remove unmaintained DTD - refs #1402
2012-08-16 13:05:08 -07:00
Dane Springmeyer
d850ee8b76
correct various old trac links to point to github - closes #1396
2012-08-16 12:27:58 -07:00
Dane Springmeyer
e6e7b4c700
svg2png: inflate the rendering canvas to avoid edge affect for 100% w/h svgs
2012-07-30 16:37:34 -07:00
Dane Springmeyer
4288cad41e
svg2png: no need to scale the svg marker down
2012-07-24 14:24:24 -07:00
Dane Springmeyer
2ba016b08b
make the svg2png return value sensitive to auto_open results
2012-07-23 17:52:26 -07:00
Dane Springmeyer
5014694591
allow auto-opening of rendered svg on linux
2012-07-23 17:41:52 -07:00
Dane Springmeyer
e36081a5c0
change geometry_utils::from_wkb to return a bool that signifies if at least one wkb path was parsed - refs #1333 and #1305
2012-07-20 15:09:01 -07:00
artemp
4b4cfdd462
+ link to boost_system if boost_version >= 1.50
2012-07-02 18:10:48 +01:00
artemp
e69c44e3d3
+ use ST_xxx
2012-07-02 17:59:47 +01:00
Dane Springmeyer
09426bf324
remove option to link againt external AGG - our local copy has critical fixes and is required
2012-05-24 17:05:51 -07:00
Artem Pavlenko
a72ee4ba66
Merge branch 'master' into compositing
...
Conflicts:
include/mapnik/image_compositing.hpp
include/mapnik/util/conversions.hpp
include/mapnik/value.hpp
src/agg/agg_renderer.cpp
src/agg/process_line_symbolizer.cpp
src/agg/process_polygon_symbolizer.cpp
src/png_reader.cpp
src/svg_parser.cpp
utils/svg2png/svg2png.cpp
2012-05-01 12:35:49 +01:00
Dane Springmeyer
f8c58c22c6
scons: fixup pgsql2pqlite build by ensuring CXXFLAGS are passed
2012-04-23 12:48:30 -07:00
Dane Springmeyer
c69db365db
scons: pass proper CXXFLAGS to svg2png build
2012-04-23 15:22:04 -04:00
Dane Springmeyer
e986bce7f6
format c++ tests
2012-04-16 22:33:37 -07:00
Dane Springmeyer
9fe698e409
svg2png: better error output
2012-04-11 12:35:07 -07:00
Dane Springmeyer
65f5909e93
svg2png: only open automatically if requested
2012-04-11 10:41:50 -07:00
Dane Springmeyer
14841f6931
svg2png: avoid a few lines of spurious valgrand output re: still reachable xml2 parser structures
2012-04-11 10:17:03 -07:00
Dane Springmeyer
b22d043d80
svg2png: only attempt to open automatically on os x, and do not return after first rendered
2012-04-11 09:49:50 -07:00
Dane Springmeyer
c6c08e50e4
embed version in the epydoc output
2012-04-09 13:54:33 -07:00
Artem Pavlenko
603a6e133b
+ use agg::pixfmt_rgba32
2012-04-03 13:13:37 +01:00
Dane Springmeyer
78b53b4afe
rename dtd
2012-03-14 15:33:55 -07:00
Dane Springmeyer
ba9c6dd220
mapnik-speed-check: ensure the bbox arg is set properly
2012-03-09 12:04:37 -08:00
Dane Springmeyer
c272835335
yet another -fpermissive - refs #1082 , #950 and #1001
2012-02-14 12:03:44 -08:00
Matt Amos
38e7b7cce0
Still need to increment pos counter in shapeindex even when the geometry is null, otherwise reads are possible beyond the end of file.
2012-02-10 15:21:02 +00:00
Dane Springmeyer
3fa794c6ac
whitespace fixes
2012-02-01 17:37:58 -08:00
Dane Springmeyer
6b584e826a
clean up more mapnik2 references
2012-02-01 16:44:50 -08:00
Artem Pavlenko
b90de4874c
Merge branch 'textplacement-merge' into feature-text-merge
...
Conflicts:
docs/textrendering.gv
include/mapnik/building_symbolizer.hpp
include/mapnik/placement_finder.hpp
include/mapnik/symbolizer_helpers.hpp
include/mapnik/text_placements.hpp
include/mapnik/text_placements_list.hpp
include/mapnik/text_placements_simple.hpp
include/mapnik/text_processing.hpp
plugins/input/shape/shape_utils.hpp
src/agg/process_shield_symbolizer.cpp
src/agg/process_text_symbolizer.cpp
src/cairo_renderer.cpp
src/grid/process_shield_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/load_map.cpp
src/placement_finder.cpp
src/shield_symbolizer.cpp
src/text_placements.cpp
src/text_processing.cpp
src/text_symbolizer.cpp
tests/visual_tests/clean.sh
tests/visual_tests/test.py
Merge herm/textplacement-merge
2012-01-31 11:09:55 +00:00