Commit graph

6594 commits

Author SHA1 Message Date
Dane Springmeyer
1c9aa5bc09 remove debugging print - refs #1477 2012-10-16 12:23:26 -07:00
Dane Springmeyer
3252233a42 Merge pull request #1539 from mapycz/compositing
Image filters and compositing tests on New Zealand
2012-10-16 11:27:30 -07:00
Mickey Rose
8dca9dbb2b tests: fix svg render test output filename 2012-10-16 18:40:24 +02:00
Mickey Rose
187ce93a60 tests: add style_level_image_filter test 2012-10-16 18:40:24 +02:00
Mickey Rose
2ee6c1e0e0 tests: add style_level_comp_op test 2012-10-16 18:40:24 +02:00
Mickey Rose
ccbfec8686 tests: add New Zealand shapefiles from Natural Earth 2012-10-16 18:40:24 +02:00
Mickey Rose
9fdda8cf4a tests: save side-by-side reference/failed compositing images 2012-10-16 18:40:16 +02:00
Mickey Rose
465cf0aa21 tests: utility function for separate python tests 2012-10-16 17:46:34 +02:00
Dane Springmeyer
17e97c595a add a passing test that works around #1537 by manually setting key_field to string field 2012-10-15 17:06:43 -07:00
Dane Springmeyer
72124a9f8a apply patch from @lightmare fixing image_filter getter - closes #1534 2012-10-15 08:52:13 -07:00
Dane Springmeyer
38d9163f78 Merge branch 'master' of github.com:mapnik/mapnik 2012-10-10 14:38:04 -07:00
Dane Springmeyer
6947d17b44 add line offset example 2012-10-10 14:35:46 -07:00
Dane Springmeyer
0cafbc9460 warn if a Datasource template is not found 2012-10-10 14:33:56 -07:00
Dane Springmeyer
c53b6075eb properly set MAPNIK_DECL for mapnik::rule - closes #1527 2012-10-10 12:35:02 -07:00
Dane Springmeyer
ccda92fed1 Revert "finish moving symbolizers out of rule"
This reverts commit 20a317860d.
2012-10-10 10:51:06 -07:00
Dane Springmeyer
1f11aeb95a Revert "move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527"
This reverts commit bf5ffd04f4.
2012-10-10 10:50:56 -07:00
Dane Springmeyer
858252323c only link to agg if needed 2012-10-10 10:23:04 -07:00
Dane Springmeyer
a7f2eacd76 scons: only depend on libagg if it will be built 2012-10-10 10:19:24 -07:00
Dane Springmeyer
20a317860d finish moving symbolizers out of rule 2012-10-10 10:02:45 -07:00
Dane Springmeyer
bf5ffd04f4 move symbolizers typedef out of rule and be explicit about including config.hpp for MAPNIK_DECL - refs #1527 2012-10-10 09:32:29 -07:00
Dane Springmeyer
989b9f0301 move config.py rather than removing 2012-10-10 09:26:55 -07:00
Dane Springmeyer
baa2880dad nicer error formatting of ogr layer names 2012-10-09 13:47:24 -07:00
Dane Springmeyer
1449190c41 scons makefile wrapper - also remove config.py when running distclean/reset - closes #1525 and closes #1524 2012-10-08 10:45:03 -07:00
Hermann Kraus
c739dc2133 Fix reference to old data file.
Closes #1513.
2012-10-06 00:40:54 +02:00
Hermann Kraus
c5e69022cd Fix wrap_before in python.
Closes #1505.
2012-10-06 00:20:58 +02:00
Dane Springmeyer
65b19680e0 followup to 69fb17cd3c - make sure to report literal in descriptor 2012-10-05 14:49:12 -07:00
Dane Springmeyer
8b73d8527f ogr.input: continue past null features or geometries rather than aborting rendering 2012-10-05 13:49:29 -07:00
Dane Springmeyer
7efb37adb7 formatting 2012-10-04 17:59:43 -07:00
Dane Springmeyer
fb10f58357 shuffle color function 2012-10-04 17:59:34 -07:00
Dane Springmeyer
df501a2fa3 update tests after #1515 - many are not ideal due to #1519 2012-10-04 16:39:00 -07:00
Dane Springmeyer
e0bcf44874 Add c++ fontset test 2012-10-04 16:35:46 -07:00
Dane Springmeyer
a4b5549282 before caching marker premultiply only those image formats that might potentially need to be premultiplied 2012-10-04 16:07:24 -07:00
Dane Springmeyer
357e711312 -avoid potentially premultiplying colors more than once in agg_renderer::setup - closes #1515 2012-10-04 14:24:29 -07:00
Dane Springmeyer
9b053f493b make src_over the default compositing operation (and an optional kwarg) for im.composite() 2012-10-04 14:19:36 -07:00
Dane Springmeyer
a6129e9a80 add premultiply/demultiply methods for mapnik::color - refs #1519 2012-10-04 13:53:58 -07:00
Dane Springmeyer
91bb3ef7c5 Merge branch 'master' of github.com:mapnik/mapnik 2012-10-04 12:17:20 -07:00
Dane Springmeyer
72793fe9b6 explicitly include deque - thanks @lightmare - should fix gcc compile 2012-10-04 12:03:40 -07:00
artemp
10a28145b4 + sqlite: load extension 2012-10-04 12:36:07 +01:00
artemp
3072b3f581 Merge remote-tracking branch 'origin/master' 2012-10-04 12:17:07 +01:00
artemp
eaf6049909 + template on geometry/path concept 2012-10-04 12:15:51 +01:00
Dane Springmeyer
43280f17c4 allow the pure white test to pass if its nearly white 2012-10-03 18:53:23 -07:00
Dane Springmeyer
c0fd6802ed pattern source is only used by line_pattern_symbolizer so move it to that cpp 2012-10-03 18:23:07 -07:00
Dane Springmeyer
c27530ec7b remove inefficient and no longer used mapnik::raster constructor - refs #1516 2012-10-03 18:22:18 -07:00
Dane Springmeyer
4bc6b0c800 avoid copy of image data by using new, more efficient mapnik::raster constructor - closes #1516 2012-10-03 15:53:41 -07:00
Dane Springmeyer
f4ead94c37 make raster non-copyable 2012-10-03 15:40:43 -07:00
Dane Springmeyer
24adb81390 c++ style 2012-10-03 14:58:12 -07:00
Dane Springmeyer
5da14ef9e9 handle demultiplying the png before saving - solves gray halo reported in #1312 (when testing with svg2png utility) 2012-10-03 14:00:48 -07:00
Dane Springmeyer
3de5c4fab7 remove test target for travis for now 2012-10-03 13:49:56 -07:00
Dane Springmeyer
7d5642640d use the proper premultiplied pixel type for render_marker 2012-10-03 13:49:06 -07:00
Dane Springmeyer
a27b95558b remove uneeded includes 2012-10-03 13:48:05 -07:00