Commit graph

6562 commits

Author SHA1 Message Date
artemp
d304464b30 + image-filters
accept following syntax in agg-stack-blur:

```c++
agg-stack-blur
agg-stack-blur()  // rx = 1, ry = 1

agg-stack-blur(10) // rx = 10, ry = 1

agg-stack-blur(10,10) // rx=10,ry = 10

```
2013-02-27 11:07:43 -05:00
artemp
8dabe098ce + image-filters: add support for an optional function like syntax 2013-02-27 11:07:43 -05:00
Dane Springmeyer
a4f1dcf891 Merge branch 'master' of github.com:mapnik/mapnik into hsla-filter 2013-02-27 11:06:14 -05:00
Dane Springmeyer
f232d026c3 scons: fix behavior of scons --clean install 2013-02-27 10:37:27 -05:00
Dane Springmeyer
00c2ff999d fix all double to_string conversion failures by using sprintf method in all cases - closes #1741 2013-02-27 10:08:55 -05:00
artemp
f7a726445e + log rendering times 2013-02-27 10:01:39 -05:00
artemp
c0710c7b14 + update viewer.pro to use cxxflags 2013-02-27 10:01:39 -05:00
artemp
0745d07a79 + use cxxflags option 2013-02-27 10:01:39 -05:00
Dane Springmeyer
9a49d0c82f Merge branch 'master' of github.com:mapnik/mapnik 2013-02-27 09:40:25 -05:00
Dane Springmeyer
ef021e84ad comment out non-critical failing karma conversion to_string tests, leaving just single important failure - refs #1741 2013-02-27 09:40:16 -05:00
Dane Springmeyer
04199e2a94 touchups to hsla work 2013-02-27 09:38:54 -05:00
artemp
8f12da81d1 + image-filters: make grammar more flexible to accomodate
different ctors signitures
+ add 'hsla' filter placeholder (TODO: add impl)
+ remove inused <iostream> include
2013-02-27 08:29:56 -05:00
Dane Springmeyer
f5d5502bc4 start implementing hsla image-filter 2013-02-26 19:21:05 -05:00
Dane Springmeyer
70940088d7 formatting 2013-02-26 16:52:51 -05:00
Dane Springmeyer
270a6eff33 allow passing scale_denom to renderer's apply method to allow overriding zoom level - closes #1582 2013-02-26 16:49:39 -05:00
Dane Springmeyer
e04b8284ce use JOBS instead of NPROCS for controlling build concurrency 2013-02-26 15:22:22 -05:00
Dane Springmeyer
9f27b02435 Merge pull request #1737 from mapnik/map-request
Rendering hook to allow for passing mutable map properties via mapnik::request object
2013-02-26 12:06:38 -08:00
Dane Springmeyer
4d82a97814 implement support in cairo and grid renderer for mapnik::request - refs #1737 2013-02-26 15:05:44 -05:00
Dane Springmeyer
575164afb7 enable cairo in the cpp tests 2013-02-26 15:00:04 -05:00
Dane Springmeyer
74fbf9a7b2 fix cairo dash array rendering - closes #1740 2013-02-26 14:58:58 -05:00
Dane Springmeyer
7b950117e2 Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-26 12:57:11 -05:00
artemp
97f5d7c437 Merge remote-tracking branch 'origin/master' 2013-02-26 12:45:56 -05:00
artemp
cdee64709b + c++ style 2013-02-26 12:45:15 -05:00
artemp
218aca2159 + remove redundant const qualifier 2013-02-26 12:43:29 -05:00
Dane Springmeyer
054cb13231 Merge branch 'master' of github.com:mapnik/mapnik 2013-02-26 12:07:53 -05:00
Dane Springmeyer
d861636fbc move const char string2value interface to use iterators 2013-02-26 12:07:36 -05:00
artemp
910d4d86f8 Merge remote-tracking branch 'origin/master' 2013-02-26 11:59:05 -05:00
artemp
be61bf6fef + pass by reference when possible (c++) 2013-02-26 11:58:07 -05:00
artemp
3b5707848e + use icu::UnicodeString::remove
+ formatting - c++ style comments
2013-02-26 11:46:22 -05:00
artemp
1ea60c472c + pass pixel_position by const ref
+ use BOOST_FOREACH for brevety
2013-02-26 11:45:24 -05:00
artemp
c3fab9e665 + formatting/cleanup 2013-02-26 11:44:23 -05:00
kunitoki
a9d055aefe Merge branch 'master' of github.com:mapnik/mapnik 2013-02-26 17:42:01 +01:00
kunitoki
5abd52b25f - partially reverted occi changes: oracle Number datatype should really be interpreted as double (not integer or string) 2013-02-26 17:41:14 +01:00
artemp
a1ea1701dd + use c++ style comments 2013-02-26 11:02:48 -05:00
artemp
ea4b6d0802 + remove const qualifier 2013-02-26 10:59:11 -05:00
artemp
bda0375f97 + formatting 2013-02-26 10:58:46 -05:00
Dane Springmeyer
712ff50abe make a few utility functions inline and static 2013-02-26 10:52:41 -05:00
Dane Springmeyer
864fdc5234 Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-25 19:33:54 -05:00
Dane Springmeyer
478a7acb2b c++ style 2013-02-25 19:33:35 -05:00
Dane Springmeyer
00a2f54346 further refine the mapnik::request object which can be passed to custom agg_renderer 2013-02-25 19:33:08 -05:00
Dane Springmeyer
6a00f92517 Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-25 16:49:45 -05:00
kunitoki
5d8b9ba4fc - improved oracle sub-select handling
- fixed a logic problem of the rowlimit clause (when using seb-selects)
- applied tokens to the query (much like the postgis datasource)
- leave oracle to convert most datatypes (should fix occi part of ref #1672)
2013-02-25 11:31:18 +01:00
Artem Pavlenko
8905b1ddec Merge pull request #1733 from kkaefer/value_hash
Fix mapnik::value for boost 1.49 and other icu versions
2013-02-24 16:13:14 -08:00
Konstantin Käfer
8abc44e639 fix mapnik::value for boost 1.49 and other icu versions 2013-02-24 19:02:42 +01:00
Dane Springmeyer
d4a5a53f7d Merge pull request #1730 from kkaefer/multicore-build
Use multiple processors by default
2013-02-23 11:19:24 -08:00
Dane Springmeyer
86d8bf6b98 Merge pull request #1729 from kkaefer/value_hash
Support boost::hash() for mapnik::value
2013-02-23 11:16:49 -08:00
Dane Springmeyer
1454105b12 Merge pull request #1731 from avlee/pythontests
python tests
2013-02-23 08:26:56 -08:00
XinGang Li
a10855da75 fix _MSC_VER typo. 2013-02-23 22:38:16 +08:00
Konstantin Käfer
ad20e38270 use multiple processors by default 2013-02-23 13:10:50 +01:00
Konstantin Käfer
67c537b43b support boost::hash() for mapnik::value 2013-02-23 13:04:47 +01:00