Commit graph

387 commits

Author SHA1 Message Date
artemp
1bccca9ff8 Merge remote-tracking branch 'origin/master'
Conflicts:
	plugins/input/csv/csv_datasource.cpp
2015-10-02 12:27:28 +01:00
artemp
1d320b7133 make quote single char 2015-10-02 12:20:54 +01:00
Dane Springmeyer
2f9c9bd4b1 update test data - closes #3102 2015-10-01 15:46:07 -07:00
Dane Springmeyer
a8019f9fa2 log csv filepath when test fails [skip ci] 2015-10-01 13:35:23 -07:00
Dane Springmeyer
be22a67b60 fix -Wshadow warnings 2015-10-01 13:35:23 -07:00
artemp
4273e37278 Merge branch 'master' into csv-disk-index 2015-10-01 15:26:47 +01:00
Dane Springmeyer
0c23eaa4ba fix variable shadowing in image_filter unit test 2015-09-30 14:23:00 -07:00
artemp
54609fd8ac remove blank undelimited rows are still parsed section as current behavior is to fail and continue on individual row errors 2015-09-30 15:40:42 +01:00
artemp
81628d5b9c update test visual-data 2015-09-30 15:31:56 +01:00
bergwerkgis
8e7e7c64a7 update test-data-visual to force LF for SVGs on clone (Windows) 2015-09-30 13:07:52 +00:00
artemp
848098baeb spatial_index/quad_tree - remove `operator>>' requirement, instead value_type stored must have standard layout for correct (de)serialisation + update unit test 2015-09-29 15:44:57 +01:00
artemp
f549cae46a unit test - add initial spatial_index tests 2015-09-29 12:27:56 +01:00
artemp
08a30cbbd9 update test data 2015-09-28 14:29:54 +01:00
jakepruitt
a787d20e36 Add viewbox fallback logic for dimension parsing
SVG's now have fallback on viewbox. Still debugging the boost Qi parser
2015-09-25 12:05:57 -07:00
artemp
8c2f15c94a mapnik::value - always upcast to the higher definition numeric value (rhs or lhs) in operator== and operator!=
add unit test for comparing numeric mapnik::values
2015-09-24 17:38:16 +01:00
Jiri Drbalek
91db109b37 fix parsing colors in hexadecimal notation 2015-09-18 13:54:05 +00:00
Jiri Drbalek
ae8ac89ef8 visual tests: add command line parameters for scale-factor settings 2015-09-17 08:22:18 +00:00
Jiri Drbalek
fd19c754f3 visual tests: command line switches for renderers 2015-09-17 08:22:10 +00:00
artemp
e452a03c09 update test data 2015-09-16 18:30:37 +01:00
artemp
d54eca9dca image - fix copy/move implementation and update/improve tests 2015-09-16 14:28:55 +01:00
artemp
60c79d6614 image unit test - make test image 16x16 + add more checks 2015-09-16 11:47:36 +01:00
artemp
c1301fa142 image unit test - add copy (deep/shallow) + move tests 2015-09-16 11:37:46 +01:00
artemp
8c8ea74a63 update unit test 2015-09-16 10:15:21 +01:00
Artem Pavlenko
c4e0516ba6 Merge pull request #3061 from mapycz/colorize-alpha
colorize-alpha: add support for transparent colors
2015-09-15 16:11:28 +01:00
Dane Springmeyer
b2d08ea4ea re-enable zero allocation image interface - refs #3069 2015-09-14 16:45:58 -07:00
Jiri Drbalek
6f0b4d438c colorize-alpha: add support for transparent colors 2015-09-11 11:31:08 +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
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
1080d92a79 add missing geometry type check 2015-08-27 13:07:51 +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
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
d7e2f63f89 remove debug stderr + update data 2015-08-19 12:40:01 +02:00
artemp
710ec057e5 formatting 2015-08-19 12:04:45 +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
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
3e3ab2cd4b update test 2015-08-12 11:35:26 +02:00
artemp
ebf4d66900 Merge branch 'master' into image_filters 2015-08-12 11:27:59 +02:00
artemp
c0e2cf3616 update scons + visual test 2015-08-12 11:18:09 +02:00
artemp
751abba262 add parse_jpeg_quality method + uint test parsing jpegXX and jpeg:quality=XX options
ref #3024
2015-08-12 10:29:57 +02:00
Blake Thompson
0b6b11b9cf Added the ability for filter_image to throw properly with bad input and added the ability for a new image to be returned 2015-08-11 19:22:09 -05:00
Blake Thompson
792e94ae90 Removed image-filter from map object, made it so that premultiplication/demultiplication only took place when correctly required in image filters. 2015-08-11 14:31:29 -05:00
Blake Thompson
a492028f25 Initial commit of changes for image_filters so they can be called outside of agg renderer 2015-08-07 15:54:39 -05:00
Blake Thompson
161469ed63 Fixed an issue with fields over size of int32 in OGR plugin and added tests to cover this situation. 2015-08-05 13:47:17 -05:00
Blake Thompson
ec73b50557 Added ability for image filters to be used on the map object, so that the entire map has an image filter applied. Corrected issues with colorblind algorithms due to incorrect algorithm used as colorspace was required to be in sRGBA rather then RGBA. 2015-08-05 12:35:17 -05:00
Blake Thompson
6245790e72 Added new image filters that allow an image to be viewed in colorblind modes, allow cartographers to see what their maps would appear like to a color blind person 2015-08-04 17:41:31 -05:00
Jiri Drbalek
96b35c540d visual tests: set test duration to zero on error 2015-08-03 10:45:23 +00:00
Jiri Drbalek
32afdb10e5 visual tests: limit number of failures 2015-08-03 10:45:14 +00:00
Blake Thompson
f5cf669736 Updated SVG unit test so that it no longer writes to std err. closes #3007 2015-07-31 12:31:54 -05:00
artemp
df8c5ce599 update test data 2015-07-31 12:54:42 +02:00
artemp
42bf2303e0 fix parse_double_optional_percent grammar and update tests 2015-07-31 11:35:02 +02:00
artemp
f9bd21eeb5 Merge branch 'svg-parser-errors' into large_csv 2015-07-31 11:18:55 +02:00
artemp
5b04764757 SVG - update tests to work with marker_cache's strict policy 2015-07-31 10:47:30 +02:00
jakepruitt
0cc524aa1c Adding percentage for linear gradient 2015-07-30 17:35:30 -04:00
jakepruitt
1f7b961901 Update test data 2015-07-30 17:09:26 -04:00
jakepruitt
6f6af87a43 Write invalid parse_string test 2015-07-30 17:05:19 -04:00
jakepruitt
9549a1cc01 Adding tests for radial gradients with percentages 2015-07-30 16:46:27 -04:00
jakepruitt
8982938270 Adding test for gradient xlink:href
- refs #3005
2015-07-30 12:48:23 -04:00
artemp
9f4db6c855 use correct define -> HAVE_LIBXML2 2015-07-30 18:30:22 +02:00
artemp
f8fd60dc69 remove libxml includes and init calls 2015-07-30 13:13:53 +02:00
artemp
f75921c7ca update test + data 2015-07-30 11:09:08 +02:00
jakepruitt
b4bc16751c Adjusted error message logic for logging path ids 2015-07-29 22:37:30 -04:00
jakepruitt
af27af4af2 Improving svg test coverage
- refs #3005
2015-07-29 22:26:28 -04:00
artemp
f3870cc8fe update test 2015-07-29 16:09:51 +02:00
artemp
d05c13d849 unit test - cope with incorrectly encoded geometries 2015-07-29 15:42:53 +02:00
artemp
0b728e676c update visual test data 2015-07-28 16:35:50 +02:00
artemp
4ee453ada0 update test data 2015-07-28 10:30:24 +02:00
artemp
42c8da72e9 Merge branch 'master' into svg-parser-errors 2015-07-28 10:29:59 +02:00
Dane Springmeyer
c8370485da use latest testdata [skip ci] 2015-07-27 19:05:18 -07:00
Dane Springmeyer
0e8887171d update visual tests after #2988 - e3d79ed493 2015-07-27 17:26:59 -07:00
Dane Springmeyer
c50f72764f update tests + add #2990 to changelog 2015-07-27 17:09:46 -07:00
Dane Springmeyer
e82de0109d centralize plugin registration for unit tests 2015-07-27 15:35:00 -07:00
artemp
ec591c1ffa add bogus stroke-width test 2015-07-24 11:05:58 +02:00
artemp
49d4beec59 fix typo 2015-07-23 15:16:08 +02:00
artemp
e496e24deb add "Gradients apply to leaf nodes" test and update test data 2015-07-23 12:58:38 +02:00
artemp
158e4b7f87 add missing gradient definition test 2015-07-22 16:34:28 +02:00
artemp
626cb9f47c add display=none test 2015-07-22 15:28:55 +02:00
artemp
7aa30a211e SGV tests: <gradient> - update expected path data 2015-07-22 13:32:39 +02:00
artemp
fddc4e0312 update tests 2015-07-22 13:21:17 +02:00
artemp
9eadd48d7b add tests for no-existing svg file + bogus color in fill and stroke 2015-07-22 11:52:18 +02:00
artemp
d7cf0d5bca add parse_id_from_url method 2015-07-21 11:30:04 +02:00
artemp
f19ddf81ba SVG - add gradient test (ref #2989) 2015-07-21 10:35:21 +02:00
artemp
61a2ef7ebb update test data 2015-07-21 10:29:19 +02:00
artemp
27fb4a9e00 update tests 2015-07-20 20:36:31 +02:00
artemp
0625b90067 SVG unit test - add <line> test
(http://www.w3.org/TR/SVGTiny12/shapes.html#LineElement)
2015-07-20 17:44:47 +02:00
artemp
fb155a57cd support compilers that can't construct tuple from initializer list 2015-07-20 17:16:35 +02:00
artemp
6a2d0b9ebf started adding svg parsing tests to increase test coverage (work-in-progress) 2015-07-20 15:41:35 +02:00
artemp
bb8b835618 calculate percentage value inside parser, reduce local vars 2015-07-17 20:00:14 +02:00
artemp
c63e71acac +unit test: feature_collections with extra properties 2015-07-17 17:43:04 +02:00
Dane Springmeyer
8a9b46edfd bring in new regression tests for 6d6cb15 2015-07-14 13:34:50 -07:00
Dane Springmeyer
0145476ff7 only run geojson unit test if plugin was built 2015-07-10 12:34:18 -07:00
Dane Springmeyer
b54b2753a0 fixup geojson test 2015-07-10 12:10:46 -07:00
artemp
8ab5125431 update submodules 2015-07-10 11:19:13 +02:00
artemp
16e6db3281 add initial geojson unit test 2015-07-10 11:05:48 +02:00
Dane Springmeyer
153051d020 add test to ensure icu/harfbuzz shapers can be compiled 2015-07-08 23:28:38 -07:00
Jiri Drbalek
ced3d35023 visual tests: report total time spent by renderers 2015-07-08 20:01:23 +00:00
Blake Thompson
8511865f60 Updated visual tests for python 2015-07-07 14:41:34 -05:00
Blake Thompson
ed022f17f0 Merge pull request #2954 from mapycz/improve-visual-test-9
visual tests: add time measurement
2015-07-07 13:59:56 -05:00
Dane Springmeyer
b1e4f0ea23 update visual tests after #2955 2015-07-07 11:57:52 -07:00
Jiri Drbalek
1fa6cc73db visual tests: add time measurement 2015-07-07 12:35:28 +00:00
Dane Springmeyer
d13543c359 update visual tests to a83ea35fec 2015-07-07 00:39:30 -07:00
Dane Springmeyer
a6fd89df3e Merge pull request #2941 from mapnik/offset_fix
Fix situation where offset_converter might start off with an SEG_END …
2015-07-06 18:50:52 -07:00
Dane Springmeyer
e65f93f5f2 update test images after #2949 #2929 2015-07-06 18:23:34 -07:00
Dane Springmeyer
9f72950629 update visual tests 2015-07-06 18:14:56 -07:00
Dane Springmeyer
a440a99f56 Merge pull request #2930 from mapycz/improve-visual-test-8
Visual tests: add tiled mode
2015-07-06 17:43:50 -07:00
Dane Springmeyer
aa2f769fdc Merge pull request #2944 from mapycz/fix-integer-overflow
fix integer overflow (-fsanitize=integer)
2015-07-06 16:25:56 -07:00
Blake Thompson
852a7e432a Updated tests to cover case found in #2942 2015-07-06 16:12:04 -05:00
Jiri Drbalek
cb2717bd04 visual tests: add support for tiles 2015-07-02 14:23:05 +00:00
Jiri Drbalek
449ccf3243 visual tests: drop compare_images.hpp 2015-07-02 14:23:05 +00:00
Jiri Drbalek
aff4fa5da6 visual tests: prefer size_t 2015-07-02 14:23:04 +00:00
Jiri Drbalek
9704e3eec5 fix integer overflow (-fsanitize=integer) 2015-07-01 12:13:15 +00:00
Blake Thompson
770d93b7cc Fix situation where offset_converter might start off with an SEG_END from the vertex, therefore starting invalid processing. Tests added to confirm fix. Ref #2937 2015-06-30 22:23:44 -05:00
Dane Springmeyer
c7693d9765 fix odd inf loop in catch.hpp 2015-06-30 18:47:36 -07:00
Dane Springmeyer
1eea7294ae ensure tests pass with no plugins built 2015-06-30 17:04:48 -07:00
Blake Thompson
89f0f53938 Updated visual tests to be in line with python mapnik 2015-06-30 13:02:28 -05:00
Dane Springmeyer
48eb4abedb merge with master 2015-06-30 00:38:45 -07:00
Dane Springmeyer
2a2e0d8260 update visual test refs [skip ci] - refs #2904 2015-06-30 00:06:24 -07:00
Jiri Drbalek
c4625e06bc visual tests: add command line argument for controlling log level 2015-06-29 14:23:32 +00:00
artemp
7158c19f80 Merge branch 'master' into large_csv 2015-06-29 09:51:52 +02:00
Dane Springmeyer
b285bde44b Revert "visual tests: still generate error report on ctrl-c"
This reverts commit c24229f5c8.
2015-06-24 17:37:02 -07:00
Dane Springmeyer
5428300454 update more visual tests after 5a032ee98b 2015-06-24 17:35:12 -07:00
Dane Springmeyer
5a032ee98b fix #2924 and #2412
- adds back support for minimum-path-length on lines (only supported lines in 2.3.x)
 - made text-largest-bbox-only work only on polygons (restores 2.3.x behavior)

TODO: give more control: #1583
2015-06-24 17:02:34 -07:00
Dane Springmeyer
c24229f5c8 visual tests: still generate error report on ctrl-c 2015-06-23 21:54:24 -07:00
artemp
8e40711ca4 Merge branch 'master' into large_csv 2015-06-23 17:54:38 +02:00
Dane Springmeyer
15589c8568 pull in latest master 2015-06-22 13:51:09 -07:00
Dane Springmeyer
e4631f15ae fix #2921 2015-06-22 13:43:07 -07:00
artemp
fec6d11560 Merge branch 'master' into large_csv 2015-06-19 17:30:18 +02:00
Dane Springmeyer
d626cf83ad update visual tests [skip ci] 2015-06-18 12:35:12 -07:00
artemp
d893718343 Merge branch 'master' into large_csv 2015-06-18 13:06:28 +02:00
artemp
93937ca443 prefer STL containers - boost::unordered_map --> std::unordered_map 2015-06-18 11:01:16 +02:00
Dane Springmeyer
4fe3c87a84 tame a few more boost -Wsign-conversion warnings 2015-06-17 13:29:54 -07:00
Blake Thompson
ad99cce6dd Revert change in test directory 2015-06-17 14:50:35 -05:00
Blake Thompson
6619de7b16 Modified where in travis mason publish is run 2015-06-17 14:48:49 -05:00
Blake Thompson
fa1950c5d0 Updated visual tests 2015-06-16 20:54:24 -05:00
Blake Thompson
983be86487 Updating visual tests 2015-06-16 20:48:34 -05:00
Blake Thompson
1272796822 Updated visual tests 2015-06-16 14:21:55 -05:00
Blake Thompson
bd9e580cd8 Merge branch 'master' into offset 2015-06-16 11:50:04 -05:00
Dane Springmeyer
6d0cd6870b remove dead code 2015-06-15 20:41:52 -07:00
Dane Springmeyer
6a76f0fa31 fix variable shadowing 2015-06-15 20:41:51 -07:00
Dane Springmeyer
b2c85e0c65 fix a slew of -Wsign-conversion, -Wconversion, -Wunused-argument warnings 2015-06-15 20:41:51 -07:00
Dane Springmeyer
b355e65fe1 unit coverage of css_color_grammar converters 2015-06-15 20:41:48 -07:00
Dane Springmeyer
bb2e938302 Add unit test for safe_cast (aka saturated_cast) a clamping numeric_cast 2015-06-15 20:41:48 -07:00