Commit graph

1891 commits

Author SHA1 Message Date
Dane Springmeyer
f39c3ad857 add marker-multi-policy parameter to support user-configurable rendering behavior for multi-geometries when using either point or interior placement - closes #1573, refs #1555 2012-11-20 17:58:39 -08:00
Dane Springmeyer
1ae4a03f68 avoid calls to fixAspectRatio() if current dimensions == dimension being set 2012-11-11 21:48:51 -08:00
Dane Springmeyer
eebc8cc73e add image/grid clear methods to make it easier to quickly re-use previously allocated objects for rendering - closes #1571 2012-11-11 21:35:50 -08:00
Dane Springmeyer
d0f0f9690f zero color images are not valid - catch this earlier on - closes #1568 2012-11-08 16:39:31 -05:00
Dane Springmeyer
211b102ec5 support writing full color png with rgb only (no alpha) - closes #1559 2012-11-06 11:44:44 -05:00
Dane Springmeyer
2874664d70 throw if tdefl_init fails 2012-11-06 11:33:11 -05:00
Dane Springmeyer
cd3cc31752 support writing rgb (no a) images with miniz - refs #1554 2012-11-06 09:19:40 -05:00
Dane Springmeyer
5a99d7fbdb add miniz support - closes #1554 2012-11-04 07:10:05 -05:00
Dane Springmeyer
f9fa9c2461 Add support for missing user ability to set Z_FIXED zlib strategy 2012-11-04 06:58:25 -05:00
Dane Springmeyer
eda4436b51 ensure that the transparency level option is passed to the octree encoder - closes #1556 2012-11-04 06:16:18 -05:00
Dane Springmeyer
2b767d650c fix string representation of expr when not built against a boost with icu support 2012-11-01 10:31:45 -07:00
Dane Springmeyer
cea31234fa allow building svg_renderer again - refs #1438 2012-11-01 10:07:29 -07:00
Dane Springmeyer
2cf429db08 start disabling svg_renderer features to get closer to compiling - refs #1438 2012-11-01 10:05:50 -07:00
Dane Springmeyer
0ccf9254ec include what you use 2012-11-01 10:02:08 -07:00
Dane Springmeyer
82b15bdd68 be more explicit about unsigned type for rgba_palette::quantize 2012-10-30 16:55:06 -07:00
Dane Springmeyer
ee68734975 use empty instead of size as per mapnik c++ style 2012-10-30 11:00:51 -07:00
Dane Springmeyer
10f6fbc731 improve error message when datasource plugin is not available 2012-10-30 11:00:24 -07:00
Dane Springmeyer
9040d2ac9d fix feature-cache for rasters - TODO: no intersection check option for memory_featureset 2012-10-26 18:18:35 -07:00
Dane Springmeyer
f7bd53c0d3 make a note about what Z_DEFAULT_COMPRESSION means to zlib 2012-10-25 13:30:14 -07:00
Dane Springmeyer
42661cf6e4 wrap long code lines 2012-10-20 16:20:32 -07:00
Dane Springmeyer
b46c5ddeb1 fix error language when a file cannot be found 2012-10-16 17:45:33 -07:00
Dane Springmeyer
0cafbc9460 warn if a Datasource template is not found 2012-10-10 14:33:56 -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
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
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
a6129e9a80 add premultiply/demultiply methods for mapnik::color - refs #1519 2012-10-04 13:53:58 -07:00
Dane Springmeyer
72793fe9b6 explicitly include deque - thanks @lightmare - should fix gcc compile 2012-10-04 12:03:40 -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
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
Dane Springmeyer
05195ca68d Merge pull request #1444 from sigmapi/issue1107
Fix for issue #1107
2012-10-03 13:06:45 -07:00
Dane Springmeyer
86e805b33e Merge pull request #1499 from manelclos/master
Query tolerance for features_at_point
2012-10-03 11:50:29 -07:00
Dane Springmeyer
8674e463a6 premultiply before image scaling - closes #1508 (at least for gdal.input) and refs #1498 2012-10-02 21:50:42 -07:00
Dane Springmeyer
1b5a1f0ffc agg scaling assumes/requires a premulitiplied renderer (and optionally a source defined as premultiplied) - to avoid any confusion use purely premultiplied types - refs #1508 and #1489 2012-10-02 21:49:52 -07:00
Dane Springmeyer
1468133bc0 ensure we rebuild libmapnik if agg sources change 2012-10-01 18:22:12 -07:00
Dane Springmeyer
798b101f0c finish #1512 and adjust tests to use new parameter 2012-10-01 17:09:28 -07:00
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
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
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
780ea26af3 Merge remote-tracking branch 'origin' into conv_simplify 2012-09-28 19:49:01 +01: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
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
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
d7abfc267b Merge branch 'master' into conv_simplify 2012-09-27 08:54:32 +01: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
b6c7e319d6 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-26 08:49:40 -07:00
artemp
d91cd510aa + ensure warp polygons are aligned exactly (avoid padding!) - #1501 2012-09-26 14:27:42 +01:00
artemp
a63df933d5 + only log transform evaluation if trans_expr is not null 2012-09-26 14:26:58 +01:00
artemp
fe011a988d + only log transform evaluation if trans_expr is not null 2012-09-26 14:24:26 +01:00
Dane Springmeyer
1af2faf56b formatting 2012-09-25 14:52:32 -07:00
artemp
32d52a1a78 Merge branch 'master' into conv_simplify 2012-09-25 10:35:53 +01:00
artemp
8fe932b7d1 + tiff_reader: make TIFF* 'cacheable', to avoid initialization under
certain conditions.
2012-09-24 13:35:22 +01:00
artemp
a7c02cf1d8 Merge remote-tracking branch 'origin/master' into conv_simplify 2012-09-19 14:07:34 +01:00
artemp
97463abf3d + ensure mesh doesn't overflow source raster extent - #1480 2012-09-19 13:53:56 +01:00
artemp
2834b2ad92 + not sure why we have do { } while(false); - removing 2012-09-19 13:51:53 +01:00
artemp
01ae1a179d Merge branch 'master' into conv_simplify 2012-09-17 11:35:15 +01:00
Dane Springmeyer
2d5287c298 rollback 1b4e7a8fd5 - refs #1489 and #1227 2012-09-14 18:45:09 -07:00
Dane Springmeyer
f3589ab4f9 Revert "no need for premultiplied types in warper"
This reverts commit 61e8a9c236.
2012-09-14 18:42:47 -07:00
Dane Springmeyer
ad8e4e4cc7 Merge pull request #1366 from mapnik/debugsymbolizer
Debug Symbolizer
2012-09-14 16:43:38 -07:00
Dane Springmeyer
1b3dcda87d add method off style to check for active rules 2012-09-14 16:11:37 -07:00
Dane Springmeyer
8cfb40ae2f refactor fontsets making them optional on the symbolizer and removing the dangerous default contructor - closes #1483 (TODO - consider modifying insert_fontset to only take single arg of fontset instance) 2012-09-14 14:17:45 -07:00
artemp
f66d4b1afe Merge branch 'master' into conv_simplify 2012-09-13 08:50:59 +01:00
Dane Springmeyer
2a3a402f5d finish fixing pixel alignment for raster rendering in cairo - closes #1471 2012-09-12 13:25:40 -07:00
Dane Springmeyer
61e8a9c236 no need for premultiplied types in warper 2012-09-12 13:22:37 -07:00
Dane Springmeyer
1b4e7a8fd5 the blender is not called when scaling and if it were using pixfmt_rgba32_pre would be wrong, so switch back to pixfmt_rgba32 2012-09-12 12:34:35 -07:00
artemp
8cb2ce41ac raster scaling issue
+ fix rasterizer polygon to be equal to target image
+ align raster to pixel bouyndaries (?)
  ( fixes grey border issue - #1471)
2012-09-12 14:41:27 +01:00
artemp
f5b4ff9429 Merge branch 'master' into conv_simplify 2012-09-10 10:26:14 +01:00
Dane Springmeyer
0de2beac3e improve interplay of maximum-extent and map.zoom_all, now properly clipping to maximum-extent - closes #1473 2012-09-07 10:36:14 -07:00
artemp
29423cfc1c Merge branch 'master' into conv_simplify
Conflicts:
	bindings/python/mapnik_markers_symbolizer.cpp
	plugins/input/ogr/ogr_index_featureset.cpp
	plugins/input/shape/dbfile.cpp
	plugins/input/shape/shapefile.hpp
	src/load_map.cpp
2012-09-07 16:46:02 +01:00
artemp
967d6110bf + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
artemp
11e6ba0c09 + make client methods non-static in classes derived from
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
2012-09-07 14:56:30 +01:00
artemp
8fa0742a53 + make client methods non-static in classes derived from
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
2012-09-07 14:51:25 +01:00
artemp
5f8bb423e8 Merge branch 'conv_simplify' of git://github.com/kkaefer/mapnik into kkaefer-conv_simplify 2012-09-06 13:12:39 +01:00
artemp
a513d3f97d + code: avoid exposing unsafe static methods in datasource_cache ( #1451)
+ python: remove redundent 'instance' method (mapnik.DatasourceCache)
+ python: reflect plugin_directories method
+ tests: update python usage

TODO: consider using similar approach in FontEngine etc..
TODO: consider returning reference from singleton::instance() to
      safeguard from accidental deleting a 'singleton' pointer
2012-09-05 12:53:37 +01:00
Hermann Kraus
786f798cab Use double instead of unsigned while parsing XML.
Closes #1469.
2012-09-05 02:15:58 +02:00
Dane Springmeyer
b385370126 fix spelling of opacity in text/formatting - refs #1470 2012-09-04 13:17:09 -07:00
Dane Springmeyer
551f1e0c66 c++ style 2012-09-03 10:52:36 -07:00
Dane Springmeyer
a12b8f1d2f c++ style 2012-09-03 10:27:48 -07:00
Dane Springmeyer
b8f6b16a56 more portable rounding behavior - refs ##1454 2012-08-31 20:31:06 -07:00
Dane Springmeyer
3d9aa3db10 avoid double drawing of lines with RASTERIZER_FAST 2012-08-30 23:34:43 -07:00
Colin Rundel
bd5df80f75 Minimal roll back const changes
Changes to expression_ptr and path_expression_ptr are causing runtime issues with the python bindings
2012-08-29 16:41:48 -04:00
Colin Rundel
dc3763885c More parser clean up - color parser
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
2012-08-29 16:41:48 -04:00
Colin Rundel
10001f1d4b Expression parsing simplification
Similar idea to path expression parsing cleanup
2012-08-29 16:41:44 -04:00
Colin Rundel
1d0c817170 Make path_expression_ptr have const contents, cleanup 2012-08-29 16:41:43 -04:00
Colin Rundel
0e5f71408e Simplified path_parse implementation
path_parse and path_parse_from_string were redundant, replaced with overloaded path_parse function to achieve the same functionality.

Additional consistency cleanup in load_map.cpp.
2012-08-29 16:41:43 -04:00
Dane Springmeyer
de5970f45e shuffle the mapnik::hue_to_rgb method - no need for it to be in the cpp file 2012-08-28 20:08:43 -07:00
Konstantin Käfer
ae865a59fb Merge branch 'master' into conv_simplify
Conflicts:
	include/mapnik/vertex_converters.hpp
2012-08-28 20:37:27 +02:00
Dane Springmeyer
c9bd0c8e51 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-27 17:59:14 -07:00
Dane Springmeyer
5120d0398d add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438 2012-08-27 17:58:49 -07:00
Dane Springmeyer
ac418a7d4e remote the last references 2012-08-27 16:43:40 -07:00
Colin Rundel
12f2c247b3 Added set_name to font_set class 2012-08-27 16:09:29 -04:00