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

7920 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dane Springmeyer
d393470453 yet another try to please msvs 2010 2014-05-22 21:35:03 -07:00
Dane Springmeyer
8c0927baf0 no default args for template declaration 2014-05-22 21:34:58 -07:00
Dane Springmeyer
80dbdf28c9 fix msvs 2010 linking - refs #260 2014-05-22 21:29:03 -07:00
Dane Springmeyer
5974c79654 expose various image symbols for windows - refs mapnik/node-mapnik#260 2014-05-22 21:28:44 -07:00
Dane Springmeyer
680bb22133 fix ambiguous std::fabs and the compile on windows 2014-05-22 19:59:07 -07:00
Dane Springmeyer
051878c529 Merge pull request #2251 from mapnik/render-time-variables 
[WIP] Render time variables
 2014-05-22 19:56:32 -07:00
Dane Springmeyer
e182d9f8c3 try to get gdal/ogr plugins building 2014-05-22 17:13:20 -07:00
Dane Springmeyer
f9677641dd Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables 2014-05-19 12:33:35 -07:00
artemp
509a59353c be more consistent with JS logic when evaluating operators on unicode_strings 
'abc' + 'de' -> 'abcde'
'abc' ( - | * | / | % ) 'de' -> value_null
 2014-05-19 12:54:16 +01:00
artemp
cf9e5fad3e return default constructed ``value_type->value_null` instead of `std::numeric_limits<value_type>::infinity()`` 2014-05-19 12:06:40 +01:00
Dane Springmeyer
e313b5ba62 benchmark: use halo-rasterizer='fast' (doubles perf) 2014-05-16 19:30:35 -07:00
Dane Springmeyer
c0559a80bd tests for #2245 2014-05-16 12:22:48 -07:00
Dane Springmeyer
03bb82b13f Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables 2014-05-16 07:49:06 -07:00
artemp
a6a3af02d9 relax FeatureCollection grammar to allow arbitary key:value's 2014-05-16 11:18:27 +01:00
Dane Springmeyer
aaae8b1cba optimize raster rendering when not resizing 2014-05-15 23:38:47 -07:00
Dane Springmeyer
03bb19dc3a fix svg_renderer ctor 2014-05-15 18:35:27 -07:00
artemp
3cc8fad956 c++11 syntax 2014-05-15 14:00:46 +01:00
artemp
6f24bd1c01 mapnik c++ style 2014-05-15 13:52:43 +01:00
Dane Springmeyer
7fa6747a29 Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables 2014-05-14 11:44:57 -07:00
artemp
d60c371257 slightly better err message 2014-05-14 13:19:59 +01:00
artemp
c9b263fbc8 font_engine 
+ avoid initialising FT_Library per font registration
+ lock register_fonts
 2014-05-14 13:17:09 +01:00
Dane Springmeyer
96f89e34b3 Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables 2014-05-13 20:51:57 -07:00
Dane Springmeyer
e300a41dca variables now available as postgis datasource tokens 2014-05-13 20:47:22 -07:00
Dane Springmeyer
2f8451b99a variables support for cairo/grid/svg 2014-05-13 18:24:17 -07:00
Dane Springmeyer
6f176ab0bf Merge pull request #2241 from mapnik/freetype-new-lib 
FT_New_Library/FT_Done_Library
 2014-05-13 16:14:38 -07:00
Dane Springmeyer
92bf9782f8 scons: fix path remove to be less aggressive 2014-05-13 15:25:16 -07:00
artemp
f0fd0aa8ce font_engine : use FT_New_Library/FT_Done_Library with custom memory management (ref #2209 #2210) 2014-05-13 12:43:59 +01:00
Dane Springmeyer
29d92fd162 Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables 2014-05-12 21:26:04 -07:00
Dane Springmeyer
039e620147 don't allow marker-spacing less than 1 - fixes #2218 2014-05-12 21:25:49 -07:00
Dane Springmeyer
544917788f Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables 2014-05-12 09:20:49 -07:00
Dane Springmeyer
760d3c967e Merge branch 'master' of github.com:mapnik/mapnik 2014-05-12 09:20:32 -07:00
Dane Springmeyer
0465a4d43a do inherit dynamic library path 2014-05-12 09:20:24 -07:00
Dane Springmeyer
1e3f062af8 Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables 2014-05-12 08:45:15 -07:00
artemp
ba35dfe3b0 mapnik::value - return 'infinity' if rhs == 0 to avoid division by zero 2014-05-12 10:14:10 +01:00
artemp
1a32cc5630 + add eq/neq operators value_null <--> T 2014-05-12 10:12:09 +01:00
Dane Springmeyer
2c661ed3d5 support for render time variables 2014-05-11 13:08:24 -07:00
Dane Springmeyer
57c9aee63d shapeindex: more consistent error output 2014-05-11 12:41:08 -07:00
Dane Springmeyer
404e221c25 fix #2239 2014-05-11 12:40:24 -07:00
Dane Springmeyer
c770cfec3c fix possible crash in mapnik::process_layout::box_offset_align 2014-05-10 07:47:41 -07:00
Dane Springmeyer
6171c3252d fix a few sign comparison warnings 2014-05-10 07:37:28 -07:00
Dane Springmeyer
b2d62d5fd9 travis: disable clang - refs #2235 2014-05-08 07:26:44 -07:00
Dane Springmeyer
7364a30e67 improve handling of colors as expressions 2014-05-08 00:45:18 -07:00
Dane Springmeyer
88701b8669 revert usage of -flto on linux due to #2238 - refs #2232 2014-05-08 00:42:41 -07:00
Dane Springmeyer
e137985ecd travis: try -Os with -flto to see if #2235 and #2232 are still broken on travis 2014-05-06 23:00:42 -07:00
Dane Springmeyer
01d580d747 fix variable shadowing 2014-05-06 18:38:04 -07:00
artemp
99bbb10290 c++11 : use int types from <cstdint> 2014-05-06 18:06:47 +01:00
Dane Springmeyer
7bf50e9b5b fix build of test_array_allocation.cpp on older boost 2014-05-05 18:29:14 -07:00
Dane Springmeyer
cd4fdf17fe Merge pull request #2231 from mapnik/fast-static-grammars 
static grammars
 2014-05-05 18:24:59 -07:00
Dane Springmeyer
d7bb97a22e simplify code 2014-05-05 18:16:42 -07:00
Dane Springmeyer
33acec6dcb make css_value_broken truly broken with latest mapnik - refs #2237 2014-05-05 17:12:45 -07:00