Commit graph

8000 commits

Author SHA1 Message Date
artemp
f518d44be0 respect text and halo opacity in cairo renderer 2014-06-20 09:35:33 +01:00
Mike Morris
bed3c5a9c1 Merge pull request #2277 from mapnik/remove-rounding
Remove all glyph_info rounding
2014-06-19 22:02:15 -04:00
Dane Springmeyer
6ce0828a6f font registration test 2014-06-19 17:21:57 -07:00
Dane Springmeyer
8c3683f41f updated expected test images after #2272 2014-06-19 16:41:45 -07:00
Dane Springmeyer
29ed31f69d Merge branch 'master' of github.com:mapnik/mapnik 2014-06-19 16:28:35 -07:00
Dane Springmeyer
f523acdee4 add testcase for halo-comp-op - refs #2267 2014-06-19 16:28:28 -07:00
Mike Morris
cce05c4e52 Merge pull request #2276 from mapnik/remove-advance-rounding
Remove advance rounding
2014-06-19 18:26:33 -04:00
Mike Morris
2eafed2991 remove all rounding in glyph_info methods 2014-06-19 16:39:32 -04:00
Mike Morris
b8b22afbbc remove advance rounding 2014-06-19 16:38:15 -04:00
Mike Morris
24a7e87f1c Merge pull request #2272 from mapnik/unscaled-glyphs
Unscaled glyphs
2014-06-19 16:35:06 -04:00
Dane Springmeyer
e974279f1a update expected images again (not sure what went wrong before) refs #1313 - amends 66905ca69f 2014-06-19 10:23:23 -07:00
Dane Springmeyer
66905ca69f update expected images after 68a5cc55a6 - refs #1313 2014-06-19 09:53:07 -07:00
artemp
68a5cc55a6 image_filters : agg-stack-blur requires premultiplied pixels - move de/pre multipling into apply_filter() 2014-06-19 15:40:54 +01:00
artemp
2fb3069825 image-filters: apply image-filters in demultiplied colour space 2014-06-19 13:26:40 +01:00
artemp
c605ce81aa pedantic : prefer explicit double values in comparisons 2014-06-19 12:14:12 +01:00
Dane Springmeyer
8da2805d42 Merge branch 'master' into unscaled-glyphs
Conflicts:
	include/mapnik/text/dummy_shaper.hpp
	include/mapnik/text/harfbuzz_shaper.hpp
	include/mapnik/text/icu_shaper.hpp
2014-06-18 20:40:33 -07:00
artemp
2f15631182 premultiply R,G,B channels after applying filters 2014-06-18 19:06:53 +01:00
artemp
666a926864 moving instead of copying mapnik::glyph_info
Conflicts:
	include/mapnik/text/dummy_shaper.hpp
	include/mapnik/text/harfbuzz_shaper.hpp
	include/mapnik/text/icu_shaper.hpp
2014-06-18 14:23:18 +01:00
artemp
3c72aedba0 moving instead of copying mapnik::glyph_info 2014-06-18 14:15:12 +01:00
artemp
a5547b0473 Merge branch 'master' into unscaled-glyphs 2014-06-18 10:18:16 +01:00
Dane Springmeyer
118cce8d58 add test for #2240 2014-06-17 22:19:17 -07:00
Dane Springmeyer
6571508576 Merge branch 'master' of github.com:mapnik/mapnik 2014-06-17 21:42:42 -07:00
Mike Morris
f797c320ff remove unecessary x_scale/y_scale multiplication 2014-06-17 15:57:11 -04:00
artemp
6669765ce1 visual tests : add text-halo-opacity 2014-06-17 17:22:05 +01:00
artemp
2c3173c1aa support halo-comp-op property (#2267) 2014-06-17 15:11:34 +01:00
artemp
d9597972d4 prefer c++ style comments 2014-06-17 14:25:02 +01:00
artemp
8bd044ec13 + serialize halo-opacity 2014-06-17 14:24:31 +01:00
Mike Morris
28a3f4d2a2 fix line height 2014-06-16 18:47:16 -04:00
Sandro Santilli
4c525e0e25 Makefile tweaks for helloworld template plugin
- Do not force use of clang++ to build the plugin (broken on recent debian
   and derivates: https://bugs.debian.org/643959)
 - Do not force clean on install
 - Use -fPIC to build objects (or g++ complains)
2014-06-16 09:52:26 -07:00
Dane Springmeyer
8bb77bce92 image readers: ability to check if image has alpha before full read
Conflicts:
	src/webp_reader.cpp
2014-06-16 09:52:26 -07:00
Dane Springmeyer
6e6c9f21ac improve png comparison tests
Conflicts:
	tests/python_tests/png_encoding_test.py
2014-06-16 09:52:26 -07:00
Dane Springmeyer
5fcd974817 webp reader: initialize WebPDecoderConfig
Conflicts:
	src/webp_reader.cpp
2014-06-16 09:52:26 -07:00
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