sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9761 commits 112 branches 95 tags 181 MiB
Commit graph

359 commits

Author SHA1 Message Date
Blake Thompson
2ebce8e7e1 Updated svg2png for new markers 2015-02-19 12:19:01 -06:00
Blake Thompson
b2c1c86d99 Merge branch 'master' into release/image_data_Any 
Conflicts:
	benchmark/test_polygon_clipping.cpp
 2015-02-16 14:37:01 -06:00
Dane Springmeyer
5424c350cd avoid inf loop on empty point3d shapefile 2015-02-13 00:04:09 -08:00
artemp
884de5a044 fix condition for skipping M (measure) in PointZ 2015-02-12 22:18:00 +01:00
Dane Springmeyer
89a58c5879 Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any 2015-02-11 10:01:42 -08:00
artemp
e19fdad3a6 implement vertex interface in vertex_adapter and make mapnik::geometry_type immutable 2015-02-06 16:45:51 +01:00
Dane Springmeyer
71e7faed0d Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any 
Conflicts:
	tests/python_tests/image_test.py
	tests/python_tests/image_tiff_test.py
	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-1.0-agg-reference.png
	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-2.0-agg-reference.png
 2015-02-03 00:05:15 -08:00
Dane Springmeyer
956d936162 fix pep8 linter command + update a few linted files 2015-02-02 10:38:08 -08:00
Blake Thompson
bc28c12572 Found more situations where getRowSize should be used over multiplying the width by the pixel size. 2015-01-27 15:29:43 -06:00
Blake Thompson
22a384ef33 Moved image_data_rgba8 to image_rgba8. Ref #2633 2015-01-21 20:31:02 -06:00
Blake Thompson
93f835177b Removed all the code for the previous type of image and image_32. Ref #2633 2015-01-21 17:57:16 -06:00
Blake Thompson
badb0c9a97 This is a complete removal of code that utilizes image_32 in the library. It is a sweeping change that does some of the following: 
* Changes all agg_renderers to use a image_data_any variant (only image_data_rgba8 is implemented currently)
* Changes the marker and marker_cache to use image_data_any images
* Changes the symbolizers so that they must be aware of the source data type they are attempting to render and the render type that is expected to be rendered into.
* Moves many utilities into image_utils, that were previously in image_32.

The kicker is that this still isn't working perfectly yet, but I am commiting so I don't have tears in case everything is lost on my computer.

Ref #2633
 2015-01-20 18:30:10 -06:00
Dane Springmeyer
1f25bae0f4 fix compile of svg2png 2015-01-14 21:03:35 -08:00
Dane Springmeyer
fbecd5ff33 always pass image_data to save_to_string/file 2015-01-08 13:54:43 -08:00
artemp
5361d21beb move mapnik::noncopyable to mapnik::util::noncopyable where it belongs 2015-01-07 13:11:09 +01:00
artemp
18554ec0b1 remove static_visitor usage and rely on automatic result type deduction 
(NOTE: expression_evaluator requires  ```using result_type = T1;``` )

Conflicts:
	src/image.cpp
 2015-01-07 11:39:06 +01:00
artemp
38da080f82 make concrete image_data type names more expressive and explicit about color channels/depth: 
image_data_32 -> image_data_rgba8
image_data_8  -> image_data_gray8
image_data_16 -> image_data_gray16
image_data_float32  -> image_data_gray32f

NOTE: currently image_data_gray16::pixel_type = std::int16_t (signed 16 bit int) to match GDAL
should we support unsigned types?
 2014-12-04 11:02:42 +01:00
artemp
333965b588 update copyright year 2014-11-20 15:25:50 +01:00
Dane Springmeyer
58f13823af remove debug print 2014-11-05 13:41:30 -05:00
Dane Springmeyer
c4e4bbf350 nik2img: make params as variables opt-in 2014-11-05 13:41:30 -05:00
Dane Springmeyer
5cd2cd629f nik2img: optionally make map parameters available as variables 2014-11-04 15:31:51 -05:00
Dane Springmeyer
38cb85a7df avoid a few more boost warnings 2014-10-27 10:30:36 -07:00
Dane Springmeyer
2ce6a317dd better defaults for git metadata 2014-10-23 01:00:35 -07:00
Dane Springmeyer
036a3bb14f only report git metadata for git checkout builds 2014-10-23 00:42:10 -07:00
Dane Springmeyer
a0dc3df575 move mapnik-config back to utils/ 2014-10-22 23:46:33 -07:00
Dane Springmeyer
83588937b9 silence boost warnings 2014-10-21 16:37:27 -07:00
Dane Springmeyer
4c07585312 fix #2464 2014-09-30 21:16:29 -07:00
Dane Springmeyer
dc57849b7d geometry container typedef fixing 2014-09-29 18:40:57 -07:00
Dane Springmeyer
f888e0a9f6 link shapeindex to libicuuc - fixes #2419 2014-09-18 14:29:22 -07:00
Dane Springmeyer
6c4b51eb56 remove unneeded inclusion of box2d.cpp in shapeindex 2014-09-11 10:15:27 -07:00
Dane Springmeyer
afee619e63 support windows in nik2img.cpp 2014-08-31 17:32:48 -07:00
Dane Springmeyer
4f773309f1 fix mapnik::logger usage 2014-08-28 13:59:48 -07:00
Dane Springmeyer
b85ac0d6a5 register fonts in nik2img util 2014-08-22 13:22:12 -07:00
artemp
9f8b88ae4d we do need <iostrea> in non-debug 2014-08-12 20:08:52 +01:00
artemp
fb2dd283c0 fix DEBUG=yes compilation 2014-08-12 19:10:32 +01:00
artemp
95cea92a4a convert all boost::variant to util::variant 
apart from topojson (TODO)
 2014-08-12 13:40:45 +01:00
artemp
18a7731d42 AGG line/polygon_pattern_symbolizer add support for SVG patterns 2014-07-31 15:25:22 +01:00
artemp
fe215a684e c++11 style : replace (almost) all typedef with type alias's 2014-07-07 18:23:15 +01:00
Dane Springmeyer
d0b357cab7 scons: support MAPNIK_NAME option to customize libmapnik name for custom packaging 2014-06-09 13:55:56 -07:00
Dane Springmeyer
57c9aee63d shapeindex: more consistent error output 2014-05-11 12:41:08 -07:00
Dane Springmeyer
404e221c25 fix #2239 2014-05-11 12:40:24 -07:00
artemp
99bbb10290 c++11 : use int types from <cstdint> 2014-05-06 18:06:47 +01:00
Dane Springmeyer
9e9747ffad Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 
Conflicts:
	src/agg/process_building_symbolizer.cpp
	src/cairo_context.cpp
	src/cairo_renderer.cpp
	src/grid/process_building_symbolizer.cpp
	src/grid/process_line_pattern_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
	tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
	tests/python_tests/images/support/marker-text-line-scale-factor-1.png
	tests/python_tests/images/support/marker-text-line-scale-factor-10.png
	tests/python_tests/images/support/marker-text-line-scale-factor-100.png
	tests/python_tests/images/support/marker-text-line-scale-factor-2.png
	tests/python_tests/images/support/marker-text-line-scale-factor-5.png
	tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
	tests/visual_tests/test.py
 2014-04-24 21:44:28 -07:00
Dane Springmeyer
2e6de5cc97 remove unused variables 2014-03-18 14:09:44 -07:00
Dane Springmeyer
0a26485d28 add simple, c++ version of nik2img 2014-02-10 10:46:48 -08:00
Dane Springmeyer
f286363ad0 more consistent memset/memcpy usage 2014-01-28 15:05:10 -08:00
Dane Springmeyer
777e067770 remove workaround for boost less than 1.46 since 1.47 is now the min needed - refs #1082 2014-01-27 12:24:20 -08:00
artemp
eb3da7d32d c++11 : use nullptr instead of NULL 2013-11-27 15:54:16 +00:00
Dane Springmeyer
66347f78e6 rework tests: always run locally 2013-11-22 12:01:02 -08:00
Dane Springmeyer
08fa9fd8ec Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	bindings/python/mapnik_building_symbolizer.cpp
	bindings/python/mapnik_debug_symbolizer.cpp
	bindings/python/mapnik_line_pattern_symbolizer.cpp
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_markers_symbolizer.cpp
	bindings/python/mapnik_point_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
	bindings/python/mapnik_python.cpp
	bindings/python/mapnik_raster_symbolizer.cpp
	bindings/python/mapnik_shield_symbolizer.cpp
	bindings/python/mapnik_symbolizer.cpp
 2013-11-07 09:21:05 -08:00