sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test tiff photometric setting

Browse source
This commit is contained in:
Dane Springmeyer 2014-12-08 17:16:56 -05:00
parent f121d805a9
commit 24a9816913
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/tiff_reader.cpp
View file

@ -153,7 +153,8 @@ public:
void read(unsigned x,unsigned y,image_data_rgba8& image) final; void read(unsigned x,unsigned y,image_data_rgba8& image) final;
image_data_any read(unsigned x, unsigned y, unsigned width, unsigned height) final; image_data_any read(unsigned x, unsigned y, unsigned width, unsigned height) final;
// methods specific to tiff reader // methods specific to tiff reader
std::size_t bits_per_sample() const { return bps_; } unsigned bits_per_sample() const { return bps_; }
unsigned photometric() const { return photometric_; }
bool is_tiled() const { return is_tiled_; } bool is_tiled() const { return is_tiled_; }
unsigned tile_width() const { return tile_width_; } unsigned tile_width() const { return tile_width_; }
unsigned tile_height() const { return tile_height_; } unsigned tile_height() const { return tile_height_; }

9
tests/cxx/tiff_io.cpp
View file

@ -48,6 +48,7 @@ SECTION("rgba8 tiled") {
REQUIRE( tiff_reader.is_tiled() == true ); REQUIRE( tiff_reader.is_tiled() == true );
REQUIRE( tiff_reader.tile_width() == 256 ); REQUIRE( tiff_reader.tile_width() == 256 );
REQUIRE( tiff_reader.tile_height() == 256 ); REQUIRE( tiff_reader.tile_height() == 256 );
REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_RGB );
TIFF_ASSERT_ALPHA TIFF_ASSERT_ALPHA
} }
@ -57,6 +58,7 @@ SECTION("rgb8 striped") {
REQUIRE( tiff_reader.is_tiled() == false ); REQUIRE( tiff_reader.is_tiled() == false );
REQUIRE( tiff_reader.tile_width() == 0 ); REQUIRE( tiff_reader.tile_width() == 0 );
REQUIRE( tiff_reader.tile_height() == 0 ); REQUIRE( tiff_reader.tile_height() == 0 );
REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_RGB );
TIFF_ASSERT_NO_ALPHA TIFF_ASSERT_NO_ALPHA
} }
@ -66,6 +68,7 @@ SECTION("rgb8 tiled") {
REQUIRE( tiff_reader.is_tiled() == true ); REQUIRE( tiff_reader.is_tiled() == true );
REQUIRE( tiff_reader.tile_width() == 256 ); REQUIRE( tiff_reader.tile_width() == 256 );
REQUIRE( tiff_reader.tile_height() == 256 ); REQUIRE( tiff_reader.tile_height() == 256 );
REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_RGB );
TIFF_ASSERT_NO_ALPHA TIFF_ASSERT_NO_ALPHA
} }
@ -75,6 +78,7 @@ SECTION("gray8 striped") {
REQUIRE( tiff_reader.is_tiled() == false ); REQUIRE( tiff_reader.is_tiled() == false );
REQUIRE( tiff_reader.tile_width() == 0 ); REQUIRE( tiff_reader.tile_width() == 0 );
REQUIRE( tiff_reader.tile_height() == 0 ); REQUIRE( tiff_reader.tile_height() == 0 );
REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK );
TIFF_ASSERT_NO_ALPHA TIFF_ASSERT_NO_ALPHA
} }
@ -84,6 +88,7 @@ SECTION("gray8 tiled") {
REQUIRE( tiff_reader.is_tiled() == true ); REQUIRE( tiff_reader.is_tiled() == true );
REQUIRE( tiff_reader.tile_width() == 256 ); REQUIRE( tiff_reader.tile_width() == 256 );
REQUIRE( tiff_reader.tile_height() == 256 ); REQUIRE( tiff_reader.tile_height() == 256 );
REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK );
TIFF_ASSERT_NO_ALPHA TIFF_ASSERT_NO_ALPHA
} }
@ -93,6 +98,7 @@ SECTION("gray16 striped") {
REQUIRE( tiff_reader.is_tiled() == false ); REQUIRE( tiff_reader.is_tiled() == false );
REQUIRE( tiff_reader.tile_width() == 0 ); REQUIRE( tiff_reader.tile_width() == 0 );
REQUIRE( tiff_reader.tile_height() == 0 ); REQUIRE( tiff_reader.tile_height() == 0 );
REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK );
TIFF_ASSERT_NO_ALPHA TIFF_ASSERT_NO_ALPHA
} }
@ -102,6 +108,7 @@ SECTION("gray16 tiled") {
REQUIRE( tiff_reader.is_tiled() == true ); REQUIRE( tiff_reader.is_tiled() == true );
REQUIRE( tiff_reader.tile_width() == 256 ); REQUIRE( tiff_reader.tile_width() == 256 );
REQUIRE( tiff_reader.tile_height() == 256 ); REQUIRE( tiff_reader.tile_height() == 256 );
REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK );
TIFF_ASSERT_NO_ALPHA TIFF_ASSERT_NO_ALPHA
} }
@ -111,6 +118,7 @@ SECTION("gray32f striped") {
REQUIRE( tiff_reader.is_tiled() == false ); REQUIRE( tiff_reader.is_tiled() == false );
REQUIRE( tiff_reader.tile_width() == 0 ); REQUIRE( tiff_reader.tile_width() == 0 );
REQUIRE( tiff_reader.tile_height() == 0 ); REQUIRE( tiff_reader.tile_height() == 0 );
REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK );
TIFF_ASSERT_NO_ALPHA TIFF_ASSERT_NO_ALPHA
} }
@ -120,6 +128,7 @@ SECTION("gray32f tiled") {
REQUIRE( tiff_reader.is_tiled() == true ); REQUIRE( tiff_reader.is_tiled() == true );
REQUIRE( tiff_reader.tile_width() == 256 ); REQUIRE( tiff_reader.tile_width() == 256 );
REQUIRE( tiff_reader.tile_height() == 256 ); REQUIRE( tiff_reader.tile_height() == 256 );
REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK );
TIFF_ASSERT_NO_ALPHA TIFF_ASSERT_NO_ALPHA
} }