Dane Springmeyer
|
d5ac946706
|
remove libcurl dependency
Conflicts:
plugins/input/osm/dataset_deliverer.cpp
plugins/input/osm/osm.cpp
plugins/input/osm/osm_datasource.cpp
plugins/input/osm/test.cpp
|
2014-06-16 09:52:26 -07:00 |
|
Dane Springmeyer
|
033a0e0ed7
|
fix miniz inlining
|
2014-06-16 09:52:25 -07:00 |
|
Dane Springmeyer
|
e421403f3d
|
fix miniz encoder - closes #1560
|
2014-06-16 09:52:25 -07:00 |
|
Dane Springmeyer
|
cc874364b2
|
allow external image data - refs #2002
Conflicts:
include/mapnik/image_data.hpp
tests/cpp_tests/image_io_test.cpp
|
2014-06-16 09:52:25 -07:00 |
|
artemp
|
7cc87c2196
|
fix compilation warnings
|
2014-06-16 11:45:33 +01:00 |
|
artemp
|
6bb47d9f5e
|
add 'cairo' subdir
|
2014-06-16 11:45:10 +01:00 |
|
artemp
|
cbab56fa79
|
text symbilizer : add halo-opactity property (#2268)
|
2014-06-16 11:24:16 +01:00 |
|
artemp
|
91a523733b
|
fix unused parameter warnings
|
2014-06-16 11:23:50 +01:00 |
|
artemp
|
7eb8e25110
|
better namings + cleanup
|
2014-06-16 11:00:19 +01:00 |
|
Dane Springmeyer
|
16073a4742
|
Merge pull request #2270 from mapnik/make_unique
Fixes compile in c++11 mode
|
2014-06-12 20:28:03 -07:00 |
|
Dane Springmeyer
|
e5dd7e0ec7
|
attempt to fix compile on linux
|
2014-06-12 19:08:30 -07:00 |
|
Dane Springmeyer
|
7ca7ef1536
|
Merge branch 'master' of github.com:mapnik/mapnik into make_unique
|
2014-06-12 18:55:03 -07:00 |
|
Sean Gillies
|
441ae5cb9d
|
Remove config example.
|
2014-06-12 16:32:27 -07:00 |
|
Mike Morris
|
a99905cff5
|
fix char_height zero
|
2014-06-12 19:10:18 -04:00 |
|
Dane Springmeyer
|
1ec7a3a8bd
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2014-06-12 15:58:41 -07:00 |
|
Mike Morris
|
38966674f1
|
line_height, ymin, ymax and advance all look right now
|
2014-06-12 16:16:02 -04:00 |
|
Mike Morris
|
3948e01c97
|
set glyph advance to floor for mapnik 2.x parity
|
2014-06-12 12:24:20 -04:00 |
|
Sean Gillies
|
4cb331b119
|
Add an example config file for cpp03-libstdcpp-x86_64-macosx.
|
2014-06-12 09:09:35 -07:00 |
|
artemp
|
3ded23fbab
|
move make_unique out of std namespace and allow building with c++14 compilers
( -std=c++1y )
|
2014-06-12 15:14:05 +01:00 |
|
Mike Morris
|
2b843ec6a9
|
first attempt at unscaled glyph dimensions
|
2014-06-11 19:56:55 -04:00 |
|
Dane Springmeyer
|
ccfa25cf26
|
benchmark: also need -lrt on linux
|
2014-06-10 12:01:49 -07:00 |
|
Dane Springmeyer
|
62c6b5a456
|
fixup benchmark build flags
|
2014-06-10 12:00:36 -07:00 |
|
artemp
|
d2eca542a9
|
formatting
|
2014-06-10 09:15:50 +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
|
f66d93d0ec
|
fix compile of binding/python/mapnik_image.cpp after cairo header shuffling
|
2014-06-09 10:49:54 -07:00 |
|
artemp
|
390816a396
|
update scons to 2.3.1
|
2014-06-06 14:49:46 +01:00 |
|
artemp
|
30a39aa376
|
fix debug build
|
2014-06-06 14:49:16 +01:00 |
|
artemp
|
b6bab7d0bb
|
move cairo renderer into its own subdir
|
2014-06-06 13:38:00 +01:00 |
|
artemp
|
5e386f5c97
|
capture built-in types by value
|
2014-06-06 13:12:55 +01:00 |
|
Dane Springmeyer
|
961e160ff9
|
update test image after #2264
|
2014-06-05 11:26:30 -07:00 |
|
artemp
|
14ed48db50
|
Merge branch 'refactor-markers'
|
2014-06-05 17:29:29 +01:00 |
|
artemp
|
89532d9903
|
Merge branch 'master' into refactor-markers
Conflicts:
.travis.yml
|
2014-06-05 16:53:24 +01:00 |
|
artemp
|
de90d0ee2a
|
fix markers transforms calc
|
2014-06-05 16:47:40 +01:00 |
|
artemp
|
81c4b9dd59
|
fix init order
|
2014-06-05 16:13:05 +01:00 |
|
artemp
|
bbb727e39a
|
update cairo_renderer
|
2014-06-05 15:15:36 +01:00 |
|
artemp
|
961bc69a1c
|
cleanup+format
|
2014-06-05 15:15:36 +01:00 |
|
Dane Springmeyer
|
a49744e774
|
fix compile of utf encoding benchmark on linux
|
2014-06-05 15:15:36 +01:00 |
|
Dane Springmeyer
|
c489549b56
|
add benchmark of utf 32->8 encoding speed
|
2014-06-05 15:15:36 +01:00 |
|
Dane Springmeyer
|
147a289936
|
update travis script
|
2014-06-05 15:15:36 +01:00 |
|
Dane Springmeyer
|
4a4ec224fd
|
fix compile of utf encoding benchmark on linux
|
2014-06-04 14:45:33 -07:00 |
|
Dane Springmeyer
|
0859a74f81
|
add benchmark of utf 32->8 encoding speed
|
2014-06-04 12:09:42 -07:00 |
|
Dane Springmeyer
|
c276e7dcac
|
re-enable clang since #2235 should be fixed soon
|
2014-06-04 10:51:07 -07:00 |
|
artemp
|
27b4faf4e7
|
remove dead code
|
2014-06-04 18:12:35 +01:00 |
|
artemp
|
a49e1d075e
|
initial refactor pass (fixes #2235)
|
2014-06-04 18:05:27 +01:00 |
|
Dane Springmeyer
|
39258e2cc2
|
update travis script
|
2014-06-04 09:31:20 -07:00 |
|
Dane Springmeyer
|
1acd49d630
|
fix spelling in comment
|
2014-06-03 22:06:49 -07:00 |
|
Dane Springmeyer
|
a600a1fb91
|
improvements to GDAL 2.x handling - refs #2259 amends cbdd112223
|
2014-06-02 20:25:55 -07:00 |
|
Dane Springmeyer
|
dcbedc007a
|
support for GDAL >= 2.0 in ogr plugin - refs #2259
|
2014-06-02 20:25:48 -07:00 |
|
artemp
|
bedd275e95
|
more const correctness + cleaups
|
2014-06-02 17:09:12 +01:00 |
|
artemp
|
526e03d8c1
|
pedantic : use const quialifier where appropriate
|
2014-06-02 16:47:55 +01:00 |
|