Commit graph

12942 commits

Author SHA1 Message Date
artemp
21baa9e375 Merge branch 'lightmare-postgis-quoting' 2017-03-14 12:29:54 +00:00
artemp
1d06afeea2 Merge branch 'postgis-quoting' of https://github.com/lightmare/mapnik into lightmare-postgis-quoting 2017-03-14 12:29:32 +00:00
artemp
f3f4de154b Merge branch 'mapycz-text-extend' 2017-03-14 11:54:08 +00:00
artemp
c1053181f5 Merge branch 'text-extend' of https://github.com/mapycz/mapnik into mapycz-text-extend 2017-03-14 11:53:52 +00:00
artemp
b10d2a3dff Merge remote-tracking branch 'origin/master' 2017-03-14 11:35:20 +00:00
artemp
0e107135b2 update deps 2017-03-14 11:34:12 +00:00
Artem Pavlenko
a3d29ae52f Merge pull request #3636 from mapnik/color-emoji
Color emoji + updated harfbuzz_shaper and unicode_string_grammar
2017-03-14 11:22:57 +00:00
artemp
0dff423c44 cleanup 2017-03-14 11:22:11 +00:00
artemp
834f0ef312 add '-fno-omit-frame-pointer' to sanitize address builds for nicer stack traces in error messages. 2017-03-14 11:17:54 +00:00
artemp
203d767e73 follow up from 32f5703ed1 - more generic specialisation 2017-03-14 10:26:09 +00:00
artemp
32f5703ed1 provide is_substitute specialisation for mapnik::geometry::linear_ring<double> const& (gcc6) 2017-03-14 11:05:33 +01:00
artemp
cdfe280984 use updated test data 2017-03-08 10:56:32 +01:00
artemp
ae29012611 tests - update shaping test results 2017-03-08 10:55:52 +01:00
artemp
3ac70bb7ce update font_registration testx 2017-03-08 10:54:58 +01:00
artemp
791f7b51bb Revert "one more time."
This reverts commit 8dea549887.

Revert "fix following up 8c4fa25c8d65e75978c0a82bc6391906595ff190"

This reverts commit 8726312393.

Revert "attempt to fix "error: chosen constructor is explicit in copy-initialization" error with gcc"

This reverts commit 8c4fa25c8d.

Revert "use `initializer_list const&` to hold expected values (via @lighmare) ref #3636"

This reverts commit 47763afef3.
2017-03-07 14:25:56 +01:00
artemp
8dea549887 one more time. 2017-03-07 13:50:27 +01:00
artemp
8726312393 fix following up 8c4fa25c8d 2017-03-07 13:37:20 +01:00
artemp
8c4fa25c8d attempt to fix "error: chosen constructor is explicit in copy-initialization" error with gcc 2017-03-07 13:34:43 +01:00
artemp
47763afef3 use initializer_list const& to hold expected values (via @lighmare) ref #3636 2017-03-07 13:02:21 +01:00
artemp
d9a000372c remove -Wshadow warning (ref #3628) 2017-03-07 11:28:22 +01:00
artemp
3433397c30 test (expressions) - add more tests (ref #3616) 2017-03-06 15:59:07 +01:00
artemp
7f28246407 print compiler version during configure step (ref #3616) 2017-03-06 09:54:02 +01:00
artemp
4d57fb1a6c print compiler version during configure step (ref #3616) 2017-03-06 09:53:13 +01:00
artemp
a50efcb2bb refactor unicode string grammar - add escaped_unicode rule + use it in expressions. 2017-03-03 15:41:46 +01:00
artemp
fb7139bc63 expressions - only import escaped rule from unicode_string_grammar and construct single/double quoted string rules locally to match expression grammar. NOTE: single quoted strings don't accept unicode encodings 2017-03-03 15:14:01 +01:00
artemp
713b9e7788 take #2 - try using pair instead of tuple 2017-03-02 15:09:11 +01:00
artemp
f1de5758b2 attempting to pacify some compilers with an extra pair of brackets. 2017-03-02 14:55:00 +01:00
artemp
4509f23c94 Merge branch 'harfbuzz-shaper' into color-emoji 2017-03-02 12:27:45 +01:00
artemp
ab36ef9274 update visual test data to track harfbuzz-shaper branch. 2017-03-02 12:26:17 +01:00
artemp
1bdc8e6bad handle utf16 encoding correctly by parsing as sequence and applying utf16->utf32->utf8 conversion. 2017-03-02 11:50:38 +01:00
artemp
92f07b7a7a handle utf16 encoding correctly by parsing as sequence and applying utf16->utf32->utf8 conversion. 2017-03-01 18:46:48 +01:00
artemp
04dd05c971 minimise shared_ptr assignments and simplify code 2017-03-01 12:59:34 +01:00
artemp
d29be8a689 If I'm reading docs correctly \uNNNN + \UNNNNNNNN are correct
Revert "relax hex4 parser to allow 5 character \unnnnn code points"

This reverts commit 378fa41db6.
2017-03-01 12:08:22 +01:00
artemp
2d2c5a191b expression_grammar: re-use unicode_string_grammar and add initial support for \uNNNNN code points (TODO) 2017-03-01 11:58:18 +01:00
artemp
378fa41db6 relax hex4 parser to allow 5 character \unnnnn code points 2017-03-01 11:53:27 +01:00
artemp
571b2a0d6a Merge branch 'harfbuzz-shaper' into color-emoji 2017-03-01 11:30:33 +01:00
artemp
7cb587a901 Merge branch 'master' into harfbuzz-shaper 2017-03-01 11:30:08 +01:00
artemp
131f785dce Make parsing \xXX format strict via hex2 parser + append UTF8 encoded \xXX characters directly (fixes #3631) 2017-03-01 11:25:43 +01:00
artemp
e95b16c5ca make hex parser strict (expecting two characters after \x) to avoid greedy parsing of trailing characters as in
"\xF0\x9F\x8D\xB7abc" ==>  ... + "\xB7" +  "abc" not "\xB7abc"
2017-03-01 10:35:39 +01:00
artemp
0076a5a916 make hex parser strict (expecting two characters after \x) to avoid greedy parsing of trailing characters as in
"\xF0\x9F\x8D\xB7abc" ==>  ... + "\xB7" +  "abc" not "\xB7abc"
2017-03-01 10:34:16 +01:00
artemp
570126bd76 make hex parser strict (expecting two characters after \x) to avoid greedy parsing of trailing characters as in
"\xF0\x9F\x8D\xB7abc" ==>  ... + "\xB7" +  "abc" not "\xB7abc"
2017-03-01 10:27:12 +01:00
artemp
87c619cdc2 don't forget FT_LOAD_NO_HINTING 2017-02-28 15:13:40 +01:00
artemp
cbacaaf0c5 initialize to reasonable values. 2017-02-28 15:05:37 +01:00
artemp
1b67779290 implement color bitmap extraction/scaling/compositing into target pixmap 2017-02-28 15:04:49 +01:00
artemp
639dcae83f c++ style 2017-02-28 15:03:26 +01:00
artemp
7c93514fbc avoid division by zero (units_per_EM is set to 0 for bitmap fonts) 2017-02-28 15:01:46 +01:00
artemp
a6519c3f6b use FT_Load_Sfnt_Table to identify color fonts + load color glyphs with FT_LOAD_COLOR 2017-02-28 15:00:03 +01:00
artemp
8e97803e81 add color_font_ member 2017-02-28 14:59:14 +01:00
artemp
5492d93ccd Merge branch 'master' into harfbuzz-shaper 2017-02-27 13:24:11 +01:00
artemp
3eabd3141a sync mapnik-index and shapeindex versions with mapnik via MAPNIK_VERSION_STRING 2017-02-27 13:22:55 +01:00