sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5146 commits 112 branches 95 tags 181 MiB
Commit graph

1581 commits

Author SHA1 Message Date
Artem Pavlenko
048316232c + fix: remove clip_ member var 2012-06-25 14:57:45 +01:00
Dane Springmeyer
5b61c093e5 initialize grid buffers to std::numeric_limits<int>::min() and use that value to mean no-hit or non-interactive pixels - closes #1065 2012-06-23 22:41:07 -04:00
Dane Springmeyer
eb4740b50f fix behavior of compositing via python api now that we have premultiplication issues sorted out in core - refs #1262 and #314 and #1211 2012-06-21 15:44:57 -04:00
Dane Springmeyer
9193ac4446 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-19 17:37:45 -04:00
Dane Springmeyer
f60d85e2e7 fix handling of premultiplication in svg rendering - refs #1262 2012-06-19 17:37:24 -04:00
Tom MacWright
aa5a726b92 Rename color-spin composite operation to colorize alpha 
to make it less confusing alongside actual color manipulation
modes.
 2012-06-19 17:16:25 -04:00
Dane Springmeyer
48a543b5d5 implement style-level opacity - closes #314 2012-06-19 15:10:28 -04:00
Artem Pavlenko
c5864453a0 + only premultiply src 2012-06-18 18:50:32 -04:00
Artem Pavlenko
38f35d6f97 + add missing ',' 2012-06-18 14:41:43 -04:00
Artem Pavlenko
9b61c0effe Merge remote-tracking branch 'origin/master' 
Conflicts:
	deps/agg/include/agg_pixfmt_rgba.h
	include/mapnik/image_compositing.hpp
	src/cairo_renderer.cpp
	src/image_compositing.cpp
 2012-06-18 14:36:15 -04:00
Artem Pavlenko
c71944bf32 + use HSV color space (as in GIMP) 
+ rename 'luminosity' to 'value'
 2012-06-18 14:30:01 -04:00
Tom MacWright
f6c10bbb7e Add color_spin composite operation. 2012-06-18 11:10:04 -04:00
Artem Pavlenko
dc89f6fac4 Merge remote-tracking branch 'origin/master' 2012-06-17 15:21:27 -04:00
Artem Pavlenko
14d365d572 + hue, saturation, color and luminosity blending modes (HSL based) 
(http://en.wikipedia.org/wiki/Blend_modes#Hue.2C_saturation_and_luminosity)
 2012-06-17 15:19:29 -04:00
Dane Springmeyer
bd7ad7cd3c address #1198 by moving away from caching grid features and (back) to copying attributes - also roll back to passing feature_impl& rather than feature_ptr (which is now unneeded) 2012-06-15 22:17:26 -04:00
Dane Springmeyer
7da01b9605 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-15 05:18:26 -07:00
Dane Springmeyer
b12e73fbc7 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-14 19:44:28 -04:00
Artem Pavlenko
689e8ec96d + make feature's optional: -(feature % lit(',')) 2012-06-14 14:40:54 +01:00
Artem Pavlenko
34470af474 + allow empty arrays in "coordinates" property 2012-06-14 14:40:14 +01:00
Dane Springmeyer
d33496baa7 split up code that handles datasource plugin registration 2012-06-13 19:25:59 -04:00
Artem Pavlenko
1f383abbad + fix conflict 2012-06-12 14:18:29 +01:00
Artem Pavlenko
1774456a2e + fix GeoJSON output in metawriter_json 
(FIXME: output proper geometry types - don't shortcut to Multi***)

Conflicts:

	include/mapnik/metawriter_json.hpp
 2012-06-12 14:05:53 +01:00
Dane Springmeyer
eb8f27bee7 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-07 13:17:44 -05:00
Mickey Rose
1e3c48afb1 split parse_transform.hpp, set dynamic transform expression from python 2012-06-07 17:06:45 +02:00
Dane Springmeyer
51d3310012 grid encoding: reuse key string 2012-06-07 07:27:42 -07:00
Artem Pavlenko
013f0aa62f + add templated ctor and avoid including agg_trans_affine.h 2012-06-07 11:51:23 +01:00
Artem Pavlenko
11c34b1599 Merge branch 'transform_expr' of https://github.com/mirecta/mapnik 2012-06-07 10:20:05 +01:00
Dane Springmeyer
957c40f763 move to int32 for grid rendering buffer - closes #1196 2012-06-06 16:36:38 -07:00
Dane Springmeyer
76211243a4 remove now unused blending modes as they have been replaced with AGG compositing modes - refs #1206 2012-06-06 16:16:30 -07:00
Mickey Rose
bd9609c370 new feature: transform expressions are now dynamic 
(cherry picked from commit 173c402b5c142310087246b0ea54dbec54edcac8)

Conflicts:

	include/mapnik/vertex_converters.hpp
	src/agg/process_markers_symbolizer.cpp
	src/agg/process_point_symbolizer.cpp
	src/agg/process_polygon_pattern_symbolizer.cpp
	src/load_map.cpp
 2012-06-06 17:34:26 +02:00
Mickey Rose
dad0bdacfc add value_null operators, improve is_null, move mapnik::value definition into separate namespace 
(cherry picked from commit 653bca6bea1abb2e45c66e76fd5e4fe7dc10a91a)
 2012-06-06 17:34:17 +02:00
Mickey Rose
46c2d1c710 add operators for computing the envelope of a transformed box2d 
(cherry picked from commit 9ad342cbed150948561c08e98957bc014dedc7f3)
 2012-06-06 17:34:02 +02:00
Dane Springmeyer
291bc9b8ba explicitly include projection header 2012-06-04 17:16:44 -07:00
Dane Springmeyer
11e81fdb03 finish exposing markers symbolizer in python - closes #612 2012-06-04 13:42:51 -07:00
Artem Pavlenko
404ddf329d Revert "+ avoid copying" 
This reverts commit de71db7d38.

Conflicts:

	include/mapnik/vertex_converters.hpp
 2012-05-31 15:55:20 +01:00
Artem Pavlenko
bf7500a8b0 Merge pull request #1234 from mirecta/unary_expr 
unary minus operator on mapnik::value and in expression_grammar
 2012-05-31 05:51:07 -07:00
Artem Pavlenko
500f57cf60 + make vertex() and rewind() methods const 
+ remove unused coord_transforms
+ rename coord_transform2 to coord_transform
 2012-05-31 12:13:09 +01:00
Artem Pavlenko
6190cf22f1 + pass Args by const-ref 2012-05-31 10:40:23 +01:00
Artem Pavlenko
7eb8d175da + cleanup 2012-05-31 09:37:00 +01:00
Artem Pavlenko
de71db7d38 + avoid copying 2012-05-31 09:33:55 +01:00
Dane Springmeyer
9a18cb2cf6 amend 733c2df0a8 - graphics.hpp is needed on windows 2012-05-29 17:10:41 -07:00
Dane Springmeyer
5feb9750e5 amend eaa53b0 and #1232 to compile with clang++ by avoiding first pass instanciation of intentionally invalid templates - refs #985 2012-05-29 15:28:35 -07:00
Mickey Rose
a6b4bb88ce unary minus operator on mapnik::value and in expression_grammar 2012-05-29 23:45:13 +02:00
Dane Springmeyer
eaa53b0904 Merge pull request #1232 from mirecta/issue-985 
fix/prevent to_expression_string misuse #985
 2012-05-29 14:41:23 -07:00
Dane Springmeyer
109081bef3 Revert "fix transform (patch from #1204)" 
This reverts commit b42e4988ec.
 2012-05-29 14:06:47 -07:00
Dane Springmeyer
e8e8ba1f96 Revert "followup to b42e4988e, fix svg transforms for svg render as well as render_id - refs #1204" 
This reverts commit ac9dc4762a.
 2012-05-29 14:06:23 -07:00
Mickey Rose
09b05b48b0 fix/prevent to_expression_string misuse #985 2012-05-29 22:53:39 +02:00
Mickey Rose
44538e29d4 agg::conv_transform: changed transformer to non-const reference (replaces ba270e0) 2012-05-29 18:32:04 +02:00
Artem Pavlenko
f3c774baa4 + add grain-extract blending mode (gimp) 2012-05-29 15:09:33 +01:00
Artem Pavlenko
e7ae5121a2 + correct image_width padding calc - via @lightmare 2012-05-29 12:38:10 +01:00
Artem Pavlenko
6bea57d690 + implement grain-merge blending mode (GIMP) 2012-05-25 10:35:43 +01:00
Dane Springmeyer
28b9729ae7 Revert "restore pristine agg2.4 agg:span_image_resample_rgba_affine - refs #1227" 
This reverts commit 225678eccb.
 2012-05-24 14:11:42 -07:00
Dane Springmeyer
225678eccb restore pristine agg2.4 agg:span_image_resample_rgba_affine - refs #1227 2012-05-24 14:10:52 -07:00
Artem Pavlenko
181c470bd6 + correct calculations 2012-05-24 12:51:12 +01:00
Artem Pavlenko
bd25a9af92 + handle boundary pixels in x/y gradients 2012-05-24 12:44:07 +01:00
Artem Pavlenko
0542994c4d + implement y-gradient in terms of x-gradient 2012-05-24 12:11:55 +01:00
Artem Pavlenko
1077b79a63 Revert "initialise blur radius's to 1 for real this time" 
This reverts commit f76c6ee25f.
 2012-05-24 11:37:24 +01:00
Artem Pavlenko
f76c6ee25f initialise blur radius's to 1 for real this time 2012-05-23 20:38:42 +01:00
Artem Pavlenko
4fc4535c95 + initialise blur radius's to 1 in default ctor 2012-05-23 20:29:07 +01:00
Artem Pavlenko
fb34c7ef5a + handle boundary cases in 3x3 convolution 2012-05-23 20:26:24 +01:00
Artem Pavlenko
6471cfc597 + unnamed args in image-filters #1222 2012-05-23 20:23:10 +01:00
Artem Pavlenko
42dc568034 + don't rely on C99 support, use <boost/cstdint.hpp> instead 2012-05-17 08:49:18 +01:00
Dane Springmeyer
fb0ef869d6 Merge branch 'master' of github.com:mapnik/mapnik 2012-05-15 10:35:56 -07:00
Dane Springmeyer
8f79641383 only use skipping if >= boost 1.47 - corrects #1209 (refs #1210) 2012-05-15 10:35:04 -07:00
Artem Pavlenko
1b210ba456 + use compositing renderer for markers,points and shields 2012-05-15 16:13:08 +01:00
Artem Pavlenko
55d5d8596d + pass by const-ref 
+ remove explicit keyword from default ctor
 2012-05-15 14:40:24 +01:00
Dane Springmeyer
3d89e4001a expose no-args agg_stack_blur constructor 2012-05-14 19:00:29 -07:00
Artem Pavlenko
9599711e0e Merge remote-tracking branch 'origin/master' 2012-05-14 17:33:45 +01:00
Artem Pavlenko
983db006e9 + custom span_image_filter 2012-05-14 17:30:50 +01:00
Artem Pavlenko
733c2df0a8 remove unused header 2012-05-14 17:14:05 +01:00
Dane Springmeyer
c1495c0c74 restore the fast line rasterizer (rasterizer_outline_aa) and improve its rendering quality and consistency with standard method - refs #873 2012-05-11 17:40:21 -07:00
Dane Springmeyer
54f54ed775 rename composite args 2012-05-11 15:31:35 -07:00
Dane Springmeyer
8ae867f6de default values for composite args to maintain api compatibility 2012-05-11 15:19:05 -07:00
Dane Springmeyer
c9bedf8bd4 restore compile with boost < 1.47 - disables stacked image filters for now 2012-05-11 14:08:46 -07:00
Dane Springmeyer
ac9dc4762a followup to b42e4988e, fix svg transforms for svg render as well as render_id - refs #1204 2012-05-11 07:16:42 -07:00
Artem Pavlenko
b42e4988ec fix transform (patch from #1204) 2012-05-11 12:46:46 +01:00
Artem Pavlenko
7380a6a001 + fix raster_symbolizer: add x/y dst args to composite 2012-05-11 10:55:58 +01:00
Artem Pavlenko
8085110e8f + add opacity parameter 2012-05-10 18:14:53 +01:00
Artem Pavlenko
8cd898ce35 + make comp_op non-optional ( default: src-over) 
+ move ctors implementations into *.cpp
 2012-05-10 12:05:40 +01:00
Dane Springmeyer
ab73f13525 rename the image transform for clarity 2012-05-09 18:15:34 -07:00
Artem Pavlenko
aad7c5e384 + implement compositing for text 
+ refactor image_32
 2012-05-09 12:39:23 +01:00
Artem Pavlenko
a2115c718b + fix ctor's 2012-05-07 16:37:12 +01:00
Artem Pavlenko
7e49a6f44e + move 'smooth' property to symbolizer_base level 
+ remove 'SYMBOLIZER_FAST' completely
 2012-05-07 16:08:16 +01:00
Artem Pavlenko
3a8d3c5042 + better formatting 2012-05-07 16:06:33 +01:00
Artem Pavlenko
9ba04738d6 + don't expose agg headers 2012-05-04 10:23:49 +01:00
Artem Pavlenko
b0f87ee9b2 + remove unused enum value 2012-05-04 10:22:50 +01:00
Artem Pavlenko
164ba630d9 + add requirement for renderers-> provide processor_impl_type 
to allow process_xxx functions declaration in base class
+ re-enanble cairo renderer
 2012-05-03 12:19:26 +01:00
Artem Pavlenko
3d12c63740 + use scale_factor fix 2012-05-03 12:18:54 +01:00
Artem Pavlenko
e23fdb276f + pass scale_factor to vertex_converter 2012-05-02 17:22:54 +01:00
Artem Pavlenko
44c5efbf75 + add miterlimit parameter 2012-05-02 17:04:24 +01:00
Artem Pavlenko
2f0fa10db5 cleanup 2012-05-02 16:32:09 +01:00
Artem Pavlenko
a475b6e0bc + add offset_converter 2012-05-02 15:13:46 +01:00
Artem Pavlenko
77dfac5622 + re-introduce transform on symbolizer_with_image 2012-05-01 16:47:33 +01:00
Artem Pavlenko
2e9a7d9cc8 + explicit keyword only makes sense for 1 arg ctor's 2012-05-01 14:24:53 +01:00
Artem Pavlenko
a72ee4ba66 Merge branch 'master' into compositing 
Conflicts:
	include/mapnik/image_compositing.hpp
	include/mapnik/util/conversions.hpp
	include/mapnik/value.hpp
	src/agg/agg_renderer.cpp
	src/agg/process_line_symbolizer.cpp
	src/agg/process_polygon_symbolizer.cpp
	src/png_reader.cpp
	src/svg_parser.cpp
	utils/svg2png/svg2png.cpp
 2012-05-01 12:35:49 +01:00
Artem Pavlenko
f57d2c28f0 + 'direct' image filter support: apply filter on main rendering buffer 
(TODO: better user-friendly names)
+ allow empty string e.g image-filters="" (why not?)
 2012-04-25 10:54:54 +01:00
Artem Pavlenko
c26ad5706e + move 'clip' property to symbolizer_base 
+ support 'clip' accross relevant symbolizer (agg)
 2012-04-24 11:10:54 +01:00
Artem Pavlenko
a4cdc7a1c0 + make comp_op boost::optional<> 
+ use plain pixf when style_level_compositing=true
 2012-04-23 15:41:18 +01:00
Artem Pavlenko
03d42e59a5 + allow specifying premultiply flag for src and dst images 
+ fix logic in agg_renderer (TODO)
 2012-04-20 14:53:11 +01:00
Dane Springmeyer
16a16b1818 only print failed face_set_ptr loading for fontsets if MAPNIK_LOG is defined - refs #1175 2012-04-19 11:27:04 -07:00
Dane Springmeyer
703d4ab7f2 for >= boost 1.45 (compile does not work with 1.42) move to karma for to_string conversions to avoid lexical cast - refs #1055 2012-04-19 10:29:37 -07:00
Artem Pavlenko
720035102b remove lexical_cast usage 2012-04-19 13:36:21 +01:00
Artem Pavlenko
145f83b806 boost::spirit::karma based to_string impl 2012-04-19 13:35:41 +01:00
Artem Pavlenko
7ae0383a4b disable unused vars warnings 
cleanup
 2012-04-18 17:00:49 +01:00
Artem Pavlenko
d0f0d0b35d Merge branch 'compositing' of github.com:mapnik/mapnik into compositing 2012-04-18 16:48:25 +01:00
Artem Pavlenko
bb86fd285e consistent naming 
unsigned int parser with max 3 digits
 2012-04-18 16:46:38 +01:00
Dane Springmeyer
dab6936f05 embose -> emboss 2012-04-18 07:37:46 -07:00
Dane Springmeyer
2f65a7612d allow cairo compile 2012-04-18 07:09:12 -07:00
Artem Pavlenko
668d6f2325 image-filters: initial implementation 2012-04-18 12:14:23 +01:00
Artem Pavlenko
e54aaba09b impl affine tranform converter 2012-04-18 09:44:26 +01:00
Artem Pavlenko
831538b522 move svg transform to symbolizer_base 2012-04-18 09:42:19 +01:00
Artem Pavlenko
9af11c5ef2 only allocate internal buffer if required 2012-04-18 09:37:02 +01:00
Dane Springmeyer
f3bc7f011f fix linking errors experienced by node-mapnik on windows 2012-04-17 18:58:24 -07:00
Dane Springmeyer
b0d857a66a do not list mapping in feature init list - creates -Worder warning 2012-04-16 22:33:16 -07:00
Dane Springmeyer
f77d9b6df1 formatting 2012-04-16 22:24:34 -07:00
Dane Springmeyer
8fd0a40749 finish work on populating initialization lists - closes #1114 2012-04-16 21:57:24 -07:00
Dane Springmeyer
77ac2992ab remove uneeded semicolon 2012-04-16 21:19:58 -07:00
Dane Springmeyer
a4b3daf181 close #1176 again 2012-04-12 17:25:57 -07:00
Dane Springmeyer
422fe6e6be fix compile with boost 1.44 or 1.45 - closes #1176 2012-04-12 16:18:33 -07:00
kunitoki
d717c715fc - always log errors and fatals, regardless of MAPNIK_LOG definition 2012-04-12 23:45:03 +02:00
Dane Springmeyer
00ab1b672d svg icon rendering: fix for thin lines displaying slightly too thick compared to other renderers (safari/chrome) - closes #1129 - refs #975 2012-04-11 10:27:37 -07:00
Artem Pavlenko
57d6d62440 + support 'display' property, if set to 'none' don't parse children #1137 
+ fix memory leak : xmlTextReaderGetAttribute -> string must be deallocated by the caller
+ call xmlTextReaderMoveToElement after xmlTextReaderMoveToFirstAttribute loop to restore
  reader position.

Conflicts:

	src/svg_parser.cpp
 2012-04-11 14:36:39 +01:00
Artem Pavlenko
bba21e3d9c + support 'display' property, if set to 'none' don't parse children #1137 
+ fix memory leak : xmlTextReaderGetAttribute -> string must be deallocated by the caller
+ call xmlTextReaderMoveToElement after xmlTextReaderMoveToFirstAttribute loop to restore
  reader position.
 2012-04-11 14:00:34 +01:00
Artem Pavlenko
45b0dd6482 + support smooth conv in polygon_pattern_symbolizer 2012-04-10 15:46:38 +01:00
kunitoki
81c9dd7b6b - added the ability to set the default global severity from scons configure 
- initial check in of setting global severity from getenv (todo)
 2012-04-10 16:19:51 +02:00
kunitoki
1a203d3f85 - cleaned up logger interface to better integrate with python bindings 
- polished and finished python bindings for logger interaction
 2012-04-10 10:14:28 +02:00
kunitoki
67ba40080c - fixing remaining cerr traces 2012-04-10 00:58:18 +02:00
kunitoki
fb94e4a2ec - replace all instances of std::cerr with MAPNIK_LOG_* 2012-04-10 00:51:04 +02:00
kunitoki
a902a08aab - added logging to file 
- started working on the logger bindings
- cleanups some error reporting with cerr/clog in the library
 2012-04-10 00:25:31 +02:00
kunitoki
b60c508c1c - finish thrashing all the useless ifdef MAPNIK_LOG 2012-04-09 21:41:56 +02:00
Artem Pavlenko
f727cb81b8 + format 2012-04-09 12:24:52 +01:00
Artem Pavlenko
f7c406bf80 remove empty lines 2012-04-09 12:24:04 +01:00
kunitoki
74342e3083 - no need to #ifdef all the time: the compiler should optimize out the log calls when no MAPNIK_LOG is defined 
- initially got rid of those ifdefs in plugins only
 2012-04-09 12:05:49 +02:00
kunitoki
2df8e99af2 Merge branch 'master' of github.com:mapnik/mapnik 2012-04-09 03:03:31 +02:00
kunitoki
8c58a9aa73 - improved again the logging facilities 
- aligned the plugins to using the new methods with severity
- implemented per object severity, with fallback to global (with global functions to set them programmatically)
- initial check in of logger python bindings (todo)
 2012-04-09 03:00:51 +02:00
Dane Springmeyer
55ea1e4621 get stats output working on windows 2012-04-08 10:52:48 -07:00
kunitoki
50de846082 - fixed a compilation error when no logging is defined 2012-04-08 04:09:48 +02:00
kunitoki
4ef7343416 - added severity to logger (global variable for now) 
- added a logger class for each severity level
 2012-04-08 03:59:47 +02:00
kunitoki
af201551b8 got rid of old CVS $Id comments kludge in files 2012-04-08 02:45:01 +02:00
kunitoki
1f351e0e09 implement new debug system 2012-04-08 02:20:56 +02:00
Dane Springmeyer
19f5f77417 reuse path_expression_grammar - finishes and closes #1028 2012-04-06 16:50:11 -07:00
Dane Springmeyer
215f7a911c remove lexical cast from value_type conversions - refs #1055 2012-04-06 14:20:32 -07:00
Dane Springmeyer
ab776edbf5 reduce string copying slightly in populate_tree - refs #1055 2012-04-06 12:58:08 -07:00
Dane Springmeyer
cb048b92d4 formatting 2012-04-06 12:29:51 -07:00
Dane Springmeyer
36516c00e2 Merge branch 'master' of https://github.com/mapnik/mapnik 2012-04-05 16:59:52 -07:00
Dane Springmeyer
7b84a2ce94 fix linking of postgis.input by using MAPNIK_DECL and ensuring the header is included in src/conversions.cpp - closes #1127 2012-04-05 16:59:36 -07:00
Dane Springmeyer
f90a07eb94 add explicit include for MAPNIK_DECL 2012-04-05 14:41:52 -07:00
Artem Pavlenko
738ff501fe remove CompositingSymbolizer 2012-04-05 17:04:11 +01:00
Artem Pavlenko
34c984b2b8 + support compositing across all symbolizers 
(currently polygon and line symbolizers)
 2012-04-05 15:59:11 +01:00
Dane Springmeyer
d29ae14104 make it possible to set the map.maximum_extent back to None/uninitialized from python 2012-04-04 12:07:15 -07:00