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 |
|
artemp
|
11bc9a0311
|
+ re-enable geojson generator
|
2013-04-19 11:59:58 +01:00 |
|
artemp
|
8bb6bb1d68
|
+ fix grammar to work with phoenix v3/c++11
|
2013-04-19 11:59:16 +01:00 |
|
artemp
|
c73e48fa58
|
+ use std::unique_ptr instead of std::auto_ptr (deprecated!)
|
2013-04-19 09:50:50 +01:00 |
|
artemp
|
7cd8c63656
|
+ remove "-ansi" compile flags to avoid clashung with -std=c++11
|
2013-04-19 09:42:24 +01:00 |
|
artemp
|
a41c83fbce
|
+ png_io: disble miniz for now
|
2013-04-19 09:41:42 +01:00 |
|
artemp
|
da16de55de
|
+ fix : output file_name
|
2013-04-19 09:37:41 +01:00 |
|
artemp
|
21b93272c0
|
+ use nullptr
|
2013-04-18 16:07:12 +01:00 |
|
artemp
|
22a1df8388
|
Merge branch 'master' into image-readers-c++11
Conflicts:
include/mapnik/factory.hpp
|
2013-04-18 09:48:31 +01:00 |
|
Dane Springmeyer
|
83eb8f2595
|
fix handling of null values for feature id in sqlite/postgis input - closes #1817
|
2013-04-17 15:34:21 -07:00 |
|
Dane Springmeyer
|
8c2d314413
|
fix visual test reporting to show test that could not be run rather than just 0
|
2013-04-17 15:33:31 -07:00 |
|
Dane Springmeyer
|
19b777455e
|
also translate std::out_of_bounds => IndexError otherwise new std::exception => runtime catch will override - refs #1816
|
2013-04-17 15:28:48 -07:00 |
|
Dane Springmeyer
|
60c6592c4e
|
fix spelling of unknown
|
2013-04-17 14:23:04 -07:00 |
|
Dane Springmeyer
|
dac0e14068
|
add test for #1816
|
2013-04-17 13:40:48 -07:00 |
|
Dane Springmeyer
|
20b643a22a
|
add missing exception translator for datasource exceptions by catching std::exception - closes #1816
|
2013-04-17 13:40:48 -07:00 |
|
Dane Springmeyer
|
0a68f66c35
|
fixup postgis null comparision tests
|
2013-04-17 13:40:48 -07:00 |
|
Dane Springmeyer
|
243470d670
|
Merge pull request #1814 from strk/master-more-float-tests
Add a couple more float to string conversion tests
|
2013-04-17 09:49:31 -07:00 |
|
artemp
|
bd3423a822
|
+ output webp
quality=100 -> demo.webp
quality=80 -> demo-med.webp
qiality=50 -> demo-low.webp
TODO: support other webp writing options
|
2013-04-17 14:52:01 +01:00 |
|
artemp
|
77e71d726b
|
+ add webp support
|
2013-04-17 14:51:20 +01:00 |
|
artemp
|
da6c630db9
|
+ add webp writing support
|
2013-04-17 14:50:35 +01:00 |
|
artemp
|
868d60d765
|
+ add getBytes() method ( needed by webp i/o)
|
2013-04-17 14:46:11 +01:00 |
|
artemp
|
cc5788e9c4
|
Merge branch 'master' into image-readers-c++11
|
2013-04-17 10:17:03 +01:00 |
|
Sandro Santilli
|
0ecf7e5728
|
Add a couple more float to string conversion tests
See #1811
|
2013-04-17 11:00:27 +02:00 |
|
Dane Springmeyer
|
294b10229e
|
disable the hsla image-filter - not yet ready for primetime
|
2013-04-16 19:09:40 -07:00 |
|
artemp
|
c5170290f8
|
+ image_reader : consistent error handling - throw image_reader_exception rather than returning 0 pointer.
|
2013-04-16 17:30:17 +01:00 |
|
artemp
|
b9e66c82de
|
+ update image_io test to support WEBP
|
2013-04-16 11:36:23 +01:00 |
|
artemp
|
9020e6f439
|
type_from_filename : add webp support
|
2013-04-16 10:56:10 +01:00 |
|
artemp
|
1b90879d12
|
webp_reader : implement reading from file
|
2013-04-16 10:48:21 +01:00 |
|
artemp
|
b8637a900e
|
+ fix crop width/height calc
|
2013-04-15 18:04:27 +01:00 |
|
artemp
|
77a8a6c8ee
|
+ fixes and improved error handling
|
2013-04-15 17:54:10 +01:00 |
|
artemp
|
1eb2ec5ce7
|
+ cleanup include directives
|
2013-04-15 14:01:33 +01:00 |
|
artemp
|
e59bf22fbd
|
WEBP image reader
+ add initial support
|
2013-04-15 14:00:41 +01:00 |
|
artemp
|
9584b3634f
|
+ no iostreams lib dependency version
|
2013-04-12 16:10:09 +01:00 |
|
artemp
|
28ea89fe1c
|
+ remove const& qualifier
|
2013-04-12 16:03:08 +01:00 |
|
artemp
|
438bfad732
|
+ factory : variadic templates based implementation ( requires c++11)
+ image_reader : stream based reading interface (boost::iostreams)
+ register additional png and jpeg readers with following sigs :
```
std::auto_ptr<mapnik::image_reader> reader(mapnik::get_image_reader(buffer,size));
// buffer - char const*
// size - size_t
```
+ initial type_from_bytes implementation (TODO: add more types)
+ python : mapnik.Image.fromstring(str) mapnik.Image.frombuffer(buf)
|
2013-04-12 12:46:40 +01:00 |
|
Dane Springmeyer
|
60eee883e5
|
Add empty string equality to null test
|
2013-04-11 16:09:57 -07:00 |
|
Dane Springmeyer
|
9da1f35b5e
|
plugins do not need to store nulls / save space - refs #1644
|
2013-04-11 16:05:29 -07:00 |
|