boost/gil
2
0
Fork 0
mirror of https://github.com/boostorg/gil.git synced 2026-02-18 02:02:09 +00:00
Code Issues Projects Releases Wiki Activity

Updated targa reader to support screen origin bit.

Browse Source
This commit is contained in:
Gogs
2018-03-31 14:50:54 +01:00
committed by Stefan Seefeld
parent b8d2b3f983
commit fac3ffe7c8
8 changed files with 127 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/gil/extension/io/formats/targa/read.hpp
View File

@@ -127,7 +127,7 @@ public:
{
this->_scanline_length = this->_info._width * ( this->_info._bits_per_pixel / 8 );
if( this->_info._descriptor & 0x20 )
if( this->_info._screen_origin_bit )
{
read_data< bgr8_view_t >( flipped_up_down_view( dst_view ) );
}
@@ -142,7 +142,7 @@ public:
{
this->_scanline_length = this->_info._width * ( this->_info._bits_per_pixel / 8 );
if( this->_info._descriptor & 0x20 )
if( this->_info._screen_origin_bit )
{
read_data< bgra8_view_t >( flipped_up_down_view( dst_view ) );
}
@@ -178,7 +178,7 @@ public:
{
case 24:
{
if( this->_info._descriptor & 0x20 )
if( this->_info._screen_origin_bit )
{
read_rle_data< bgr8_view_t >( flipped_up_down_view( dst_view ) );
}
@@ -190,7 +190,7 @@ public:
}
case 32:
{
if( this->_info._descriptor & 0x20 )
if( this->_info._screen_origin_bit )
{
read_rle_data< bgra8_view_t >( flipped_up_down_view( dst_view ) );
}

14
include/boost/gil/extension/io/formats/targa/reader_backend.hpp
View File

@@ -94,7 +94,6 @@ public:
}
_info._descriptor = _io_dev.read_uint8();
targa_descriptor::type pixel_type = _info._descriptor & 0xdf;
// According to TGA specs, http://www.gamers.org/dEngine/quake3/TGA.txt,
// the image descriptor byte is:
@@ -104,7 +103,7 @@ public:
{
io_error("Unsupported descriptor for targa file");
}
else if (_info._bits_per_pixel == 24 && pixel_type != 0)
else if (_info._bits_per_pixel == 24)
{
// Bits 3-0 - For the Targa 24, it should be 0.
if ((_info._descriptor & 0x0FU) != 0)
@@ -112,24 +111,23 @@ public:
io_error("Unsupported descriptor for targa file");
}
}
else if (_info._bits_per_pixel == 32 && pixel_type != 0)
else if (_info._bits_per_pixel == 32)
{
// Bits 3-0 - For Targa 32, it should be 8.
if (_info._descriptor != 8 && _info._descriptor != 40)
{
io_error("Unsupported descriptor for targa file");
}
if (_info._descriptor & 32)
{
_info._screen_origin_bit = true;
}
}
else
{
io_error("Unsupported descriptor for targa file");
}
if (_info._descriptor & 32)
{
_info._screen_origin_bit = true;
}
_info._valid = true;
}

5
include/boost/gil/extension/io/formats/targa/scanline_read.hpp
View File

@@ -120,6 +120,11 @@ private:
{
io_error( "Non-indexed targa files containing a palette are not supported." );
}
if( this->_info._screen_origin_bit )
{
io_error( "scanline reader cannot read targa files which have screen origin bit set." );
}
switch( this->_info._bits_per_pixel )
{

124
io/test/targa_read_test.cpp
View File

@@ -75,10 +75,17 @@ BOOST_AUTO_TEST_CASE( read_reference_images_test )
// 24BPP_compressed.tga
{
rgb8_image_t img;
read_image( targa_in + "24BPP_compressed.tga", img, tag_t() );
BOOST_CHECK_EQUAL( view( img ).width() , 124 );
BOOST_CHECK_EQUAL( view( img ).height(), 124 );
typename rgb8_image_t::x_coord_t width = view( img ).width();
typename rgb8_image_t::y_coord_t height = view( img ).height();
BOOST_CHECK_EQUAL( width , 124 );
BOOST_CHECK_EQUAL( height, 124 );
BOOST_CHECK( view( img )(0, 0) == rgb8_pixel_t(248, 0, 248) );
BOOST_CHECK( view( img )(width-1, 0) == rgb8_pixel_t(0, 0, 248) );
BOOST_CHECK( view( img )(0, height-1) == rgb8_pixel_t(248, 0, 0) );
BOOST_CHECK( view( img )(width-1, height-1) == rgb8_pixel_t(248, 0, 248) );
write( img, "24BPP_compressed_out.tga" );
}
@@ -86,10 +93,17 @@ BOOST_AUTO_TEST_CASE( read_reference_images_test )
// 24BPP_uncompressed.tga
{
rgb8_image_t img;
read_image( targa_in + "24BPP_uncompressed.tga", img, tag_t() );
BOOST_CHECK_EQUAL( view( img ).width() , 124 );
BOOST_CHECK_EQUAL( view( img ).height(), 124 );
typename rgb8_image_t::x_coord_t width = view( img ).width();
typename rgb8_image_t::y_coord_t height = view( img ).height();
BOOST_CHECK_EQUAL( width , 124 );
BOOST_CHECK_EQUAL( height, 124 );
BOOST_CHECK( view( img )(0, 0) == rgb8_pixel_t(248, 0, 248) );
BOOST_CHECK( view( img )(width-1, 0) == rgb8_pixel_t(0, 0, 248) );
BOOST_CHECK( view( img )(0, height-1) == rgb8_pixel_t(248, 0, 0) );
BOOST_CHECK( view( img )(width-1, height-1) == rgb8_pixel_t(248, 0, 248) );
write( img, "24BPP_uncompressed_out.tga" );
@@ -99,10 +113,17 @@ BOOST_AUTO_TEST_CASE( read_reference_images_test )
// 32BPP_compressed.tga
{
rgba8_image_t img;
read_image( targa_in + "32BPP_compressed.tga", img, tag_t() );
BOOST_CHECK_EQUAL( view( img ).width() , 124 );
BOOST_CHECK_EQUAL( view( img ).height(), 124 );
typename rgba8_image_t::x_coord_t width = view( img ).width();
typename rgba8_image_t::y_coord_t height = view( img ).height();
BOOST_CHECK_EQUAL( width , 124 );
BOOST_CHECK_EQUAL( height, 124 );
BOOST_CHECK( view( img )(0, 0) == rgba8_pixel_t(248, 0, 248, 255) );
BOOST_CHECK( view( img )(width-1, 0) == rgba8_pixel_t(0, 0, 248, 255) );
BOOST_CHECK( view( img )(0, height-1) == rgba8_pixel_t(0, 0, 0, 0) );
BOOST_CHECK( view( img )(width-1, height-1) == rgba8_pixel_t(248, 0, 248, 255) );
write( img, "32BPP_compressed_out.tga" );
}
@@ -110,15 +131,94 @@ BOOST_AUTO_TEST_CASE( read_reference_images_test )
// 32BPP_uncompressed.tga
{
rgba8_image_t img;
read_image( targa_in + "32BPP_uncompressed.tga", img, tag_t() );
BOOST_CHECK_EQUAL( view( img ).width() , 124 );
BOOST_CHECK_EQUAL( view( img ).height(), 124 );
typename rgba8_image_t::x_coord_t width = view( img ).width();
typename rgba8_image_t::y_coord_t height = view( img ).height();
BOOST_CHECK_EQUAL( width , 124 );
BOOST_CHECK_EQUAL( height, 124 );
BOOST_CHECK( view( img )(0, 0) == rgba8_pixel_t(248, 0, 248, 255) );
BOOST_CHECK( view( img )(width-1, 0) == rgba8_pixel_t(0, 0, 248, 255) );
BOOST_CHECK( view( img )(0, height-1) == rgba8_pixel_t(0, 0, 0, 0) );
BOOST_CHECK( view( img )(width-1, height-1) == rgba8_pixel_t(248, 0, 248, 255) );
write( img, "32BPP_uncompressed_out.tga" );
test_targa_scanline_reader< bgra8_image_t >( "32BPP_uncompressed.tga" );
}
// 24BPP_compressed_ul_origin.tga
{
rgb8_image_t img;
read_image( targa_in + "24BPP_compressed_ul_origin.tga", img, tag_t() );
typename rgb8_image_t::x_coord_t width = view( img ).width();
typename rgb8_image_t::y_coord_t height = view( img ).height();
BOOST_CHECK_EQUAL( width , 124 );
BOOST_CHECK_EQUAL( height, 124 );
BOOST_CHECK( view( img )(0, 0) == rgb8_pixel_t(248, 0, 248) );
BOOST_CHECK( view( img )(width-1, 0) == rgb8_pixel_t(0, 0, 248) );
BOOST_CHECK( view( img )(0, height-1) == rgb8_pixel_t(248, 0, 0) );
BOOST_CHECK( view( img )(width-1, height-1) == rgb8_pixel_t(248, 0, 248) );
write( img, "24BPP_compressed_ul_origin_out.tga" );
}
// 24BPP_uncompressed_ul_origin.tga
{
rgb8_image_t img;
read_image( targa_in + "24BPP_uncompressed_ul_origin.tga", img, tag_t() );
typename rgb8_image_t::x_coord_t width = view( img ).width();
typename rgb8_image_t::y_coord_t height = view( img ).height();
BOOST_CHECK_EQUAL( width , 124 );
BOOST_CHECK_EQUAL( height, 124 );
BOOST_CHECK( view( img )(0, 0) == rgb8_pixel_t(248, 0, 248) );
BOOST_CHECK( view( img )(width-1, 0) == rgb8_pixel_t(0, 0, 248) );
BOOST_CHECK( view( img )(0, height-1) == rgb8_pixel_t(248, 0, 0) );
BOOST_CHECK( view( img )(width-1, height-1) == rgb8_pixel_t(248, 0, 248) );
write( img, "24BPP_uncompressed_ul_origin_out.tga" );
}
// 32BPP_compressed_ul_origin.tga
{
rgba8_image_t img;
read_image( targa_in + "32BPP_compressed_ul_origin.tga", img, tag_t() );
typename rgba8_image_t::x_coord_t width = view( img ).width();
typename rgba8_image_t::y_coord_t height = view( img ).height();
BOOST_CHECK_EQUAL( width , 124 );
BOOST_CHECK_EQUAL( height, 124 );
BOOST_CHECK( view( img )(0, 0) == rgba8_pixel_t(248, 0, 248, 255) );
BOOST_CHECK( view( img )(width-1, 0) == rgba8_pixel_t(0, 0, 248, 255) );
BOOST_CHECK( view( img )(0, height-1) == rgba8_pixel_t(0, 0, 0, 0) );
BOOST_CHECK( view( img )(width-1, height-1) == rgba8_pixel_t(248, 0, 248, 255) );
write( img, "32BPP_compressed_ul_origin_out.tga" );
}
// 32BPP_uncompressed_ul_origin.tga
{
rgba8_image_t img;
read_image( targa_in + "32BPP_uncompressed_ul_origin.tga", img, tag_t() );
typename rgba8_image_t::x_coord_t width = view( img ).width();
typename rgba8_image_t::y_coord_t height = view( img ).height();
BOOST_CHECK_EQUAL( width , 124 );
BOOST_CHECK_EQUAL( height, 124 );
BOOST_CHECK( view( img )(0, 0) == rgba8_pixel_t(248, 0, 248, 255) );
BOOST_CHECK( view( img )(width-1, 0) == rgba8_pixel_t(0, 0, 248, 255) );
BOOST_CHECK( view( img )(0, height-1) == rgba8_pixel_t(0, 0, 0, 0) );
BOOST_CHECK( view( img )(width-1, height-1) == rgba8_pixel_t(248, 0, 248, 255) );
write( img, "32BPP_uncompressed_ul_origin_out.tga" );
}
}
BOOST_AUTO_TEST_CASE( partial_image_test )

BIN
io/test_images/targa/24BPP_compressed_ul_origin.tga Normal file
View File

Binary file not shown.

BIN
io/test_images/targa/24BPP_uncompressed_ul_origin.tga Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 45 KiB

BIN
io/test_images/targa/32BPP_compressed_ul_origin.tga Normal file
View File

Binary file not shown.

BIN
io/test_images/targa/32BPP_uncompressed_ul_origin.tga Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 60 KiB