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

5433 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
eb779b1580 only link libjpeg if we are building with jpeg support 2012-06-04 15:23:08 -07:00
Dane Springmeyer
11e81fdb03 finish exposing markers symbolizer in python - closes #612 2012-06-04 13:42:51 -07:00
Dane Springmeyer
f3073f3693 agg/grid renderers - match cairo by using buffered detector dimensions for placement_finder collision tests 2012-06-04 13:41:35 -07:00
Dane Springmeyer
c8c2d98c0e avoid compiler warnings with msvc 2012-06-04 11:36:27 -07:00
Dane Springmeyer
857a6950f7 fix warning message for pending features for markers 2012-06-04 11:11:29 -07:00
Dane Springmeyer
d7d346d799 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-02 11:21:52 -07:00
Artem Pavlenko
024ebfdfe3 + better not to use errno (via perror) for std::iostreams 
(it works with gcc and friends but non-standard)
 2012-06-01 12:19:42 +01:00
Artem Pavlenko
edd5148aa4 Merge pull request #1239 from simonsonc/viewer-wheel-event 
viewer: add mouse wheel zooming
 2012-06-01 01:10:12 -07:00
Carl Simonson
c696c85dd4 viewer: add mouse wheel zooming 
This change makes the viewer zoom in and out when using the scroll wheel.
The zoom tracks the position of the mouse pointer when zooming in so that
the map will be centered under the mouse after a zoom.
 2012-05-31 19:27:19 -05:00
Dane Springmeyer
9f83f84983 Merge pull request #1238 from simonsonc/viewer-exceptions 
viewer: show more exception messages
 2012-05-31 16:38:14 -07:00
Carl Simonson
963cd83f98 viewer: show more exception messages 
When trying to render the map widget in the viewer, we catch exceptions
and print out the message to stderr. The only exceptions that are printed
are mapnik::config_error messages. mapnik can throw more errors, so this
change makes it catch all std::exceptions.
 2012-05-31 18:11:10 -05: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
90c3415d9b + don't premultiply pattern source 
+ cleanup
 2012-05-31 13:26:16 +01: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
Artem Pavlenko
6e23b64244 + don't draw 'frame' to match AGG renderer output 2012-05-30 16:29:39 +01:00
Artem Pavlenko
f4539474fc + scale_factor is 1.0 in cairo renderer 
TODO: should consider using variable scale_factor as in AGG
 2012-05-30 16:27:55 +01:00
Artem Pavlenko
9ae70c4823 + take into account opacity from fill and stroke rgba8 colour 2012-05-30 16:26:34 +01:00
Dane Springmeyer
9a18cb2cf6 amend 733c2df0a8 - graphics.hpp is needed on windows 2012-05-29 17:10:41 -07:00
Dane Springmeyer
a359c60236 include cairo-version header explicitly 2012-05-29 16:57:58 -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
Artem Pavlenko
e71d38fc54 Merge pull request #1231 from mirecta/conv_transform 
agg::conv_transform: changed transformer to non-const reference
 2012-05-29 12:52:20 -07: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
9dc4cb34cc + point symbolizer needs 'image-transform' via @lightmare 2012-05-29 12:03:14 +01:00
Artem Pavlenko
d85605eba1 + avoid unnecessary mapnik::feature_ptr copying 2012-05-29 11:54:12 +01:00
Hermann Kraus
472e81fe68 Correctly transform marker bounding box. 
Refs #1119.
 2012-05-28 02:46:34 +02:00
Hermann Kraus
0697461488 Add compatiblity layer for C++ code. 2012-05-27 01:15:03 +02:00
Artem Pavlenko
f692df9337 + untabify 2012-05-25 13:28:00 +01:00
Artem Pavlenko
6bea57d690 + implement grain-merge blending mode (GIMP) 2012-05-25 10:35:43 +01:00
Dane Springmeyer
b7052029d8 start requiring >= boost 1.47 to enable things like the carto parser to be integrated soon 2012-05-24 17:07:56 -07:00
Dane Springmeyer
09426bf324 remove option to link againt external AGG - our local copy has critical fixes and is required 2012-05-24 17:05:51 -07:00
Dane Springmeyer
43d6de7fa6 add partial test files for second case of #997 2012-05-24 16:57:17 -07:00
Dane Springmeyer
e1fa732f90 add test for alpha blending during bilinear scaling - refs #997 2012-05-24 16:39:24 -07:00
Dane Springmeyer
19631e50e2 restore pristine agg2.4 agg:span_image_resample_rgba_affine - refs #1227 2012-05-24 14:12:04 -07: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
Dane Springmeyer
6fd92dcc3e do not premultiply the image mask being composited to the target buffer - fixes #1211 2012-05-24 13:41:00 -07:00
Dane Springmeyer
a567c02306 Revert "update test images used for validating compositing" 
This reverts commit ac2d935c28.
 2012-05-24 11:05:17 -07:00