Dane Springmeyer
|
a1bf65210d
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2013-09-22 22:07:55 -07:00 |
|
Dane Springmeyer
|
85fc82c03b
|
fix #2018
|
2013-09-22 22:07:35 -07:00 |
|
artemp
|
0eada70845
|
+ use const std::unique_ptr< []> instead of boost::scoped_array
|
2013-09-20 15:01:58 +01:00 |
|
artemp
|
09ce29489e
|
use const std::unique_ptr<> instead of boost::scoped_ptr<>
|
2013-09-20 14:22:58 +01:00 |
|
artemp
|
62af2e6765
|
+ replace <boost/shared_ptr.hpp> with <memory>
|
2013-09-20 14:13:23 +01:00 |
|
artemp
|
b315eb2167
|
+ use std::shared_ptr and std::make_shared
|
2013-09-20 14:01:27 +01:00 |
|
Dane Springmeyer
|
b0436a3ad1
|
scons: unbreak memory mapped access for shapefiles by fixing the setting of SHAPE_MEMORY_MAPPED_FILE
|
2013-09-19 20:51:49 -07:00 |
|
Dane Springmeyer
|
0619477238
|
optimize rule::active which is called in loop in feature_style_processor_impl
|
2013-09-19 20:24:59 -07:00 |
|
Dane Springmeyer
|
9df4deac73
|
consistent use of agg::rgba8_pre to construct premultiplied colors - refs #2011
|
2013-09-19 19:41:46 -07:00 |
|
Dane Springmeyer
|
5b78b6b2dc
|
fix #2011
|
2013-09-19 19:19:11 -07:00 |
|
Dane Springmeyer
|
576271d5ca
|
merge
|
2013-09-19 18:40:48 -07:00 |
|
Dane Springmeyer
|
9bd3dd0e21
|
fix viewer compile
|
2013-09-19 18:39:44 -07:00 |
|
Dane Springmeyer
|
25ee36f74e
|
merge
|
2013-09-18 20:41:20 -07:00 |
|
Dane Springmeyer
|
1b3e07ef23
|
c++ style
|
2013-09-18 20:35:14 -07:00 |
|
Dane Springmeyer
|
df352efc8f
|
use std::size_t in wkb parser
|
2013-09-18 20:31:59 -07:00 |
|
Dane Springmeyer
|
35a42b49e6
|
cast to int
|
2013-09-18 20:29:59 -07:00 |
|
Dane Springmeyer
|
9aff3c596b
|
better type handling/casts
|
2013-09-18 20:29:26 -07:00 |
|
Dane Springmeyer
|
69cdca27a2
|
merge with master
|
2013-09-18 19:54:49 -07:00 |
|
Dane Springmeyer
|
111bdccebc
|
various post-merge fixes
|
2013-09-18 19:51:14 -07:00 |
|
Dane Springmeyer
|
5cd2152866
|
fix failing halo rendering visual tests
|
2013-09-18 19:50:30 -07:00 |
|
Dane Springmeyer
|
ee2378a6d2
|
port minor fixes around type handling from c++11 branch
|
2013-09-18 19:50:04 -07:00 |
|
Dane Springmeyer
|
d3d750ebf7
|
merge with master
|
2013-09-18 19:06:11 -07:00 |
|
Dane Springmeyer
|
30c8ca5f66
|
minor formatting to sync cleaner with master
|
2013-09-18 19:04:44 -07:00 |
|
Dane Springmeyer
|
9770985ead
|
port box2d cleanups from c++11 branch to master
|
2013-09-18 19:04:20 -07:00 |
|
Dane Springmeyer
|
d2f50a0158
|
no need to define BOOST_SPIRIT_USE_PHOENIX_V3 in each header, it is now set in SConstruct
|
2013-09-18 18:27:04 -07:00 |
|
Dane Springmeyer
|
33766e9370
|
merge with master
|
2013-09-18 13:56:23 -07:00 |
|
artemp
|
ec0bdb21ad
|
Merge branch 'geometry-types' into c++11
|
2013-09-16 14:18:22 +01:00 |
|
Dane Springmeyer
|
d3ab601e30
|
integrate various minor c++ style and cast fixes into master from c++11 branch
|
2013-09-15 23:08:04 -07:00 |
|
Dane Springmeyer
|
b6040ac324
|
correct return type from std::string::substr
|
2013-09-15 21:12:12 -07:00 |
|
artemp
|
b690015d63
|
Merge branch 'master' into c++11
|
2013-09-09 12:32:47 +01:00 |
|
Dane Springmeyer
|
c5dd5487a5
|
Merge pull request #1966 from mapnik/background-image-comp-op
Map background-image-comp-op and background-image-opacity
|
2013-09-05 12:25:47 -07:00 |
|
artemp
|
d4b9a48cb1
|
+ geometry::types Exterior/Interior polygon loops
|
2013-09-03 12:15:31 +01:00 |
|
artemp
|
4ea16b596e
|
Merge branch 'master' into c++11
|
2013-09-02 09:50:59 +01:00 |
|
Dane Springmeyer
|
02f2fbdf8b
|
always link libdl on linux - needed on some systems after #1804 - closes #1998
|
2013-09-01 22:02:52 -07:00 |
|
artemp
|
4f4e2b001e
|
Merge branch 'master' into c++11
Conflicts:
SConstruct
benchmark/run.cpp
bindings/python/mapnik_datasource.cpp
bindings/python/mapnik_feature.cpp
bindings/python/python_optional.hpp
include/mapnik/css_color_grammar.hpp
include/mapnik/expression_grammar.hpp
include/mapnik/feature.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/image_filter_types.hpp
include/mapnik/image_util.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_grammar.hpp
include/mapnik/processed_text.hpp
include/mapnik/tiff_io.hpp
include/mapnik/util/geometry_svg_generator.hpp
include/mapnik/util/geometry_wkt_generator.hpp
include/mapnik/utils.hpp
include/mapnik/webp_io.hpp
include/mapnik/wkt/wkt_grammar.hpp
plugins/input/shape/shape_datasource.cpp
plugins/input/shape/shapefile.hpp
src/expression_grammar.cpp
src/expression_string.cpp
src/image_util.cpp
src/json/feature_collection_parser.cpp
src/json/feature_parser.cpp
src/miniz.c
src/symbolizer_helpers.cpp
src/tiff_reader.cpp
src/webp_reader.cpp
tests/cpp_tests/geometry_converters_test.cpp
tests/cpp_tests/image_io_test.cpp
tests/cpp_tests/map_request_test.cpp
tests/python_tests/image_test.py
tests/visual_tests/test.py
|
2013-08-30 09:46:09 +01:00 |
|
Petr Dlouhý
|
69185339a5
|
offset enabled for LinePatternSymbolizer
|
2013-08-22 10:35:44 +02:00 |
|
Dane Springmeyer
|
1a8287da06
|
Add support for webp:alpha=false to create rgb images without alpha + other webp encoding cleanups - closes #1986
|
2013-08-15 14:47:28 -04:00 |
|
Dane Springmeyer
|
5667343ad9
|
use U_NAMESPACE_QUALIFIER to most cleanly support when icu is built with -DU_USING_ICU_NAMESPACE=0 - refs #1985
|
2013-08-14 21:56:40 -04:00 |
|
Dane Springmeyer
|
750b4e144b
|
gracefully handle when icu is built without BreakIterator support: -DUCONFIG_NO_BREAK_ITERATION=1
|
2013-08-13 19:32:20 -04:00 |
|
Dane Springmeyer
|
b6df3848c4
|
use icu:: namespace
|
2013-08-13 19:20:13 -04:00 |
|
Dane Springmeyer
|
e0026f3df2
|
use icu:: namespace and start isolating icu impl by consistenly using mapnik::value_unicode_string
|
2013-08-13 18:52:04 -04:00 |
|
Dane Springmeyer
|
4eef244e73
|
move SHAPE_MEMORY_MAPPED_FILE to be a global define
|
2013-08-13 14:48:04 -04:00 |
|
Dane Springmeyer
|
134cbc3eec
|
forward declare mapped_region in mapped_memory_cache.hpp and other shared memory fixups
|
2013-08-13 14:13:56 -04:00 |
|
Dane Springmeyer
|
29abb9a7c0
|
remove unused typedefs - exposed by saucy g++ warnings
|
2013-08-07 20:59:28 -04:00 |
|
Dane Springmeyer
|
60b2cef365
|
remove unused typedef
|
2013-08-07 20:49:28 -04:00 |
|
Dane Springmeyer
|
78b4980352
|
finish exposing mapnik.Feature.from_geojson
|
2013-07-30 15:45:46 -04:00 |
|
Dane Springmeyer
|
844baa8c5b
|
scons: when linking statically on linux always link -ldl
|
2013-07-30 02:51:07 -04:00 |
|
Dane Springmeyer
|
4ee91a4a25
|
fix narrowing issue in miniz - closes #1967
|
2013-07-28 15:49:11 -04:00 |
|
Dane Springmeyer
|
889546ab05
|
fix up type casting
|
2013-07-28 15:45:36 -04:00 |
|
Dane Springmeyer
|
76f111cc97
|
support optionally compiling with -std=c++11 on OSX / clang / apple libc++ / boost 1.53 - refs #1683
|
2013-07-27 01:57:24 -04:00 |
|
Dane Springmeyer
|
4eda02592e
|
fix debug.cpp error output (now compiles against libc++)
|
2013-07-26 19:33:35 -04:00 |
|
Dane Springmeyer
|
fad9af5263
|
add support for applying custom comp_op and opacity when blending map background image into background color at render time - refs mapnik/mapnik-support#8
|
2013-07-25 01:00:38 -04:00 |
|
Dane Springmeyer
|
4f01eb05b1
|
scons: correctly propagate DEFINES across builds
|
2013-07-23 20:03:00 -04:00 |
|
Dane Springmeyer
|
ef4dfeb747
|
make it possible to disable compilation of grid_renderer - closes #1962
|
2013-07-23 19:37:25 -04:00 |
|
Dane Springmeyer
|
5ad2ebb30e
|
iwyu
|
2013-07-23 18:59:05 -04:00 |
|
Dane Springmeyer
|
cfc977e6cd
|
deal with various -Wunused-parameter warnings that are not important
|
2013-07-23 18:46:54 -04:00 |
|
Dane Springmeyer
|
827a9d147a
|
code cleanup
|
2013-07-23 18:46:40 -04:00 |
|
Dane Springmeyer
|
7a6117b18d
|
remove dead code and iwyu
|
2013-07-23 18:46:19 -04:00 |
|
Dane Springmeyer
|
c49d94fdf7
|
iwyu
|
2013-07-23 18:45:25 -04:00 |
|
Dane Springmeyer
|
84842f59c7
|
use pixfmt pre for the sake of clarity
|
2013-07-23 18:44:39 -04:00 |
|
Dane Springmeyer
|
6269b42ffc
|
iwyu
|
2013-07-23 18:41:59 -04:00 |
|
Dane Springmeyer
|
3bd2e6501f
|
fix a batch of unused variable warnings (leaving several with are true bugs/missing features)
|
2013-07-23 15:51:22 -04:00 |
|
Dane Springmeyer
|
4d3ab5e3aa
|
agg_renderer: remove uneeded define of AGG_RENDERING_BUFFER row_ptr_cache<int8u> since it is already hardcoded in agg_renderer_buffer.h and agg_config.h
|
2013-07-22 14:49:10 -04:00 |
|
Dane Springmeyer
|
236c8221af
|
miniz: remove MINIZ_NO_STDIO as it is uneeded since it is covered by catchall MINIZ_NO_ARCHIVE_APIS
|
2013-07-22 14:29:46 -04:00 |
|
Dane Springmeyer
|
5c13504cc0
|
remove unreachable break
|
2013-07-22 14:17:59 -04:00 |
|
Dane Springmeyer
|
1c6f449ba8
|
comment unused typedefs
|
2013-07-22 14:17:43 -04:00 |
|
Dane Springmeyer
|
3864fada72
|
pass string by const ref
|
2013-07-19 15:46:01 -04:00 |
|
Dane Springmeyer
|
6bbbe155fe
|
remove RENDERING_STATS compile time option - refs #1956
|
2013-07-19 15:09:59 -04:00 |
|
Dane Springmeyer
|
512f06fa44
|
scons: only compile optional cpp files that really can be built
|
2013-07-19 12:49:44 -04:00 |
|
Dane Springmeyer
|
f999615cec
|
ensure agg rendering buffer uses proper dimensions since these may become more dynamic in the near future - refs #1478
|
2013-07-19 01:29:01 -04:00 |
|
Dane Springmeyer
|
a141c5c27d
|
webp encoding/decoding support - refs #1955
|
2013-07-19 01:09:17 -04:00 |
|
Dane Springmeyer
|
0872061993
|
renable hsla filter as 'scale-hsla' - refs #1954
|
2013-07-19 00:37:51 -04:00 |
|
artemp
|
cbfe228790
|
+ improve c++ style
+ formatting
|
2013-07-16 11:16:52 +01:00 |
|
Dane Springmeyer
|
43723d3f81
|
scons: link zlib last
|
2013-07-15 00:19:03 -04:00 |
|
Dane Springmeyer
|
09aad15eb2
|
display png error when we cannot read a png
|
2013-07-14 16:32:32 -04:00 |
|
Dane Springmeyer
|
86bc7d6c11
|
fix svg parser to ignore empty groups - closes #1944
|
2013-07-10 17:25:34 -04:00 |
|
Dane Springmeyer
|
63a06a9aab
|
fix handling of opacity when rendering svg with cairo - closes #1943
|
2013-07-10 16:19:28 -04:00 |
|
Dane Springmeyer
|
c011524b67
|
add mapnik.Image.premultiplied() to query status of pixel premultiplication
|
2013-07-02 16:01:23 -04:00 |
|
Dane Springmeyer
|
3ae432ac96
|
fix behavior of marker-ignore-placement on lines - closes #1931
|
2013-06-28 15:53:08 -04:00 |
|
Dane Springmeyer
|
25dabd6f24
|
support scale_denominator override in save_to_cairo_file - closes #1930
|
2013-06-27 20:07:25 -04:00 |
|
Dane Springmeyer
|
fd428cf11b
|
svg_renderer: group layers in inkscape capatible way - refs #1917
|
2013-06-24 20:29:57 -07:00 |
|
Dane Springmeyer
|
4c4a63aa9c
|
svg_renderer: only process line/polygon symbolizers as <path> for now
|
2013-06-24 20:28:02 -07:00 |
|
Dane Springmeyer
|
d1f1104ebe
|
svg_renderer: start paying attention to scale_factor, collision, and fonts
|
2013-06-24 20:26:30 -07:00 |
|
Dane Springmeyer
|
18ab68f03f
|
iwyu
|
2013-06-21 12:00:48 -07:00 |
|
artemp
|
ed163817ab
|
+ fix typo in grammar
|
2013-06-21 19:37:56 +01:00 |
|
Dane Springmeyer
|
ecf0ce2d2d
|
catch boost::filesystem::directory_iterator::construct error and print warning rather than throwing exception - closes #1919 - refs mapbox/tilemill#1992
|
2013-06-21 11:18:42 -07:00 |
|
artemp
|
9b2703f557
|
+ to_string based on spirit::karma for completeness.
|
2013-06-21 14:47:38 +01:00 |
|
artemp
|
66185a2262
|
spirit::karma based to_hex_string generator
|
2013-06-21 11:33:26 +01:00 |
|
Dane Springmeyer
|
e3c5ae9cf4
|
svg_renderer: use precision of 4, accept map request/scale_factor, and fix output of multipart geometries
|
2013-06-20 21:27:42 -07:00 |
|
Dane Springmeyer
|
b1a50d1000
|
iwyu
|
2013-06-18 14:26:58 -07:00 |
|
Dane Springmeyer
|
215c9e9123
|
iwyu
|
2013-06-06 13:10:56 -07:00 |
|
Dane Springmeyer
|
ff14a8e350
|
revert f4d2fbac4 - refs #1177
|
2013-06-03 17:21:27 -07:00 |
|
Dane Springmeyer
|
c6da53af9a
|
fix spelling of error message in png reader - refs #1871
|
2013-06-03 15:38:30 -07:00 |
|
artemp
|
f4d2fbac43
|
+ #1177 via @springmeyer
(TODO: check if loading the whole font file is required for registering)
|
2013-06-03 09:15:37 +01:00 |
|
Dane Springmeyer
|
3b2bdba7b0
|
iwyu
|
2013-06-02 20:19:33 -07:00 |
|
Dane Springmeyer
|
205fe7eaf8
|
iwyu
|
2013-06-02 20:04:51 -07:00 |
|
Dane Springmeyer
|
0365d3e081
|
start centralizing filesystem operations in mapnik::util::fs - refs #1177
|
2013-06-02 19:28:24 -07:00 |
|
Dane Springmeyer
|
ff88efc1fd
|
proper c++ cast
|
2013-06-02 17:34:44 -07:00 |
|
Dane Springmeyer
|
1036eb1c99
|
support base_path adjustment when reading from xml file as well as from a string
|
2013-06-02 16:24:21 -07:00 |
|
Dane Springmeyer
|
e51c59aacc
|
fix #1886 - TODO - refactor base_path logic since it is confusingly written
|
2013-06-02 16:06:32 -07:00 |
|
Dane Springmeyer
|
ef1b99532b
|
scons: fix boost_regex and sqlite_rtree config checks and be resilient to plugins that cannot be built due to the boost version
|
2013-06-02 14:56:21 -07:00 |
|
Dane Springmeyer
|
7c8dbacdb6
|
fix compile against boost 1.47 - closes #1885
|
2013-06-02 13:32:15 -07:00 |
|
Dane Springmeyer
|
dcc4981b13
|
mapnik-config: report which plugins are statically compiled by providing defines
|
2013-06-02 13:30:46 -07:00 |
|
Dane Springmeyer
|
b0f15bf5de
|
avoid muffling proj_init at render time and instead catch at load_map - closes #646
|
2013-05-29 15:16:44 -07:00 |
|
Dane Springmeyer
|
7302b3b654
|
fix #1865
|
2013-05-24 16:45:02 -07:00 |
|
Dane Springmeyer
|
9107046508
|
avoid including cairo-ft in header
|
2013-05-22 23:23:22 -07:00 |
|
Dane Springmeyer
|
95d5b73d86
|
fix reading inline csv data and reading from an xml string when building with ptree/rapidxml - closes #1857 and closes #1856
|
2013-05-22 09:13:33 -07:00 |
|
artemp
|
a3eaebd5e1
|
feature_at_point
+ use 'tol' where possible
|
2013-05-22 16:40:26 +01:00 |
|
Dane Springmeyer
|
a6ef710f74
|
Add file I should have added in 8634a04938
|
2013-05-21 21:01:07 -07:00 |
|
Dane Springmeyer
|
ce34be6aab
|
fix #1853
|
2013-05-21 20:18:37 -07:00 |
|
Dane Springmeyer
|
8634a04938
|
add support for drawing all geometry verticies with debug symbolizer mode=vertex and expose in python - closes #1848
|
2013-05-21 19:21:35 -07:00 |
|
Dane Springmeyer
|
018bdc4f6d
|
fix interplay of point symbolizer/cairo/scale_factor
|
2013-05-21 08:46:07 -07:00 |
|
artem@windows
|
35a8582043
|
put implementatio into .cpp to avoid exposing <windows.h>
|
2013-05-20 13:43:31 -07:00 |
|
Dane Springmeyer
|
84a15f9090
|
iwyu
|
2013-05-20 12:50:26 -07:00 |
|
artem@windows
|
15e059a9ac
|
put implementatio into .cpp to avoid exposing <windows.h>
Conflicts:
include/mapnik/utils.hpp
|
2013-05-20 14:54:06 +01:00 |
|
Dane Springmeyer
|
a992ab4985
|
add missing file from 3fbf4df67d
|
2013-05-16 12:03:30 -07:00 |
|
Dane Springmeyer
|
3fbf4df67d
|
add support for statically linking datasource input plugins - closes #1810 and #1821 - refs #249
|
2013-05-16 11:55:58 -07:00 |
|
Dane Springmeyer
|
9c66d0ec1d
|
move expresion_grammar impl to impl header
|
2013-05-15 18:24:49 -07:00 |
|
Dane Springmeyer
|
bedcde02cb
|
rename css_color_grammar_def.hpp -> css_color_grammar_impl.hpp to be consistent with other headers
|
2013-05-15 18:23:46 -07:00 |
|
artemp
|
8d5b983cb6
|
Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max)
|
2013-05-14 15:02:05 +01:00 |
|
artemp
|
0e5013fb03
|
+ add feature_parser implementation
|
2013-05-14 14:55:08 +01:00 |
|
artemp
|
417ac21529
|
+ cleaup old comment
|
2013-05-14 14:53:27 +01:00 |
|
artemp
|
4948fd8992
|
+ add feature_parser.cpp
|
2013-05-14 14:52:58 +01:00 |
|
artemp
|
5d0c36fb65
|
Geometry/Feature parsers -truncate 'where' message in on_error handler (currently 16 chars max)
|
2013-05-14 14:51:28 +01:00 |
|
artemp
|
d83935a8e0
|
* restore operator%= support - explicit pnoenix::construct<mapnik::expr_node> on rhs
* move fwd decl into main mapnik namespace
* c++ style formatting
|
2013-05-14 12:28:13 +01:00 |
|
Dane Springmeyer
|
2ec04ab9e3
|
fix tiff compile against older than tiff 4.x
|
2013-05-13 11:00:21 -07:00 |
|
artemp
|
15ff3dcec4
|
TIFF I/O
+ use generic std::istream
+ add open from char const* and size factory method
|
2013-05-13 07:31:41 -07:00 |
|
artemp
|
245e71d735
|
TIFF I/O
+ use generic std::istream
+ add open from char const* and size factory method
|
2013-05-13 10:26:28 +01:00 |
|
artemp
|
dbcffe6179
|
+ better naming
|
2013-05-13 10:26:04 +01:00 |
|
artemp
|
0fb7898e5e
|
+ format
|
2013-05-09 13:46:51 +01:00 |
|
artemp
|
42d8dfa322
|
+ add move ctor and 'canonical' assignment operator
|
2013-05-06 15:54:17 +01: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
|
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 |
|
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
|
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
|
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
|
11bc9a0311
|
+ re-enable geojson generator
|
2013-04-19 11:59:58 +01:00 |
|
artemp
|
c73e48fa58
|
+ use std::unique_ptr instead of std::auto_ptr (deprecated!)
|
2013-04-19 09:50:50 +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
|
60c6592c4e
|
fix spelling of unknown
|
2013-04-17 14:23:04 -07:00 |
|
artemp
|
77e71d726b
|
+ add webp support
|
2013-04-17 14:51:20 +01:00 |
|
artemp
|
cc5788e9c4
|
Merge branch 'master' into image-readers-c++11
|
2013-04-17 10:17:03 +01: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
|
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
|
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 |
|
artemp
|
37b74f1e15
|
+ fix memory font loading
|
2013-04-11 10:57:33 +01:00 |
|
Dane Springmeyer
|
79a216f349
|
remove ltdl to reduce dependencies and because calling dlopen/LoadLibrary is easy
|
2013-04-09 19:37:02 -07:00 |
|
Dane Springmeyer
|
a8e2ef7cc7
|
set TIFFSetErrorHandler to null to start to avoid tiff from printing to stderr on fail - refs #1783
|
2013-04-09 19:16:05 -07:00 |
|
Dane Springmeyer
|
771cbb11bf
|
fix memory leak when reading invalid tiff - refs #1783
|
2013-04-09 19:08:50 -07:00 |
|
Dane Springmeyer
|
16e2e8a06f
|
refactor jpeg reader to close fd after read - refs #1783
|
2013-04-09 18:36:02 -07:00 |
|
Dane Springmeyer
|
6e29ceb55f
|
further cleanup png struct handling - refs #1783
|
2013-04-09 17:43:15 -07:00 |
|
Dane Springmeyer
|
97eda69015
|
avoid png_struct leak - refs #1783
|
2013-04-09 17:37:44 -07:00 |
|
Dane Springmeyer
|
dfb65d810c
|
avoid unused arguments compiler warning
|
2013-04-09 16:51:30 -07:00 |
|
artemp
|
b6ce472414
|
+ add png file guard
|
2013-04-09 11:39:16 +01:00 |
|
artemp
|
270b66318d
|
+ mapnik c++ naming style
|
2013-04-09 11:34:20 +01:00 |
|
artemp
|
9fb6c596b0
|
+ fix region reading, so png's can be used in raster.input
|
2013-04-08 17:25:22 +01:00 |
|
artemp
|
2ca306290a
|
+ fix reading a region from JPEG file
+ re-use jpeg lib structures
+ avoid resource leaking (store FILE in boost::shared_ptr with custom deleter)
|
2013-04-08 15:56:19 +01:00 |
|
kunitoki
|
1bcb9784ab
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2013-04-08 11:32:10 +02:00 |
|
kunitoki
|
4d85cd2c43
|
- improved spatialite wkb format guess
|
2013-04-08 11:31:00 +02:00 |
|
artemp
|
a4770ac10b
|
+ cache fonts in memory
|
2013-04-02 13:27:05 +01:00 |
|
Hermann Kraus
|
23d599d7e5
|
Render fast subpixel halos.
|
2013-03-30 02:52:20 +01:00 |
|
Hermann Kraus
|
dc486e6971
|
Simplify halo rendering by reducing number of loop indices.
|
2013-03-30 02:48:06 +01:00 |
|
Hermann Kraus
|
6153c737e6
|
Fix checks in Map::resize().
|
2013-03-28 10:55:10 +01:00 |
|
artemp
|
9b138728d0
|
+ fix assignment operator #1776
|
2013-03-27 10:39:02 +00:00 |
|
kunitoki
|
af2bb2be1e
|
- avoid using double quotes when already escaping as string
|
2013-03-27 09:02:03 +01:00 |
|
Dane Springmeyer
|
412aa510a1
|
fix jpeg/tiff error handling on failed reads - closes #1775
|
2013-03-25 18:29:29 -07:00 |
|
Hermann Kraus
|
fe526fd3d6
|
Fix PointSymbolizer collision bounding boxes.
|
2013-03-24 15:50:18 +01:00 |
|
Dane Springmeyer
|
aaecd92fb6
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2013-03-22 17:58:49 -07:00 |
|
Dane Springmeyer
|
55ec6a7942
|
cleanups around exception handling
|
2013-03-22 17:58:33 -07:00 |
|
Dane Springmeyer
|
f9514e5d2c
|
formatting
|
2013-03-22 17:44:27 -07:00 |
|
Dane Springmeyer
|
3256037eb6
|
forward declare the lt_dlhandle type to avoid needing header in datasource_cache.hpp
|
2013-03-22 17:37:56 -07:00 |
|
artemp
|
c84d83a685
|
+ fix raster markers positioning
|
2013-03-22 12:16:23 +00:00 |
|
artemp
|
aa122ea907
|
+ local vars locality
|
2013-03-22 11:54:34 +00:00 |
|
artemp
|
fe092ac7a2
|
+ implement offset
```
offset = "<number> | <percentage>"
```
|
2013-03-21 12:10:08 +00:00 |
|
artemp
|
542805e4d6
|
+ support multiple color stops in colorize-alpha
( TODO: add support for: <color-stop> = <color> [ <percentage> | <length> ]? )
|
2013-03-20 17:21:09 +00:00 |
|
Dane Springmeyer
|
4e6b6d5a62
|
ensure the line clipping box is padded using scale_factor as well - closes #1767
|
2013-03-19 16:15:50 -07:00 |
|
artemp
|
e91908206b
|
cairo halo patch via @springmeyer ( #1624 )
|
2013-03-18 14:31:38 +00:00 |
|
Dane Springmeyer
|
f759964dbf
|
c++ style
|
2013-03-15 16:52:02 -07:00 |
|
Dane Springmeyer
|
7d868558d7
|
fix a variety of msvc compiler warnings about signed/unsigned implicit conversion
|
2013-03-15 13:37:48 -07:00 |
|
Dane Springmeyer
|
44c02a10c5
|
reduce overhead of flexible agg gamma setting per symbolizer - closes #1174
|
2013-03-14 17:05:06 -07:00 |
|
Dane Springmeyer
|
06803de192
|
iwyu
|
2013-03-14 15:13:02 -07:00 |
|
XinGang Li
|
aff3bd2de0
|
iwyu: mapnik::attribute
|
2013-03-14 13:32:11 +08:00 |
|
Dane Springmeyer
|
e2c7283522
|
Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443
|
2013-03-13 19:49:59 -07:00 |
|
Dane Springmeyer
|
0b20c14965
|
removed unused trunc and cmath headers - closes #1646
|
2013-03-13 12:47:24 -07:00 |
|
Dane Springmeyer
|
6cbceafc45
|
avoid direct freetype usage in core/public hpp file so that mapnik C++ depedencies do no need to known the freetype include paths
|
2013-03-12 18:12:54 -07:00 |
|