Commit graph

6780 commits

Author SHA1 Message Date
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
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
Dane Springmeyer
c00a4e6971 scons: assume boost headers are found unless explicitly not 2013-06-03 12:22:29 -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
19ce56b051 one more special case handling of utf8 in ogr plugin - refs #1177 2013-06-02 21:09:21 -07:00
Dane Springmeyer
3b2bdba7b0 iwyu 2013-06-02 20:19:33 -07:00
Dane Springmeyer
8c04925fce cleanup after 0365d3e081 2013-06-02 20:13:24 -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
4f9b0ffba6 scons: no need to check for boost python if boost headers are not found 2013-06-02 19:25:43 -07:00
Dane Springmeyer
540d275cd0 also check for boost development headers 2013-06-02 19:24:11 -07:00
Dane Springmeyer
2457f5f7f4 ensure we only modify logger test for specific tests that should be silenced 2013-06-02 18:40:06 -07:00
Dane Springmeyer
ff88efc1fd proper c++ cast 2013-06-02 17:34:44 -07:00
Dane Springmeyer
e1c299decf remove whitespace 2013-06-02 17:34:36 -07:00
Dane Springmeyer
661aa4c87a fix Makefile demo target path 2013-06-02 16:40:03 -07:00
Dane Springmeyer
786b8c71c0 update changelog with base path support for load_xml 2013-06-02 16:25:39 -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
c5f01be4e2 only build cpp test if >= boost 1.47 2013-06-02 14:54:27 -07:00
Dane Springmeyer
949a356b29 minor build output improvements 2013-06-02 14:15:02 -07:00
Dane Springmeyer
983cc3c0ec fix postgis tests after null/empty string change - refs #1859 2013-06-02 13:44:58 -07:00
Dane Springmeyer
8ff0c48c64 tests: only show relevant traceback info 2013-06-02 13:41:14 -07:00