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
fbecd5ff33
always pass image_data to save_to_string/file
2015-01-08 13:54:43 -08:00
Dane Springmeyer
0d42906dc1
Merge branch 'master' of github.com:mapnik/mapnik into image_data_any
...
Conflicts:
tests/visual_tests/images/dots-500-100-1.0-agg-reference.png
tests/visual_tests/images/dots-500-100-2.0-agg-reference.png
tests/visual_tests/images/marker-svg-opacity-500-100-1.0-agg-reference.png
tests/visual_tests/images/marker-svg-opacity-500-100-2.0-agg-reference.png
2014-12-18 20:16:16 -08:00
Dane Springmeyer
0c8c55031a
add deque to array alloc benchmark
2014-12-17 11:55:22 -08:00
Dane Springmeyer
381eab1f3d
add deque to array alloc benchmark
2014-12-16 13:51:12 -05:00
Dane Springmeyer
cdd817d772
benchmarks: refactor to allow early exit if tests do not validate
2014-12-12 11:59:45 -05:00
Dane Springmeyer
067703db48
add tiff benchmark
2014-12-11 15:01:17 -05: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
Dane Springmeyer
d25f0c316a
silence more warnings
2014-10-21 17:44:47 -07:00
Dane Springmeyer
0ec4fbef45
add std::fill to array alloc benchmark
2014-10-21 13:11:32 -07:00
artemp
d62a4b0914
update to dejavu-fonts-ttf-2.34
2014-10-21 16:54:43 +01:00
Dane Springmeyer
02b7537d6d
remove unused/supported second arg to parse_expression
2014-10-20 22:20:04 -07:00
Dane Springmeyer
e98ea70d2e
add a benchmark that tests rendering with shared map - refs #2516
2014-10-09 20:29:42 -07:00
Dane Springmeyer
5cc44ceee3
accept scale_factor as option in test_rendering bench
2014-10-09 17:33:01 -07:00
Dane Springmeyer
280c280a9c
make rendering bench shell easy to run
2014-10-08 14:23:33 -07:00
Dane Springmeyer
ad7e619ba3
remove state from freetype_engine - now fully static
2014-10-01 20:03:03 -07:00
Dane Springmeyer
d96093d3aa
rebase with master
2014-10-01 18:45:28 -07:00
Jochen Topf
0aec5003b3
Use std::chrono instead of boost::chrono in benchmarks.
...
This reduces the external dependencies and fixes a bug where a duration was
reported in microseconds instead of milliseconds on some systems.
2014-10-01 11:38:08 +02:00
Dane Springmeyer
4c07585312
fix #2464
2014-09-30 21:16:29 -07:00
Dane Springmeyer
758f75dcaa
fix benchmark compile
2014-09-26 23:00:02 -07:00
Dane Springmeyer
d1adabf7d5
3.x port of localized font caching and then some
2014-09-26 19:54:07 -07:00
Dane Springmeyer
a9c7bfcdf8
simplify text rendering benchmark to only render text + be explicit about clipping - refs #2326
2014-09-26 12:55:31 -07:00
Dane Springmeyer
2dbefde750
add validation to face_ptr_creation benchmark
2014-09-25 13:09:05 -07:00
Dane Springmeyer
bb0df1d6c6
require rendering benchmarks to use font-directory
2014-09-06 19:09:34 -07:00
artemp
1ac0ebdd83
rename coord_transform to transform_path_adapter and move implementation into separate header
2014-08-28 10:59:08 +01:00
artemp
ecfaec1027
rename ctrans.hpp to view_transform.hpp
2014-08-28 10:29:04 +01:00
artemp
de22d5900c
rename CoordTransform to view_transform to better reflect its purpose and be consistent
2014-08-28 10:17:15 +01:00
Dane Springmeyer
b415549823
limit benchmarks
2014-08-13 17:21:22 -07:00
Dane Springmeyer
c5be70ff65
refactor spirit grammars
2014-07-24 14:31:59 -07:00
Dane Springmeyer
64e70fb374
iwyu
2014-07-22 22:40:39 -07:00
Dane Springmeyer
cfd971428c
benchmarks: always link -lrt/-ldl on linux
2014-07-22 15:36:45 -07:00
artemp
fe215a684e
c++11 style : replace (almost) all typedef with type alias's
2014-07-07 18:23:15 +01:00
Dane Springmeyer
6ce0828a6f
font registration test
2014-06-19 17:21:57 -07:00
Dane Springmeyer
ccfa25cf26
benchmark: also need -lrt on linux
2014-06-10 12:01:49 -07:00
Dane Springmeyer
62c6b5a456
fixup benchmark build flags
2014-06-10 12:00:36 -07: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
4a4ec224fd
fix compile of utf encoding benchmark on linux
2014-06-04 14:45:33 -07:00
Dane Springmeyer
0859a74f81
add benchmark of utf 32->8 encoding speed
2014-06-04 12:09:42 -07:00
Dane Springmeyer
e313b5ba62
benchmark: use halo-rasterizer='fast' (doubles perf)
2014-05-16 19:30:35 -07:00
Dane Springmeyer
7bf50e9b5b
fix build of test_array_allocation.cpp on older boost
2014-05-05 18:29:14 -07:00
Dane Springmeyer
d7bb97a22e
simplify code
2014-05-05 18:16:42 -07:00
Dane Springmeyer
f9ad079d39
benchmark: break out string to int/bool/double conversions
2014-05-05 10:08:25 -07:00
Dane Springmeyer
7158df8b08
benchmark: png encoding with z=1 to ensure we're testing hextree not zlib
2014-05-05 10:07:57 -07:00
Dane Springmeyer
8c1e69fdb8
static grammars
...
- construct on first use
- allows for faster map loading and unloading of xml loading tree
- modified expression and transform grammars to not take args/not crash
- simplifies interfaces, allows fast parsing from python without passing grammar instance
2014-04-30 00:11:27 -07:00
Dane Springmeyer
ab7fc55535
more realistic expression benchmark string - refs #1167
2014-04-29 18:25:21 -07:00
Dane Springmeyer
69ec89789a
array alloc bench: add static_vector + fix valarray usage
2014-04-28 19:58:15 -07:00
Dane Springmeyer
ad10497503
cache result of parse_expression to speed up map loading - refs #1167
2014-04-28 18:02:14 -07:00
Dane Springmeyer
b7b1acaa50
optimize string2bool
2014-04-25 21:46:40 -07:00
Dane Springmeyer
79a82cd8ff
add std::string and std::valarray to array allocation benchmark
2014-01-29 13:03:35 -08:00
