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

7858 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dane Springmeyer
e94876ebe4 Merge pull request #2160 from MapQuest/expr-v2-group-symbolizer 
Group Symbolizer
 2014-04-03 11:52:21 -07:00
Dane Springmeyer
ce1ff9902e better linking for postgis.input using pkg-config 2014-04-02 13:26:33 -07:00
Dane Springmeyer
2c8cf76808 update a few expected tests 2014-04-01 19:41:57 -07:00
Dane Springmeyer
af64692dcc visual test threshold of 2 on OS X 2014-04-01 18:15:31 -07:00
Dane Springmeyer
818e87dce4 update tests 2014-04-01 17:34:24 -07:00
Dane Springmeyer
5fd04e72ef add #2196 change to changelog 2014-04-01 17:09:18 -07:00
Dane Springmeyer
e15e64a5a9 update test images after bc1c723 - refs #2196 2014-03-31 21:26:42 -07:00
Dane Springmeyer
bc1c7234c3 drop vertex_dist_epsilon to 1e-5 (could likely even go lower) - refs #2196, #2186 2014-03-31 21:22:05 -07:00
Dane Springmeyer
947f7a4b33 use COMPUTE_THRESHOLD=0 on os x, update expected test images 2014-03-31 21:15:35 -07:00
Sandro Santilli
32680434fe Do not throw in postgis_datasource destruction if backend is down 
... and persist_connections is true!
Closes #2191
 2014-03-26 15:39:53 +01:00
Sandro Santilli
9d04d9fef9 Do not throw in postgis_datasource destruction if backend is down 
... and persist_connections is true!
Closes #2191
 2014-03-26 15:35:55 +01:00
Dane Springmeyer
e618a65498 fix #2185 2014-03-20 16:02:47 -07:00
Dane Springmeyer
68aaec5ac7 fix #2185 2014-03-20 16:02:08 -07:00
Dane Springmeyer
080b8e174c fixup c++ style in offset_converter 2014-03-18 17:31:15 -07:00
Dane Springmeyer
7847c0a7b9 travis: start testing clang 2014-03-18 15:00:24 -07:00
Dane Springmeyer
83ad5f5a25 fix a few g++-4.8 warnings on linux 2014-03-18 14:52:41 -07:00
Dane Springmeyer
804c90d46e fix c++11/clang-3.4/linux compile issue - closes #2022 2014-03-18 14:17:25 -07:00
Dane Springmeyer
1baeac34c7 use make_unique 2014-03-18 14:10:02 -07:00
Dane Springmeyer
2e6de5cc97 remove unused variables 2014-03-18 14:09:44 -07:00
Dane Springmeyer
f59dc36a19 attempt to workaround boost 1.49 bug when building in debug - refs #2085 2014-03-12 15:44:23 -07:00
Dane Springmeyer
42218b4bae try debug build - refs #2181 2014-03-12 15:02:00 -07:00
Dane Springmeyer
6c4ea66509 postgis: use max float for no-op bbox token - closes #2158 2014-03-12 13:31:45 -07:00
Dane Springmeyer
551718df59 postgis: use max float for no-op bbox token - closes #2158 2014-03-12 13:31:14 -07:00
Dane Springmeyer
c9e3248cec more auto_ptr usage to avoid bare geometry pointers 2014-03-12 13:11:51 -07:00
Sandro Santilli
bf3500d757 Have all queries use the async interface 2014-03-11 11:10:41 +01:00
Dane Springmeyer
cb3db66b82 std::make_unique 2014-03-10 21:34:48 -07:00
Dane Springmeyer
66654683a2 work in progress: fix some expressions tests disable others 2014-03-10 13:30:49 -07:00
Dane Springmeyer
7d5e0f1f91 one step closer to expression support for line cap/join 2014-03-10 13:00:47 -07:00
Dane Springmeyer
91eda81699 pass string by const& 2014-03-10 13:00:14 -07:00
Dane Springmeyer
811e93cdc4 update visual tests against freetype 2.5.3 2014-03-10 11:38:42 -07:00
Dane Springmeyer
24aaa0a6de post merge cleanups 2014-03-10 10:47:43 -07:00
Dane Springmeyer
bdd230a888 fix style copy ctor 2014-03-10 10:47:27 -07:00
Dane Springmeyer
6433d9482e Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 
Conflicts:
	include/mapnik/symbolizer.hpp
	src/agg/agg_renderer.cpp
	src/agg/process_line_pattern_symbolizer.cpp
	src/agg/process_line_symbolizer.cpp
	src/agg/process_polygon_pattern_symbolizer.cpp
	src/agg/process_polygon_symbolizer.cpp
	src/cairo_renderer.cpp
	src/feature_type_style.cpp
	src/grid/process_line_pattern_symbolizer.cpp
	src/grid/process_line_symbolizer.cpp
	src/grid/process_markers_symbolizer.cpp
	src/grid/process_polygon_pattern_symbolizer.cpp
	src/grid/process_polygon_symbolizer.cpp
 2014-03-10 00:05:56 -07:00
Dane Springmeyer
dc8a13c44e rename a few variables to avoid likely clashes 2014-03-09 21:29:52 -07:00
Sandro Santilli
ca9b0fccab Do not attempt to PQclear a null PQresult* 2014-03-09 21:07:34 -07:00
Dane Springmeyer
b1e9aa2140 Merge pull request #2176 from strk/2.3.x-segfault-on-execute 
Do not attempt to PQclear a null PQresult*
 2014-03-09 21:04:48 -07:00
Sandro Santilli
749118cdee Make sure status() returns a message also on bad connection 
Closes #2173.
 2014-03-09 21:03:44 -07:00
Dane Springmeyer
11f9b44177 Merge pull request #2177 from strk/2.3.x-handle-bad-connection 
Make sure status() returns a message also on bad connection
 2014-03-09 21:02:05 -07:00
Dane Springmeyer
d58def6cdb silence debug print 2014-03-08 19:54:43 -08:00
Oliver Tonnhofer
5dedae4320 testcase for #2170 2014-03-08 19:54:05 -08:00
Oliver Tonnhofer
2c38670443 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-08 19:51:42 -08:00
Oliver Tonnhofer
fc8eb981fe 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-08 19:50:34 -08:00
Sandro Santilli
d36c39d9be Make sure status() returns a message also on bad connection 
Closes #2173.
 2014-03-06 10:18:21 +01:00
Sandro Santilli
9a1996620e Do not attempt to PQclear a null PQresult* 2014-03-06 10:04:10 +01:00
Dane Springmeyer
871b17f5d9 fix postgis plugin linking when statically linking on linux - refs mapnik/mapnik-packaging#123 2014-02-27 14:40:14 -08:00
Dane Springmeyer
0fbcc12678 fix static linking of gdal/ogr plugins on linux - refs mapnik/mapnik-packaging#123 2014-02-27 14:40:09 -08:00
Dane Springmeyer
f2021971f0 fix postgis plugin linking when statically linking on linux - refs mapnik/mapnik-packaging#123 2014-02-27 14:23:57 -08:00
Dane Springmeyer
6f14228e30 fix static linking of gdal/ogr plugins on linux - refs mapnik/mapnik-packaging#123 2014-02-27 14:02:24 -08:00
Dane Springmeyer
21555b51c2 avoid double application of scale_factor - refs #1926 2014-02-27 13:28:25 -08:00
Dane Springmeyer
0d122c9878 update more tests after e49f63730e - refs #1926 2014-02-27 13:28:17 -08:00