artemp
d9ab7fd25f
CSV grammar : skip leading \n
and/or \r
which result from std::getline used with non-native line endings
...
The goal is to support LF, CR and CRLF on all platforms.
2015-09-14 11:46:11 +02:00
artemp
ad80c91657
cache processed layouts to ensure there are stay in scope (placement_finder) - via @talaj
2015-09-11 15:29:28 +02:00
Jiri Drbalek
5e82fc8a05
fix and update changelog
2015-09-11 11:26:20 +00:00
artemp
337525ef60
csv.input - don't attempt to build if boost < 1.56
2015-09-11 11:20:45 +02:00
artemp
8128a2b1ef
topojson - remove 'invalid' geometry type to avoid default constructed geometries
2015-09-10 19:28:15 +02:00
Artem Pavlenko
12485b66ef
Merge pull request #3063 from mapnik/windows-utf-filenames
...
Windows: fix loading of SVG files from unicode paths. …
2015-09-10 16:02:49 +02:00
artemp
5e0050d005
topojson - use separate local boolean to track first geometry
2015-09-10 15:35:25 +02:00
bergwerkgis
0de0cfa1c2
Update changelog, Windows: Fixed SVG file loading from unicode paths
2015-09-10 11:15:31 +00:00
bergwerkgis
9146f785f4
Windows: fix loading of SVG files from unicode paths. Surfaced in https://github.com/mapnik/node-mapnik/issues/517
2015-09-10 11:10:38 +00:00
artemp
fc100be61e
topojson : fix geometry index logic
2015-09-10 12:37:38 +02:00
artemp
e076640493
update font version
2015-09-09 13:28:38 +02:00
artemp
724bd56ec4
don't use curly brackets initializer for static member variables (keep vc++ happy)
2015-09-09 13:18:45 +02:00
artemp
826882b150
enable sorting + small refactor
2015-09-09 12:14:15 +02:00
artemp
0de6d36000
use memory mapped file by default for both index and data parsing (improves loading times by ~50%) - default on non-windows platforms
2015-09-09 11:56:21 +02:00
artemp
310dc968ea
fix potential type mismatch
2015-09-09 11:08:00 +02:00
Blake Thompson
eee1a46139
Merge pull request #3059 from mapycz/colorize-alpha-needless-conditions
...
colorize-alpha: remove needless conditions
2015-09-08 12:02:57 -05:00
Jiri Drbalek
a5f314fd87
colorize-alpha: remove needless conditions
2015-09-08 15:05:04 +00:00
artemp
a5bba97192
update data
2015-09-08 13:10:41 +02:00
Artem Pavlenko
282bdf178c
Merge pull request #3058 from mapycz/colorize-alpha-fix-color-value-normalization
...
colorize-alpha: fix normalization of color components
2015-09-08 12:50:46 +02:00
artemp
a32fbdf635
use atomic<> where possible to avoid locking
2015-09-08 12:28:16 +02:00
artemp
81ead3dc78
make destroyed_ atomic<>
2015-09-08 12:26:43 +02:00
Artem Pavlenko
fa82d5a0c9
Merge pull request #3054 from mapycz/scale-hsla-limits
...
scale-hsla image filter: unlimit parameters
2015-09-08 12:22:10 +02:00
Jiri Drbalek
79f4e3ac8f
colorize-alpha: fix normalization of color components
2015-09-08 10:14:20 +00:00
Jiri Drbalek
72222efad7
scale-hsla image filter: unlimit parameters
2015-09-03 11:33:53 +00:00
artemp
ee65873159
oops fix
2015-08-27 17:37:18 +02:00
artemp
6d1ffc8a93
enable optional checking env for "MAPNIK_LOG_FORMAT" (via MAPNIK_CHECK_ENV)
2015-08-27 17:08:41 +02:00
artemp
284ca099ea
set input state to std::ios::failbit
(only needed on linux ?)
2015-08-27 13:41:02 +02:00
artemp
8f37b30978
fix handling 'one line' + 'manual headers' + 'no newline' case
...
update get_geometry_type ( ref https://github.com/mapnik/mapnik/issues/3047 )
2015-08-27 13:07:51 +02:00
artemp
4f5bdf82c1
slightly better syntax (NOTE: 4000 seems arbitrary here)
2015-08-27 13:07:51 +02:00
artemp
1080d92a79
add missing geometry type check
2015-08-27 13:07:51 +02:00
artemp
0ea5ccc7bc
fix typo
2015-08-27 13:07:51 +02:00
artemp
bd35054d27
update version
2015-08-27 13:07:51 +02:00
Blake Thompson
986cf2d073
Merge pull request #3046 from mapycz/remove-clip-comments
...
remove incorrect and meaningless comments
2015-08-26 10:21:31 -05:00
Jiri Drbalek
75a299ab1d
remove incorrect and meaningless comments
2015-08-26 14:29:09 +00:00
Blake Thompson
c5312b5cbf
Merge pull request #3044 from mapycz/remove-unused-members
...
remove unused members
2015-08-26 08:55:13 -05:00
Jiri Drbalek
883c9c83bf
remove unused members
2015-08-26 12:59:11 +00:00
artemp
45d5e39e22
update CHANGELOG for mapnik v3.0.4 release
2015-08-26 12:06:51 +02:00
artemp
17bb81c02c
update changelog
2015-08-26 11:45:05 +02:00
artemp
10e6128035
test/data -> track master
2015-08-26 11:23:22 +02:00
Artem Pavlenko
26d100f3d9
Merge pull request #2996 from mapycz/improve-visual-test-11
...
visual tests: limit number of failures
2015-08-26 10:33:57 +02:00
Artem Pavlenko
85eebaaf57
Merge pull request #3038 from zerebubuth/fix/deadlock-in-recursive-datasource-registration
...
Fix deadlock in recursive datasource registration.
2015-08-25 15:07:00 +02:00
Artem Pavlenko
35c263612f
Merge pull request #3010 from mapnik/large_csv
...
Large csv
2015-08-25 15:06:26 +02:00
artemp
3753d50b75
CSV - revive row_limit parameter + fix stderr
2015-08-25 15:05:04 +02:00
artemp
8709fb6f7c
CSV - optimise parsing by providing num_columns hint
2015-08-24 16:35:32 +02:00
artemp
6c9257a915
add parse_line
accepting iterator range and avoid string ctor
2015-08-24 15:41:04 +02:00
artemp
622ab90e4b
Merge branch 'master' into large_csv
2015-08-24 14:16:13 +02:00
artemp
c9d1d51b8a
simplify + factor out properties parsing logic
2015-08-24 14:13:13 +02:00
artemp
2477d8764e
keep on untangling spaghetti
...
* implement standalone ignore case equality to avoid copying
* fix various logic shortcommings
2015-08-24 12:23:59 +02:00
artemp
5dead08ecc
CSV - remove unused params and member vars
2015-08-24 09:30:57 +02:00
Matt Amos
3d7b84a598
Fix deadlock in recursive datasource registration.
...
The datasource cache was taking an exclusive lock on the simple
mutex used to protect the singleton's data pointer. This works
okay when everyone always calls it non-recursively, but when the
recursive flag is true then it will always deadlock when called
on any directory with subdirectories.
Additionally, many methods which accessed private data members of
the cache were not protected by any locks.
Since the call pattern of registering datasources is strictly
tree-shaped then it's a good candidate for a recursive mutex. This
has a slightly higher overhead than a simple mutex, so rather than
change the singleton's mutex to be recursive, I've added a new
instance mutex to the datasource cache.
Also, added a very basic test which reproduces the problem and
shows that it's fixed with this patch.
2015-08-23 20:25:35 +01:00