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
XinGang Li
7bb5676f11
Let template parameter type same as declaration in hpp file.
2013-02-22 23:59:01 +08:00
XinGang Li
7f1e416313
Export the to_wkt functions to avoid python bindings access the internal structs.
2013-02-22 23:58:41 +08:00
XinGang Li
df7db521bb
Add parse_image_filters function to avoid python bindings access the internal structs.
2013-02-22 23:58:30 +08:00
XinGang Li
e5d1418417
Add missing class declaration for python bindings.
2013-02-22 23:57:27 +08:00
artemp
21c618ccc5
+ initialize x,y for close_path commands
2013-02-22 15:02:10 +00:00
Dane Springmeyer
1b3b598b80
scons: do not attempt to configure if clean requested
2013-02-21 16:42:33 -08:00
Dane Springmeyer
4115903148
fix spelling
2013-02-21 16:34:14 -08:00
Dane Springmeyer
7c4186b09f
Merge branch 'master' of github.com:mapnik/mapnik into map-request
2013-02-21 14:40:07 -08:00
Dane Springmeyer
ce5c49d814
keep around boost::move based rule cache for benchmarking purposes
2013-02-21 12:52:01 -08:00
Dane Springmeyer
a645eb9a21
Revert "+ use boost::move to emulate 'move' semantics"
...
This reverts commit fe9ff21ba9
2013-02-21 12:50:53 -08:00
Dane Springmeyer
1ad61367bf
Merge branch 'master' of github.com:mapnik/mapnik
2013-02-21 12:36:33 -08:00
Dane Springmeyer
825a628707
compare heap/ptr_vector rule_cache vs stack-based boost::move approach - refs fe9ff21ba9 and #1723
2013-02-21 12:36:16 -08:00
Dane Springmeyer
dcbd92cc58
sync with master
2013-02-21 11:40:19 -08:00
artemp
fe9ff21ba9
+ use boost::move to emulate 'move' semantics
...
for mapnik::rule_cache objects and avoid
dynamically allocating them.
2013-02-21 12:50:23 +00:00
