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

6801 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dane Springmeyer
0639d54db4 fix compile error with boost 1.49 - closes #2467 2015-01-08 20:57:33 -08:00
Dane Springmeyer
1b9ba41f96 travis updates 2014-10-03 17:49:31 -07:00
Dane Springmeyer
d8fd967c99 also test with gcc 2014-10-03 17:45:23 -07:00
Dane Springmeyer
1ffa0f2b94 travis: port fixes from 2.3.x branch 2014-09-22 23:39:06 -07:00
Dane Springmeyer
6a3b0634fe backport geojson plugin fixes from master - refs #2319 and 2367 
Conflicts:
	plugins/input/geojson/geojson_datasource.cpp
 2014-09-22 23:35:39 -07:00
Dane Springmeyer
29b717f9f6 adapt to new rtree interface in boost geometry >= 1.56 - refs #2367 
Conflicts:
	plugins/input/geojson/geojson_datasource.cpp
 2014-09-22 23:24:36 -07:00
Dane Springmeyer
8c4a5d53d3 boost 1.56 support 2014-09-22 23:22:05 -07:00
Dane Springmeyer
9c947232e9 adapt to ptree change in boost 1.56 - closes #2365 2014-09-22 14:28:41 -07:00
Dane Springmeyer
5dd79e88c0 fix css_grammar compile error with boost 1.56 - close #2366 
Conflicts:
	SConstruct
 2014-09-22 14:28:37 -07:00
Dane Springmeyer
08f651289d fix compile with boost 1.56 - refs #2368 2014-09-22 14:26:48 -07:00
Dane Springmeyer
3fc6e1282f fix skipping of empty text nodes in rapidxml parser (matches libxml2) - closes #2253 2014-06-17 21:48:10 -07:00
Dane Springmeyer
9e03ace209 rapidxml: validate closing tags like libxml2 parser (no overhead measurable seen) 2014-06-17 21:48:02 -07:00
Dane Springmeyer
ec089dcaea scons: fix curl linking when curl is static 2014-06-17 21:46:38 -07:00
Dane Springmeyer
f0821d897f improvements to GDAL 2.x handling - refs #2259 amends cbdd112223 2014-06-17 21:40:15 -07:00
Dane Springmeyer
f68291c5b4 support for GDAL >= 2.0 in ogr plugin - refs #2259 2014-06-17 21:40:02 -07:00
Dane Springmeyer
d269ce3bb3 scons: fix parsing of gdal libs when building against mapnik-packaging 2014-06-17 21:34:57 -07:00
Dane Springmeyer
8e8794790a Merge pull request #2192 from strk/2.2.x-no-terminate-pgis-dtor 
Do not throw in postgis_datasource destruction if backend is down
 2014-04-04 18:20:52 -07:00
Sandro Santilli
189d86ddd7 Do not throw in postgis_datasource destruction if backend is down 
... and persist_connections is true!
Closes #2191
 2014-03-26 15:32:09 +01:00
Dane Springmeyer
e3a456f846 postgis: use max float for no-op bbox token - closes #2158 2014-03-13 15:20:35 -07:00
Dane Springmeyer
c32b9b6788 Merge pull request #2175 from strk/2.2.x-segfault-on-execute 
Do not attempt to PQclear a null PQresult*
 2014-03-09 21:04:58 -07:00
Dane Springmeyer
44ef0324f0 Merge pull request #2174 from strk/2.2.x-handle-bad-connection 
Make sure status() returns a message also on bad connection
 2014-03-09 21:02:11 -07:00
Dane Springmeyer
d4662005fe Merge pull request #2178 from olt/proj48-double-free-fix 
prevent double-free in mapnik::projection
 2014-03-08 19:44:57 -08:00
Oliver Tonnhofer
5be238b2cd prevent double-free in mapnik::projection 
A double-free can happen when init_proj4 is called outside of the
constructor (for projections with defer_proj_init=true) and when that
call fails. In this case proj_ctx_ is not set to NULL and then freed
again in the destructor. Set to null to avoid second pj_ctx_free call.

See #2170
 2014-03-06 10:25:57 +01:00
Sandro Santilli
2b2aead8b3 Do not attempt to PQclear a null PQresult* 2014-03-06 09:59:18 +01:00
Sandro Santilli
5edc39555d Make sure status() returns a message also on bad connection 
Closes #2173.
 2014-03-06 09:56:13 +01:00
Dane Springmeyer
449e83fbf2 fix jpeg reading regression after #1805 - closes #2123 (patch from @clundgren) 2014-02-07 11:23:29 -08:00
Dane Springmeyer
482c4eb215 add missing attribute collector for markers symbolizer path expression - closes #1952 2013-11-22 18:02:21 -08:00
Dane Springmeyer
a295eea843 improve travis for 2.2.x branch 2013-11-17 15:43:29 -08:00
Dane Springmeyer
f9a09be2b1 fix osx/libc++/boost-1.55 compile error - refs #1973 2013-11-17 15:29:30 -08:00
Dane Springmeyer
09c919b3bd scons: avoid pollution of global compiler flags from python plugin - closes #2060 2013-10-31 13:38:55 -07:00
Dane Springmeyer
fe06c959c6 v2.2.x branch should declare itself as in development 2013-10-07 16:35:45 -07:00
Dane Springmeyer
b821c67cc5 Merge pull request #1958 from strk/2.2.x-fontset_runtime_test 
Fix test expectance after adding layer name in error messages
 2013-07-23 11:30:10 -07:00
Sandro Santilli
4b988a2c20 Fix test expectance after adding layer name in error messages 2013-07-23 20:22:39 +02:00
Artem Pavlenko
cde04dba4a Merge pull request #1936 from strk/2.2.x-layername-in-errormsg 
2.2.x layername in errormsg
 2013-07-02 13:08:58 -07:00
Sandro Santilli
dc7b943873 Comply to mapnik style 2013-06-26 11:20:35 +02:00
Sandro Santilli
ec2f03a6e0 Include layer name in error message from AGG renderer 2013-06-25 16:20:17 +02:00
Dane Springmeyer
049b7b2fe4 update CHANGELOG for mapnik v2.2.0 release 2013-06-03 18:28:47 -07:00
Dane Springmeyer
9231205573 setting up for mapnik v2.2.0 release 2013-06-03 18:26:28 -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
Dane Springmeyer
9ddb1e4c8b comment test that will fail with old gdal because it is not critical functionality to warn about 2013-06-03 15:19:33 -07:00
Dane Springmeyer
b33b6a4add comment test for now - refs #783 2013-06-03 15:13:12 -07:00
Dane Springmeyer
78dc1a4199 cleanup TODO usage in python tests 2013-06-03 15:02:43 -07:00
Dane Springmeyer
28bdb881f0 remove non-useful test as paths-from-xml will soon be removed - refs #1893 2013-06-03 14:58:56 -07:00
Dane Springmeyer
cd220886b2 various sqlite plugin test fixes - closes #1889 2013-06-03 14:15:27 -07:00
Dane Springmeyer
9d15a2c87d show exceptions at end of run for tests that could not be run 2013-06-03 14:00:51 -07:00
Dane Springmeyer
a21f883c5c fix linking of gdal/ogr plugins when linking to statically built gdal 2013-06-03 13:43:49 -07:00
Dane Springmeyer
5cb6bbe01c fix python linking when using static libraries for deps or statically building libmapnik 2013-06-03 13:17:45 -07:00
Dane Springmeyer
9768052d97 only test if reader works (to avoid failures for unsupported formats) 2013-06-03 12:36:54 -07:00
Dane Springmeyer
87850281d0 Merge branch 'master' of github.com:mapnik/mapnik 2013-06-03 12:22:54 -07:00