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
artemp
4babec802a
CSV - implement spatial index access to features on disk + preserve support for inline data (work-in-progress)
2015-08-21 13:52:42 +02:00
artemp
4943cb4cf8
remove unused includes
2015-08-20 14:15:35 +02:00
artemp
93fcc0a783
cleanup
2015-08-19 15:24:38 +02:00
artemp
d7e2f63f89
remove debug stderr + update data
2015-08-19 12:40:01 +02:00
artemp
68d73aa630
temp workaround boost 1.59 geometry
2015-08-19 12:30:07 +02:00
artemp
6c3d9bb2a2
CSV plug-in - refactor and bring some sanity, sigh ..
2015-08-19 12:04:56 +02:00
artemp
710ec057e5
formatting
2015-08-19 12:04:45 +02:00
artemp
d4bc32908f
temp workaround boost 1.59 geometry
2015-08-19 12:03:16 +02:00
artemp
153c93d345
Merge branch 'master' into large_csv
2015-08-19 12:02:50 +02:00
artemp
f8afa796d7
update test data
2015-08-17 16:56:00 +02:00
artemp
0ba2e3f3f6
update svg tests
2015-08-17 16:53:42 +02:00
artemp
318a8217a7
work-in-progress
2015-08-17 15:27:17 +02:00
artemp
2b25f025cf
update 'test/data' submodule to track 'large_csv' branch
2015-08-14 11:35:37 +02:00
artemp
28a7bdfd7c
update test data
2015-08-14 11:12:44 +02:00
artemp
f7d1cf82a9
Merge branch 'master' into large_csv
2015-08-13 13:28:35 +02:00
artemp
332d875839
set MAPNIK_VERSION_IS_RELEASE 0
2015-08-13 11:30:33 +02:00
Artem Pavlenko
70ae5a6e56
Merge pull request #3034 from mapycz/remove-superfluous-line
...
remove superfluous line
2015-08-13 10:30:45 +02:00
Jiri Drbalek
507c556386
remove superfluous line
2015-08-13 10:11:18 +00:00
Blake Thompson
381a4fc94c
Merge branch 'master' of github.com:mapnik/mapnik
2015-08-12 13:00:13 -05:00
Blake Thompson
10ad41d218
Removed unrequired MAPNIK_DECL from src/image_util_jpeg added pragma to prevent warning on linux with clang.
2015-08-12 13:00:04 -05:00
Dane Springmeyer
487226b289
disable OS X builds until ccache/caching is working - refs #3033
2015-08-12 10:54:29 -07:00
Dane Springmeyer
affe1615b3
minor changelog copy edits [skip ci]
2015-08-12 10:09:34 -07:00
artemp
da6af4fa11
update CHANGELOG
2015-08-12 17:37:22 +02:00
Blake Thompson
3d262c7426
Fixed linking errors in parse jpeg. closes #3031
2015-08-12 09:32:32 -05:00
Blake Thompson
146af9d10b
Added missing scons directory
2015-08-12 09:17:18 -05:00
artemp
715cff3f2a
fix - pass by const ref
2015-08-12 12:09:40 +02:00
artemp
fb41fb4bb7
update CHANGELOG for mapnik v3.0.3 release
2015-08-12 12:00:29 +02:00
artemp
1f6c44a791
version : upate minor number
2015-08-12 11:38:10 +02:00
artemp
3e3ab2cd4b
update test
2015-08-12 11:35:26 +02:00
artemp
241b900673
Merge branch 'image_filters'
2015-08-12 11:28:32 +02:00
artemp
ebf4d66900
Merge branch 'master' into image_filters
2015-08-12 11:27:59 +02:00
artemp
4ab6cd5855
update DeJaVu Fonts to the latest 2.35
2015-08-12 11:22:58 +02:00
artemp
c0e2cf3616
update scons + visual test
2015-08-12 11:18:09 +02:00
artemp
1e7980608e
Merge branch 'naturalatlas-dot-scale'
2015-08-12 10:55:08 +02:00
