artemp
b9bfef634f
wchar_t literal needs L""
2014-06-24 11:45:13 +01:00
artemp
bfac02432b
Merge branch 'stdio'
2014-06-24 11:42:52 +01:00
artemp
11c2aad531
Merge branch 'master' into stdio
...
Conflicts:
src/font_engine_freetype.cpp
2014-06-24 11:42:33 +01:00
artemp
45ba10e701
use _wfopen in windows
2014-06-24 11:40:04 +01:00
artemp
8255163945
style
2014-06-24 11:23:13 +01:00
artemp
68775c52ff
call FT_Done_Face for matching FT_Open_Face
2014-06-24 11:21:01 +01:00
artemp
f4acd06f84
c++11 - use std::unique_ptr instead of boost::scoped_array
...
(TODO - consider storing unique_ptr's in memory_fonts_ and avoid constructing std::string)
2014-06-23 17:33:31 +01:00
artemp
284786ec16
wrap FILE* in std::unique_ptr (RAII)
...
pull C-i/o from std:: namespace
2014-06-23 17:23:28 +01:00
artemp
4d42df8f3c
ensure we read the whole file at once
2014-06-23 17:11:53 +01:00
artemp
b1d8e06032
oops buffer.get() returns raw bytes (not \0 terminated C-string)
2014-06-23 17:08:00 +01:00
artemp
1c25c34dec
no sure if 'rewind' is a standard - use fseek instead
2014-06-23 16:59:30 +01:00
artemp
4acba303a5
+ use C-style I/O to read font file into memory
2014-06-23 16:56:59 +01:00
artemp
ebde5351af
increase buffer size in std::streambuf for faster i/o
2014-06-23 16:26:50 +01:00
artemp
9496a95af4
use C-style file I/O
2014-06-23 15:33:31 +01:00
Dane Springmeyer
4c4ce5a04c
windows build fixes in palette and miniz_png headers
2014-06-21 14:08:14 -07:00
Dane Springmeyer
34f1cc57c0
windows fix: declar miniz PNGWriter
2014-06-21 14:08:06 -07:00
Dane Springmeyer
8ae1b6da03
fix boost directory iterator to use wide paths - closes #2273
...
Conflicts:
src/font_engine_freetype.cpp
2014-06-21 14:07:57 -07:00
Dane Springmeyer
6572cde97a
use FT_Open_Face instead of FT_New_Face - refs #1897
...
Conflicts:
src/font_engine_freetype.cpp
2014-06-21 14:01:44 -07:00
Dane Springmeyer
184d9dd43b
fix unicode handling in is_regular_file check - refs #2273
2014-06-20 22:26:33 -07:00
Dane Springmeyer
5688a93858
update expected text images - refs #2277 #2276
2014-06-20 20:29:01 -07:00
artemp
b0980ac329
cairo renderer: comp_op/halo_comp_op support in text_symbolizer
2014-06-20 09:55:10 +01:00
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
