Dane Springmeyer
bc3f59af12
new c++ tiff tests - refs #2491
2014-12-08 14:52:52 -05:00
Dane Springmeyer
dc3df99f66
rename tiff test image
2014-12-08 14:11:32 -05:00
artemp
7fcc4a0846
use TIFFReadTile (or TIFFReadEncodedTile) instead of TIFFReadRGBATile to have consistent orientation
...
(FIXME: python tests failures)
2014-12-08 18:55:40 +01:00
artemp
017def88b1
update raster-color-to-alpha tests to use raster.input
2014-12-08 15:55:06 +01:00
artemp
912771b8fd
generic read_tiled<ImageData> initial implementation + read PHOTOMETRIC_RGB using high-level RGBA expanding interface
2014-12-08 15:51:00 +01:00
Dane Springmeyer
79366386c7
Merge pull request #2598 from mapycz/add-test-iconic-font
...
add visual test iconic font
2014-12-07 16:08:05 -05:00
Jiri Drbalek
20178013ea
add visual test iconic font
2014-12-07 16:13:48 +00:00
Blake Thompson
74fb5f0890
Merge branch 'image_data_any' of github.com:mapnik/mapnik into image_data_any
2014-12-05 15:43:20 -05:00
Blake Thompson
8aec9aca89
Some really basic tests that I was using for testing, many more need to be added
2014-12-05 15:43:14 -05:00
Dane Springmeyer
23d78680cf
add (currently failing) tests for #1927
2014-12-05 14:04:37 -05:00
Dane Springmeyer
96baff431f
use c++ style casts im tiff_reader
2014-12-05 13:59:20 -05:00
Dane Springmeyer
3da1342185
Add mention of unique_ptr and std::copy to contributing docs
2014-12-05 12:28:51 -05:00
artemp
ce605e3982
use RAII for resource management
2014-12-05 18:01:45 +01:00
Dane Springmeyer
fc0894634c
improve image tests
2014-12-05 11:36:50 -05:00
artemp
902858e55f
tiff_reader: initial support for reading gray8/gray16/gray32f/rgba8/rgba16/rgba32f data
...
Note: current code only works with image data organized in strips. Tile-orientated reading needs implementing
2014-12-05 17:35:26 +01:00
Dane Springmeyer
cc2cf2876f
Merge branch 'master' of github.com:mapnik/mapnik into image_data_any
2014-12-05 09:45:12 -05:00
Dane Springmeyer
ba4230c8ad
stop setting -Wsign-compare since this is too noisy as a default
2014-12-05 09:44:54 -05:00
Dane Springmeyer
d6e9126132
fix linking of scale_image_agg - refs #2587
2014-12-05 09:43:57 -05:00
Jiri Drbalek
aebd45b286
Merge pull request #2536 from mapycz/improve-font-feature-settings
...
font-feature-settings improvements
2014-12-05 07:28:00 +01:00
Blake Thompson
4d159a3900
fixin' okie spelling
2014-12-04 18:13:11 -05:00
Blake Thompson
daecced552
A small modification to the image_tests removing some options not indended to be left on
2014-12-04 17:17:14 -05:00
Blake Thompson
bf5c532269
Series of changes for the tiff encoder:
...
* Added configuration options for the TIFF encoder. The options are:
- compression: adobe_deflate(default), deflate, lzw, none
- zlevel: 0-9
- scanline: 1,0 (Forces scanline encoding)
* Fixed bug in encoder with scanline where memory was being modified
* by TIFFWriteScanline. A buffer is now created for each row to prevent
* modification of the underlying image_data.
2014-12-04 17:11:33 -05:00
Jiri Drbalek
778e654933
update visual test - font-feature-settings
2014-12-04 21:19:13 +00:00
Jiri Drbalek
2282fab53e
use font-feature-settings per text_item
2014-12-04 21:19:13 +00:00
Rafa de la Torre
af4c2620aa
Ignore overviews with 0 scale in pgraster
...
refs #2551
Postgis raster_columns view is returning NULL values for raster
overviews with large scale factors. That issue in postgis is described
in http://trac.osgeo.org/postgis/ticket/3006
This causes two main problems:
- The first overview with scale = NULL is wrongly chosen for rendering
always
- The messed up scaling factor causes the render symbolizer to spent
an insane amount of CPU and memory to render a messed up tiles.
The patch in postgis is expected to be released with the new version, a
few months from now.
Conflicts:
plugins/input/pgraster/pgraster_datasource.cpp
2014-12-04 12:29:16 -05:00
artemp
0006de7420
image_data - fix copy constructor
2014-12-04 18:26:58 +01:00
Rafa de la Torre
6cb8b6e14b
Ignore overviews with 0 scale in pgraster
...
refs #2551
Postgis raster_columns view is returning NULL values for raster
overviews with large scale factors. That issue in postgis is described
in http://trac.osgeo.org/postgis/ticket/3006
This causes two main problems:
- The first overview with scale = NULL is wrongly chosen for rendering
always
- The messed up scaling factor causes the render symbolizer to spent
an insane amount of CPU and memory to render a messed up tiles.
The patch in postgis is expected to be released with the new version, a
few months from now.
Conflicts:
plugins/input/pgraster/pgraster_datasource.cpp
2014-12-04 11:09:44 -05:00
Blake Thompson
fa902bc97d
Removed logging accidently left in test.
2014-12-04 10:49:21 -05:00
Blake Thompson
e6c5f705e5
Fixed error with selection criteria for stripe vs tiled, added modulus check on length and width to select striped in some situations, changed bitspersample for RBGA. (ref #2491 )
2014-12-04 10:48:19 -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
artemp
6b3fc9907f
specify alpha 0 in default-color e.g " #00000000 "
2014-12-04 10:33:44 +01:00
artemp
06ab69a08e
further simplify raster rendering code
2014-12-04 10:33:28 +01:00
artemp
3b3e255f5e
add comment
2014-12-04 10:31:56 +01:00
Blake Thompson
cdaca0ba11
Updated tiff processing so now the encoder will utilize different types of data as well as will use Tile based encoding in most situations, if the image is large will revert to scanline based encoding.
2014-12-03 18:41:49 -05:00
Dane Springmeyer
f82d57f497
work in progress: start enhancing tiff reader to handle bits per sample
2014-12-03 18:37:27 -05:00
Dane Springmeyer
2f0e236bc0
update expected visual test images
2014-12-03 16:30:35 -05:00
Dane Springmeyer
cbe0a0cca5
update agg blending cpp test - refs #1452
2014-12-03 15:19:22 -05:00
Dane Springmeyer
954d0db46c
Merge branch 'master' of github.com:mapnik/mapnik into image_data_any
2014-12-03 13:53:14 -05:00
Dane Springmeyer
02135991ed
convert raster_symbolizer_test to use full image comparisons
2014-12-03 13:53:04 -05:00
Dane Springmeyer
9d479f246b
update a few expected images
2014-12-03 13:41:57 -05:00
Dane Springmeyer
6bba6b88de
update a few expected images
2014-12-03 13:38:55 -05:00
artemp
de7a268333
read single band as int16 then agg_scale and colorize in gray16 color space, output rgb8 (aka image_data_32)
...
NOTE: proof-of-concept needed re-factoring/duplicate code removal
2014-12-03 18:19:44 +01:00
Dane Springmeyer
27159b8086
update visual test images after agg rgba improvements
2014-12-03 12:10:49 -05:00
artemp
6fc8002dec
use new image_reader API
2014-12-03 10:58:05 +01:00
artemp
802428712e
initial image_data_any read(...) implementation - always read into image_data_32
2014-12-03 10:56:19 +01:00
artemp
1df9d89a70
add to image_reader and implement empty (placeholder)
...
```image_data_any read(unsigned x, unsigned y, unsigned width, unsigned height) final```
in png/jpeg/webp/tiff readers
2014-12-03 10:44:56 +01:00
artemp
33607145a6
add image_data_null which is cheap to construct (no mem alloc)
...
add default ctor to image_data_any -> image_data_null
2014-12-03 10:26:21 +01:00
artemp
83aa06e329
move image_data_any into seprate header
2014-12-03 10:12:46 +01:00
Dane Springmeyer
1ff4125e92
fix visibility of mapnik::composite function to python bindings - refs #2587
2014-12-03 00:43:04 -05:00
Dane Springmeyer
46215c0f35
fix compile of pgraster plugin
2014-12-03 00:35:34 -05:00
