Commit graph

6396 commits

Author SHA1 Message Date
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
XinGang Li
666f27787b Use path.join instead of string concatenation. 2013-02-23 17:35:31 +08:00
Dane Springmeyer
10d7a7591a formatting as per c++ style 2013-02-22 18:58:36 -08:00
Dane Springmeyer
b472cd0e14 scons: enable control of shpindex and svg2png tools 2013-02-22 17:15:29 -08:00
Dane Springmeyer
e802943469 only build tiff/png readers if support is requested 2013-02-22 16:55:02 -08:00
Dane Springmeyer
3f9e232b9a scons: only link in libraries that are required by the build 2013-02-22 15:13:39 -08:00
Dane Springmeyer
b9e065cc58 update changelog 2013-02-22 13:58:38 -08:00
Dane Springmeyer
16817fe6ea Merge branch 'master' of github.com:mapnik/mapnik into map-request 2013-02-22 13:50:06 -08:00
Dane Springmeyer
662ff26f94 im/view.is_solid method in python bindings to match node-mapnik - closes #1728 2013-02-22 13:40:05 -08:00
Dane Springmeyer
b5a74292a5 return stylename,styleo obj in tuple from map.styles - closes #1725 - amends 16ce1f5bdd 2013-02-22 13:39:14 -08:00
Dane Springmeyer
edbe5aca32 Merge branch 'master' of github.com:mapnik/mapnik 2013-02-22 13:00:10 -08:00
Dane Springmeyer
82e1846d5a Merge pull request #1727 from avlee/pythonbindings
Build python bindings with msvc
2013-02-22 12:59:53 -08:00
Dane Springmeyer
bdf1a08f1e ensure python bindings return const params 2013-02-22 12:41:12 -08:00
Dane Springmeyer
249c77d7b8 expose nonconst access to datasource parameters 2013-02-22 12:40:40 -08:00
XinGang Li
fa52c389b8 Only explictly defining the enumeration template class for msvc. 2013-02-23 00:51:37 +08:00
XinGang Li
3dd19d2cde Add IMPLEMENT_ENUM of enum gradient_unit_e. 2013-02-23 00:08:58 +08:00
XinGang Li
b1b90f527a Fixed the enumeration link error with msvc when build python bindings. 2013-02-22 23:59:12 +08:00