Commit graph

7072 commits

Author SHA1 Message Date
Dane Springmeyer
09726626cf add 'premultiplied' property on raster symbolizer to allow user to control (in rare cases) the premultiplied status of images in cases where tiffs mis-report it - closes #1512 2012-10-01 16:14:41 -07:00
Dane Springmeyer
acaee09598 fix debug output symbolizer name 2012-10-01 15:35:35 -07:00
Dane Springmeyer
67d8ee3d40 point tests at better source files for #1508 2012-10-01 15:05:07 -07:00
Dane Springmeyer
e2a76e09b3 use what you include 2012-10-01 15:03:17 -07:00
Dane Springmeyer
ef28a1db80 cleanup includes in rule/feature_style_processor and move code to rule.cpp and raster_symbolizer.cpp 2012-10-01 15:01:12 -07:00
Dane Springmeyer
3845d56c06 add code comments from mcseem relevant to agg usage questions around scaling and compositing 2012-10-01 14:13:54 -07:00
Dane Springmeyer
00517a507f add more river images to test up for better testcases 2012-10-01 12:14:09 -07:00
artemp
d1eefb63b1 Merge remote-tracking branch 'origin/master' 2012-10-01 16:59:01 +01:00
artemp
d24175e80e + style : assigment init for built-in types 2012-10-01 16:57:31 +01:00
Artem Pavlenko
f298af6095 Merge pull request #1514 from mapnik/conv_simplify
Conv simplify
2012-10-01 07:48:50 -07:00
artemp
037c1a84c6 + use format_ 2012-10-01 15:46:03 +01:00
artemp
f03e08bbba + make rewind() const 2012-10-01 15:45:30 +01:00
artemp
30f14e0878 Merge branch 'master' into conv_simplify 2012-10-01 10:21:56 +01:00
artemp
b9fed932b9 + template vertex_iterator on path_type
+ rename vertex_iterator to path_iterator
2012-10-01 10:20:10 +01:00
artemp
fbafbd9e88 Merge branch 'master' into conv_simplify 2012-10-01 09:32:33 +01:00
Dane Springmeyer
2714bdcef3 more test fixes to set up to enforce desired behavior around tiff and premultiplied alpha in source files - refs #1508 and #1511 2012-09-28 15:07:33 -07:00
artemp
780ea26af3 Merge remote-tracking branch 'origin' into conv_simplify 2012-09-28 19:49:01 +01:00
Dane Springmeyer
76dec5076e fix up expected results for testcases being developed for #1508 2012-09-28 11:19:20 -07:00
artemp
3ffe8ec21c + add premultiplied_alpha flag to mapnik::raster 2012-09-28 16:43:05 +01:00
artemp
77e585895f + add premultiplied_alpha method to image_reader
* tiff - TIFFTAG_EXTRASAMPLES
  * png  - non-premultiplied alpha (http://www.libpng.org/pub/png/spec/1.1/PNG-Rationale.html)
  * jpeg - no-alpha channel, ensure pre-multiplied model
2012-09-28 16:37:21 +01:00
Manel Clos
49356608ce Merge branch 'master' of https://github.com/manelclos/mapnik 2012-09-28 15:14:06 +02:00
Manel Clos
8f7083d14d Add tolerance parameter to features_at_point
Make map.query_point() always pass tolerance to datasources
2012-09-28 15:12:10 +02:00
artemp
02e7aef9c9 + restore g++/darwin fix - #1507 2012-09-28 09:43:29 +01:00
Dane Springmeyer
446ef47242 Add test file 2012-09-27 19:24:02 -07:00
Dane Springmeyer
8135ac8ac1 add more color to the visual test output 2012-09-27 19:18:07 -07:00
Dane Springmeyer
a7670459d6 add testcase for #1508 to visual tests 2012-09-27 19:11:11 -07:00
Dane Springmeyer
43ded34222 visual tests: don't output debug by default and handle exceptions from rendering 2012-09-27 18:58:50 -07:00
artemp
bb27ab5d1b + formatting 2012-09-27 16:09:20 +01:00
artemp
98c3c823a0 Merge branch 'master' into conv_simplify 2012-09-27 16:07:42 +01:00
artemp
2427daa403 + make WKT generator templated on geometry type - the goal is to be able
to use generator for any type that implements 'vertex' concept
2012-09-27 16:07:14 +01:00
artemp
42bcf4ea98 + make WKT generator templated on geometry type - the goal is to be able
to use generator for any type that implements 'vertex' concept
2012-09-27 16:04:29 +01:00
artemp
03315ff893 + formatting 2012-09-27 16:03:21 +01:00
artemp
8228d99186 + cleanups: use preincrement iterators in for loop etc .. 2012-09-27 16:02:14 +01:00
Manel Clos
f4934e62ea Query tolerance test 2012-09-27 13:53:57 +02:00
artemp
d7abfc267b Merge branch 'master' into conv_simplify 2012-09-27 08:54:32 +01:00
Dane Springmeyer
35a10d48cc remove the uneeded save_data test utility function 2012-09-26 14:12:55 -07:00
Dane Springmeyer
b9b97ba652 after #1483 fontset is boost optional so check appropriately in load_map (solves assert) 2012-09-26 12:56:57 -07:00
Dane Springmeyer
7d066fe8f7 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-26 12:52:26 -07:00
Dane Springmeyer
8b77547251 Add csv test files 2012-09-26 12:51:42 -07:00
Dane Springmeyer
a7d7dd245a Merge branch 'master' of github.com:mapnik/mapnik 2012-09-26 12:29:53 -07:00
Dane Springmeyer
e954bb1587 add empty/size==0 to style guide 2012-09-26 12:29:22 -07:00
Dane Springmeyer
a3aec240fe make the csv tests silent 2012-09-26 12:11:41 -07:00
Dane Springmeyer
4432b75f53 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-26 12:01:40 -07:00
Dane Springmeyer
794f5e369a start moving raster visual tests into place (add new,currently failing tests for raster.input) 2012-09-26 12:01:28 -07:00
Dane Springmeyer
083ff236b7 Revert "+ fix parameters names to be more css-ish"
This reverts commit 5c5c4fb76e.
2012-09-26 11:57:29 -07:00
Dane Springmeyer
940bb98275 visual tests: actually default to m.zoom_all() 2012-09-26 11:28:23 -07:00
Dane Springmeyer
7cf4a00af9 add ability to generate expected test results on the fly 2012-09-26 11:27:25 -07:00
Dane Springmeyer
ef94bc8db8 support python 2.5 2012-09-26 11:26:51 -07:00
Dane Springmeyer
b6c7e319d6 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-26 08:49:40 -07:00
artemp
be5a2c192f Merge remote-tracking branch 'origin/master' 2012-09-26 14:28:46 +01:00