Commit graph

7437 commits

Author SHA1 Message Date
artemp
656c9e724f + re-arrange expression 2013-05-08 17:21:34 +01:00
artemp
75aa6e94d8 + expression_optimizer (experimental)
at the moment very basic ops are supported e.g

```
expr = 1+1+1 ---> expr = 3
expr = 1+1+[ATTR] ---> 2+[ATTR]

expr = [ATTR] + 1 + 1  ---> ([ATTR] + 1) + 1  ### stays unchaged
expr = [ATTR] + 1/3.14159 + 1 ---> ([ATTR] + 0.31831) + 1
```
2013-05-08 16:54:25 +01:00
artemp
4138a70a52 mapnik::value
to_expression_string - add missing specialization
for mapnik::value_integer and remove usage of std::stringstream
2013-05-08 16:51:28 +01:00
artemp
b086e2d20c + small optimization - pass and return const ref 2013-05-07 16:12:57 +01:00
artemp
4915bf138e mapnik::value + add move ctor
mapnik::feature + pass attributes by r-value.
2013-05-07 12:04:06 +01:00
Dane Springmeyer
944eb5e2f7 rename variable for clarity 2013-05-06 12:38:41 -07:00
artemp
42d8dfa322 + add move ctor and 'canonical' assignment operator 2013-05-06 15:54:17 +01:00
artemp
31a506f3cb + use more consise c++11 syntax 2013-05-06 15:52:04 +01:00
Robert Coup
4f40993ee6 Merge pull request #1823 from thjc/master
Fix for #1588 Postgis: Concurrency problem with CursorResultSet. Thanks @thjc
2013-05-05 21:59:20 -07:00
artem@windows
b29fe11e35 + fix font_set::size return type 2013-05-03 16:43:25 -07:00
artemp
1635834f60 + remove inline qualifier 2013-05-03 16:38:55 +01:00
artemp
f70e39c1e6 + make comma separator optional (preserve space delimitted syntax) 2013-05-03 16:06:51 +01:00
artemp
6490245218 + remove more cruft 2013-05-03 14:21:34 +01:00
artemp
b6d24c6b35 remove cruft 2013-05-03 11:44:43 +01:00
artemp
1847ce581d box2d
+ re-implement from_string avoiding tokenizer (~10x faster)
2013-05-03 11:41:43 +01:00
artem@windows
29f9273d3e + msvc : fix warnings (TODO: work-in-progress) 2013-05-02 14:07:06 -07:00
artem@windows
ffc7a088a4 use std::move
msvc : temp fix https://svn.boost.org/trac/boost/ticket/2839
2013-05-02 12:03:16 -07:00
artem@windows
f611892915 remove redundant header 2013-05-02 12:02:13 -07:00
artemp
43968b6c50 + c++ style : formatting 2013-04-30 18:47:17 +01:00
artemp
a8376d2a4b + fix method signature 2013-04-30 18:46:34 +01:00
artem@windows
9a64415a03 use std::size_t to avoid conversion warnings 2013-04-30 10:06:47 -07:00
artem@windows
16c0b578bc c++11
+ use std::size_t
+ re-implement envelope() method in terms of c++11
2013-04-30 09:51:08 -07:00
artem@windows
231e4ab907 output supported image formats in rundemo c++ 2013-04-30 09:50:26 -07:00
artemp
95e3c87f05 + revert to using boost::math::trunc
+ and mapnik::noncopyable

vc++ (*) doesn't support std::trunc and deleting methods in class/struct definition

* - vc++ 2012 November CTP
2013-04-30 09:32:22 +01:00
artem@windows
abd42357d6 + add <cmath> header to keep cl.exe happy 2013-04-30 08:55:51 +01:00
Toby Collett
ac09541243 Use shared pointer reference count to track pools
By using the shared pointer reference count to track the connections
in the connection pool we no longer have to explicitly return them
to the pool.

This resolves an issue where cursor feature sets were returning their
connections before they were done with them, causing a potential race
with another connection user.
2013-04-29 20:33:57 +00:00
artem@windows
faa8394ef6 + add <cmath> header to keep cl.exe happy 2013-04-29 04:21:28 -07:00
Hermann Kraus
24913c4759 Merge pull request #1781 from mapnik/subpixelhalo
Render halos < 1.0 with fast halo algorithm.
2013-04-24 16:23:39 -07:00
artemp
58927b404c c++11
+ replace BOOST_FOREACH with for( : )
+ remove boost/foreach.hpp
+ fix benchmarks (17,18)
2013-04-24 16:40:35 +01:00
artemp
49fe99ac4f + make rule_cache movable
+ use rule_cache move semantics in feature processor
2013-04-24 10:08:10 +01:00
Dane Springmeyer
e62126ff48 update expected map-request image - seems valid, not sure when/what changed 2013-04-23 18:34:16 -07:00
artemp
03d08799e0 + add missing .cpp file 2013-04-23 18:18:03 +01:00
artemp
f897a54445 + reflect wkt_parser in python
```python

import mapnik
reader = mapnik.WKTReader()
geometry = reader.read("Point(123 123)")

```
2013-04-23 15:10:06 +01:00
artemp
80c5452130 + fix phoenix functions to compile on ubuntu 12.04/c++11
+ cleanups
2013-04-23 14:00:08 +01:00
artemp
2b9ce83226 + fix typo 2013-04-23 12:29:43 +01:00
artemp
e38ce37ed3 * use move semantics
* use light weight wkb_stream wrapper to avoid locale/formatting locking
2013-04-22 15:24:47 +01:00
artemp
ea28abf203 Merge branch 'master' into image-readers-c++11
Conflicts:
	bindings/python/mapnik_image.cpp
	include/mapnik/factory.hpp
	include/mapnik/image_reader.hpp
	src/image_reader.cpp
	src/jpeg_reader.cpp
	src/png_reader.cpp
2013-04-22 12:24:09 +01:00
artemp
4dd31056fc + fix warnings when compiling with g++ 4.2.1 on os x 2013-04-22 11:36:37 +01:00
artemp
3f6abd3362 + backport image_reader from buffer/string from image-readers-c++11 branch 2013-04-22 11:35:09 +01:00
artemp
800ee1f0dd + c++ style 2013-04-22 09:56:48 +01:00
Dane Springmeyer
4c38bf9b81 remove geos plugin (moved to https://github.com/mapnik/non-core-plugins) - refs #1809 2013-04-19 14:09:25 -07:00
Dane Springmeyer
401ca20b32 Merge branch 'master' of github.com:mapnik/mapnik into image-readers-c++11 2013-04-19 11:18:07 -07:00
Dane Springmeyer
1ae236c176 scons: disable special handling of agg test, uneeded except for specific dev 2013-04-19 11:17:43 -07:00
artemp
d215c09762 + json-generator : don't output coordinates from SEG_CLOSE command 2013-04-19 14:21:12 +01:00
artemp
ae9b518618 + fix coords precision 2013-04-19 14:13:18 +01:00
artemp
c1b25607db + fix compiling miniz codec in c++11 mode
FIXME: we should compile legacy "C" code with special flags..
2013-04-19 13:49:16 +01:00
artemp
8908a4bd1b + re-enable svg generator 2013-04-19 12:11:18 +01:00
artemp
b1ea547fa9 + fix grammar to work with phoenix v3 and c++11 2013-04-19 12:10:34 +01:00
artemp
d8fcf26560 + use std::move in tests 2013-04-19 12:00:58 +01:00
artemp
3a2b1dc027 + move preprocessor directive to the top 2013-04-19 12:00:25 +01:00