|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r83195 - in trunk/boost/gil: . extension/dynamic_image extension/io extension/io/detail extension/io/formats/bmp extension/io/formats/png extension/io/formats/pnm extension/io/formats/tiff extension/toolbox/color_spaces extension/toolbox/metafunctions
From: chhenning_at_[hidden]
Date: 2013-02-27 20:18:28
Author: chhenning
Date: 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
New Revision: 83195
URL: http://svn.boost.org/trac/boost/changeset/83195
Log:
Removed all Tab characters and added missing newlines.
Text files modified:
trunk/boost/gil/extension/dynamic_image/any_image.hpp | 2
trunk/boost/gil/extension/dynamic_image/any_image_view.hpp | 2
trunk/boost/gil/extension/dynamic_image/apply_operation_base.hpp | 4
trunk/boost/gil/extension/dynamic_image/variant.hpp | 16 +++---
trunk/boost/gil/extension/io/detail/bit_operations.hpp | 6 +-
trunk/boost/gil/extension/io/detail/io_device.hpp | 52 ++++++++++----------
trunk/boost/gil/extension/io/detail/io_error.hpp | 2
trunk/boost/gil/extension/io/detail/path_spec.hpp | 6 +-
trunk/boost/gil/extension/io/formats/bmp/read.hpp | 102 ++++++++++++++++++++--------------------
trunk/boost/gil/extension/io/formats/bmp/scanline_read.hpp | 20 +++---
trunk/boost/gil/extension/io/formats/png/base.hpp | 2
trunk/boost/gil/extension/io/formats/png/read.hpp | 2
trunk/boost/gil/extension/io/formats/png/reader_backend.hpp | 4
trunk/boost/gil/extension/io/formats/pnm/read.hpp | 42 ++++++++--------
trunk/boost/gil/extension/io/formats/pnm/reader_backend.hpp | 62 ++++++++++++------------
trunk/boost/gil/extension/io/formats/pnm/scanline_read.hpp | 66 ++++++++++++------------
trunk/boost/gil/extension/io/formats/pnm/write.hpp | 4
trunk/boost/gil/extension/io/formats/tiff/read.hpp | 7 +-
trunk/boost/gil/extension/io/formats/tiff/write.hpp | 30 +++++-----
trunk/boost/gil/extension/io/raw_all.hpp | 9 +++
trunk/boost/gil/extension/io/raw_read.hpp | 9 +++
trunk/boost/gil/extension/io/raw_tags.hpp | 9 +++
trunk/boost/gil/extension/toolbox/color_spaces/cmyka.hpp | 4
trunk/boost/gil/extension/toolbox/metafunctions/channel_type.hpp | 34 ++++++------
trunk/boost/gil/extension/toolbox/metafunctions/is_homogeneous.hpp | 16 +++---
trunk/boost/gil/gil_concept.hpp | 2
trunk/boost/gil/image.hpp | 2
trunk/boost/gil/locator.hpp | 2
trunk/boost/gil/planar_pixel_iterator.hpp | 2
29 files changed, 273 insertions(+), 247 deletions(-)
Modified: trunk/boost/gil/extension/dynamic_image/any_image.hpp
==============================================================================
--- trunk/boost/gil/extension/dynamic_image/any_image.hpp (original)
+++ trunk/boost/gil/extension/dynamic_image/any_image.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -93,7 +93,7 @@
template <typename T> any_image& operator=(const T& obj) { parent_t::operator=(obj); return *this; }
any_image& operator=(const any_image& v) { parent_t::operator=((const parent_t&)v); return *this;}
- template <typename Types> any_image& operator=(const any_image<Types>& v) { parent_t::operator=((const variant<Types>&)v); return *this;}
+ template <typename Types> any_image& operator=(const any_image<Types>& v) { parent_t::operator=((const variant<Types>&)v); return *this;}
void recreate(const point_t& dims, unsigned alignment=1) { apply_operation(*this,detail::recreate_image_fnobj(dims,alignment)); }
void recreate(x_coord_t width, y_coord_t height, unsigned alignment=1) { recreate(point2<std::ptrdiff_t>(width,height),alignment); }
Modified: trunk/boost/gil/extension/dynamic_image/any_image_view.hpp
==============================================================================
--- trunk/boost/gil/extension/dynamic_image/any_image_view.hpp (original)
+++ trunk/boost/gil/extension/dynamic_image/any_image_view.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -76,7 +76,7 @@
template <typename T> any_image_view& operator=(const T& obj) { parent_t::operator=(obj); return *this; }
any_image_view& operator=(const any_image_view& v) { parent_t::operator=((const parent_t&)v); return *this;}
- template <typename Types> any_image_view& operator=(const any_image_view<Types>& v) { parent_t::operator=((const variant<Types>&)v); return *this;}
+ template <typename Types> any_image_view& operator=(const any_image_view<Types>& v) { parent_t::operator=((const variant<Types>&)v); return *this;}
std::size_t num_channels() const { return apply_operation(*this, detail::any_type_get_num_channels()); }
point_t dimensions() const { return apply_operation(*this, detail::any_type_get_dimensions()); }
Modified: trunk/boost/gil/extension/dynamic_image/apply_operation_base.hpp
==============================================================================
--- trunk/boost/gil/extension/dynamic_image/apply_operation_base.hpp (original)
+++ trunk/boost/gil/extension/dynamic_image/apply_operation_base.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -141,7 +141,7 @@
template <typename T2, typename Op>
struct reduce_bind1 {
const T2& _t2;
- Op& _op;
+ Op& _op;
typedef typename Op::result_type result_type;
@@ -154,7 +154,7 @@
struct reduce_bind2 {
const Bits1& _bits1;
std::size_t _index1;
- Op& _op;
+ Op& _op;
typedef typename Op::result_type result_type;
Modified: trunk/boost/gil/extension/dynamic_image/variant.hpp
==============================================================================
--- trunk/boost/gil/extension/dynamic_image/variant.hpp (original)
+++ trunk/boost/gil/extension/dynamic_image/variant.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -100,12 +100,12 @@
virtual ~variant() { apply_operation(*this, detail::destructor_op()); }
// Throws std::bad_cast if T is not in Types
- template <typename T> explicit variant(const T& obj){ _index=type_id<T>(); if (_index==NUM_TYPES) throw std::bad_cast(); detail::copy_construct_in_place(obj, _bits); }
+ template <typename T> explicit variant(const T& obj){ _index=type_id<T>(); if (_index==NUM_TYPES) throw std::bad_cast(); detail::copy_construct_in_place(obj, _bits); }
- template <typename Types2> explicit variant(const variant<Types2>& obj) : _index(apply_operation(obj,detail::type_to_index_fn<Types>())) {
- if (_index==NUM_TYPES) throw std::bad_cast();
- apply_operation(obj, detail::copy_construct_in_place_fn<base_t>(_bits));
- }
+ template <typename Types2> explicit variant(const variant<Types2>& obj) : _index(apply_operation(obj,detail::type_to_index_fn<Types>())) {
+ if (_index==NUM_TYPES) throw std::bad_cast();
+ apply_operation(obj, detail::copy_construct_in_place_fn<base_t>(_bits));
+ }
// When doSwap is true, swaps obj with the contents of the variant. obj will contain default-constructed instance after the call
template <typename T> explicit variant(T& obj, bool do_swap);
@@ -132,7 +132,7 @@
private:
template <typename T> static std::size_t type_id() { return detail::type_to_index<Types,T>::value; }
- template <typename Cs> friend void swap(variant<Cs>& x, variant<Cs>& y);
+ template <typename Cs> friend void swap(variant<Cs>& x, variant<Cs>& y);
template <typename Types2, typename UnaryOp> friend typename UnaryOp::result_type apply_operation(variant<Types2>& var, UnaryOp op);
template <typename Types2, typename UnaryOp> friend typename UnaryOp::result_type apply_operation(const variant<Types2>& var, UnaryOp op);
template <typename Types1, typename Types2, typename BinaryOp> friend typename BinaryOp::result_type apply_operation(const variant<Types1>& arg1, const variant<Types2>& arg2, BinaryOp op);
@@ -171,9 +171,9 @@
template <typename Types>
struct type_to_index_fn {
- typedef std::size_t result_type;
+ typedef std::size_t result_type;
- template <typename T> result_type operator()(const T&) const { return detail::type_to_index<Types,T>::value; }
+ template <typename T> result_type operator()(const T&) const { return detail::type_to_index<Types,T>::value; }
};
}
Modified: trunk/boost/gil/extension/io/detail/bit_operations.hpp
==============================================================================
--- trunk/boost/gil/extension/io/detail/bit_operations.hpp (original)
+++ trunk/boost/gil/extension/io/detail/bit_operations.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -229,9 +229,9 @@
while( x )
{
- // clear the least significant bit set
- x &= x - 1;
- ++n;
+ // clear the least significant bit set
+ x &= x - 1;
+ ++n;
}
return n;
Modified: trunk/boost/gil/extension/io/detail/io_device.hpp
==============================================================================
--- trunk/boost/gil/extension/io/detail/io_device.hpp (original)
+++ trunk/boost/gil/extension/io/detail/io_device.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -199,7 +199,7 @@
>
std::size_t read( T (&buf)[N] )
{
- return read( buf, N );
+ return read( buf, N );
}
/// Reads byte
@@ -259,32 +259,32 @@
/// Writes byte
void write_uint8( uint8_t x ) throw()
{
- byte_t m[1] = { x };
- write(m);
+ byte_t m[1] = { x };
+ write(m);
}
/// Writes 16 bit little endian integer
void write_uint16( uint16_t x ) throw()
{
- byte_t m[2];
+ byte_t m[2];
- m[0] = byte_t( x >> 0 );
- m[1] = byte_t( x >> 8 );
+ m[0] = byte_t( x >> 0 );
+ m[1] = byte_t( x >> 8 );
- write( m );
+ write( m );
}
/// Writes 32 bit little endian integer
void write_uint32( uint32_t x ) throw()
{
- byte_t m[4];
+ byte_t m[4];
- m[0] = byte_t( x >> 0 );
- m[1] = byte_t( x >> 8 );
- m[2] = byte_t( x >> 16 );
- m[3] = byte_t( x >> 24 );
+ m[0] = byte_t( x >> 0 );
+ m[1] = byte_t( x >> 8 );
+ m[2] = byte_t( x >> 16 );
+ m[3] = byte_t( x >> 24 );
- write( m );
+ write( m );
}
void seek( long count, int whence = SEEK_SET )
@@ -397,7 +397,7 @@
>
size_t read( T (&buf)[N] )
{
- return read( buf, N );
+ return read( buf, N );
}
/// Reads byte
@@ -500,32 +500,32 @@
/// Writes byte
void write_uint8( uint8_t x ) throw()
{
- byte_t m[1] = { x };
- write(m);
+ byte_t m[1] = { x };
+ write(m);
}
/// Writes 16 bit little endian integer
void write_uint16( uint16_t x ) throw()
{
- byte_t m[2];
+ byte_t m[2];
- m[0] = byte_t( x >> 0 );
- m[1] = byte_t( x >> 8 );
+ m[0] = byte_t( x >> 0 );
+ m[1] = byte_t( x >> 8 );
- write( m );
+ write( m );
}
/// Writes 32 bit little endian integer
void write_uint32( uint32_t x ) throw()
{
- byte_t m[4];
+ byte_t m[4];
- m[0] = byte_t( x >> 0 );
- m[1] = byte_t( x >> 8 );
- m[2] = byte_t( x >> 16 );
- m[3] = byte_t( x >> 24 );
+ m[0] = byte_t( x >> 0 );
+ m[1] = byte_t( x >> 8 );
+ m[2] = byte_t( x >> 16 );
+ m[3] = byte_t( x >> 24 );
- write( m );
+ write( m );
}
void flush()
Modified: trunk/boost/gil/extension/io/detail/io_error.hpp
==============================================================================
--- trunk/boost/gil/extension/io/detail/io_error.hpp (original)
+++ trunk/boost/gil/extension/io/detail/io_error.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -37,4 +37,4 @@
} // namespace gil
} // namespace boost
-#endif // BOOST_GIL_EXTENSION_IO_DETAIL_IO_ERROR_HPP
\ No newline at end of file
+#endif // BOOST_GIL_EXTENSION_IO_DETAIL_IO_ERROR_HPP
Modified: trunk/boost/gil/extension/io/detail/path_spec.hpp
==============================================================================
--- trunk/boost/gil/extension/io/detail/path_spec.hpp (original)
+++ trunk/boost/gil/extension/io/detail/path_spec.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -67,9 +67,9 @@
inline std::string convert_to_string( std::wstring const& s )
{
- std::size_t len = wcslen( s.c_str() );
- char* c = reinterpret_cast<char*>( alloca( len ));
- wcstombs( c, s.c_str(), len );
+ std::size_t len = wcslen( s.c_str() );
+ char* c = reinterpret_cast<char*>( alloca( len ));
+ wcstombs( c, s.c_str(), len );
return std::string( c, c + len );
}
Modified: trunk/boost/gil/extension/io/formats/bmp/read.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/bmp/read.hpp (original)
+++ trunk/boost/gil/extension/io/formats/bmp/read.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -151,33 +151,33 @@
case 4:
{
- switch ( this->_info._compression )
- {
- case bmp_compression::_rle4:
- {
+ switch ( this->_info._compression )
+ {
+ case bmp_compression::_rle4:
+ {
///@todo How can we determine that?
this->_scanline_length = 0;
- read_palette_image_rle( dst_view );
+ read_palette_image_rle( dst_view );
- break;
+ break;
}
- case bmp_compression::_rgb:
- {
+ case bmp_compression::_rgb:
+ {
this->_scanline_length = ( this->_info._width * num_channels< rgba8_view_t >::value + 3 ) & ~3;
- read_palette_image< gray4_image_t::view_t
- , detail::swap_half_bytes< byte_vector_t
- , mpl::true_
- >
- > ( dst_view );
- break;
+ read_palette_image< gray4_image_t::view_t
+ , detail::swap_half_bytes< byte_vector_t
+ , mpl::true_
+ >
+ > ( dst_view );
+ break;
}
- default:
- {
- io_error( "Unsupported compression mode in BMP file." );
+ default:
+ {
+ io_error( "Unsupported compression mode in BMP file." );
break;
}
}
@@ -186,32 +186,32 @@
case 8:
{
- switch ( this->_info._compression )
- {
- case bmp_compression::_rle8:
- {
+ switch ( this->_info._compression )
+ {
+ case bmp_compression::_rle8:
+ {
///@todo How can we determine that?
this->_scanline_length = 0;
read_palette_image_rle( dst_view );
- break;
+ break;
}
- case bmp_compression::_rgb:
- {
+ case bmp_compression::_rgb:
+ {
this->_scanline_length = ( this->_info._width * num_channels< rgba8_view_t >::value + 3 ) & ~3;
- read_palette_image< gray8_image_t::view_t
- , detail::do_nothing< std::vector< gray8_pixel_t > >
- > ( dst_view );
- break;
+ read_palette_image< gray8_image_t::view_t
+ , detail::do_nothing< std::vector< gray8_pixel_t > >
+ > ( dst_view );
+ break;
}
- default:
- {
- io_error( "Unsupported compression mode in BMP file." );
+ default:
+ {
+ io_error( "Unsupported compression mode in BMP file." );
break;
- }
+ }
}
break;
@@ -436,27 +436,27 @@
}
}
- template< typename Buffer
+ template< typename Buffer
, typename View
- >
- void copy_row_if_needed( const Buffer& buf
- , const View& view
- , std::ptrdiff_t y
- )
- {
- if( y >= this->_settings._top_left.y
- && y < this->_settings._dim.y
- )
- {
+ >
+ void copy_row_if_needed( const Buffer& buf
+ , const View& view
+ , std::ptrdiff_t y
+ )
+ {
+ if( y >= this->_settings._top_left.y
+ && y < this->_settings._dim.y
+ )
+ {
typename Buffer::const_iterator beg = buf.begin() + this->_settings._top_left.x;
typename Buffer::const_iterator end = beg + this->_settings._dim.x;
- std::copy( beg
- , end
- , view.row_begin( y )
- );
- }
- }
+ std::copy( beg
+ , end
+ , view.row_begin( y )
+ );
+ }
+ }
template< typename View_Dst >
void read_palette_image_rle( const View_Dst& view )
@@ -479,7 +479,7 @@
Buf_type::iterator dst_end = buf.end();
//
- std::ptrdiff_t ybeg = 0;
+ std::ptrdiff_t ybeg = 0;
std::ptrdiff_t yend = this->_settings._dim.y;
std::ptrdiff_t yinc = 1;
@@ -634,7 +634,7 @@
}
}
}
- }
+ }
private:
Modified: trunk/boost/gil/extension/io/formats/bmp/scanline_read.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/bmp/scanline_read.hpp (original)
+++ trunk/boost/gil/extension/io/formats/bmp/scanline_read.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -145,16 +145,16 @@
case 4:
{
- switch( this->_info._compression )
- {
- case bmp_compression::_rle4:
+ switch( this->_info._compression )
+ {
+ case bmp_compression::_rle4:
{
io_error( "Cannot read run-length encoded images in iterator mode. Try to read as whole image." );
break;
}
- case bmp_compression::_rgb :
+ case bmp_compression::_rgb :
{
this->_scanline_length = ( this->_info._width * num_channels< rgba8_view_t >::value + 3 ) & ~3;
@@ -166,7 +166,7 @@
break;
}
- default:
+ default:
{
io_error( "Unsupported compression mode in BMP file." );
}
@@ -177,15 +177,15 @@
case 8:
{
- switch( this->_info._compression )
- {
- case bmp_compression::_rle8:
+ switch( this->_info._compression )
+ {
+ case bmp_compression::_rle8:
{
io_error( "Cannot read run-length encoded images in iterator mode. Try to read as whole image." );
break;
}
- case bmp_compression::_rgb:
+ case bmp_compression::_rgb:
{
this->_scanline_length = ( this->_info._width * num_channels< rgba8_view_t >::value + 3 ) & ~3;
@@ -197,7 +197,7 @@
break;
}
- default: { io_error( "Unsupported compression mode in BMP file." ); break; }
+ default: { io_error( "Unsupported compression mode in BMP file." ); break; }
}
break;
Modified: trunk/boost/gil/extension/io/formats/png/base.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/png/base.hpp (original)
+++ trunk/boost/gil/extension/io/formats/png/base.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -104,4 +104,4 @@
} // namespace gil
} // namespace boost
-#endif // BOOST_GIL_EXTENSION_IO_PNG_BASE_HPP
\ No newline at end of file
+#endif // BOOST_GIL_EXTENSION_IO_PNG_BASE_HPP
Modified: trunk/boost/gil/extension/io/formats/png/read.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/png/read.hpp (original)
+++ trunk/boost/gil/extension/io/formats/png/read.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -243,7 +243,7 @@
, typename View
>
void read_rows( const View& view )
- {
+ {
typedef detail::row_buffer_helper_view< ImagePixel > row_buffer_helper_t;
typedef typename row_buffer_helper_t::buffer_t buffer_t;
Modified: trunk/boost/gil/extension/io/formats/png/reader_backend.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/png/reader_backend.hpp (original)
+++ trunk/boost/gil/extension/io/formats/png/reader_backend.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -79,8 +79,8 @@
void read_header()
{
- using boost::gil::detail::PNG_BYTES_TO_CHECK;
-
+ using boost::gil::detail::PNG_BYTES_TO_CHECK;
+
// check the file's first few bytes
byte_t buf[PNG_BYTES_TO_CHECK];
Modified: trunk/boost/gil/extension/io/formats/pnm/read.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/pnm/read.hpp (original)
+++ trunk/boost/gil/extension/io/formats/pnm/read.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -112,10 +112,10 @@
);
switch( this->_info._type )
- {
+ {
// reading mono text is reading grayscale but with only two values
- case pnm_image_type::mono_asc_t::value:
- case pnm_image_type::gray_asc_t::value:
+ case pnm_image_type::mono_asc_t::value:
+ case pnm_image_type::gray_asc_t::value:
{
this->_scanline_length = this->_info._width;
@@ -124,7 +124,7 @@
break;
}
- case pnm_image_type::color_asc_t::value:
+ case pnm_image_type::color_asc_t::value:
{
this->_scanline_length = this->_info._width * num_channels< rgb8_view_t >::value;
@@ -133,7 +133,7 @@
break;
}
- case pnm_image_type::mono_bin_t::value:
+ case pnm_image_type::mono_bin_t::value:
{
//gray1_image_t
this->_scanline_length = ( this->_info._width + 7 ) >> 3;
@@ -143,7 +143,7 @@
break;
}
- case pnm_image_type::gray_bin_t::value:
+ case pnm_image_type::gray_bin_t::value:
{
// gray8_image_t
this->_scanline_length = this->_info._width;
@@ -153,7 +153,7 @@
break;
}
- case pnm_image_type::color_bin_t::value:
+ case pnm_image_type::color_bin_t::value:
{
// rgb8_image_t
this->_scanline_length = this->_info._width * num_channels< rgb8_view_t >::value;
@@ -161,7 +161,7 @@
read_bin_data< rgb8_view_t >( view );
break;
}
- }
+ }
}
private:
@@ -206,21 +206,21 @@
{
for( uint32_t k = 0; ; )
{
- int ch = this->_io_dev.getc_unchecked();
+ int ch = this->_io_dev.getc_unchecked();
- if( isdigit( ch ))
- {
+ if( isdigit( ch ))
+ {
buf[ k++ ] = static_cast< char >( ch );
- }
- else if( k )
- {
- buf[ k ] = 0;
- break;
- }
- else if( ch == EOF || !isspace( ch ))
- {
- return;
- }
+ }
+ else if( k )
+ {
+ buf[ k ] = 0;
+ break;
+ }
+ else if( ch == EOF || !isspace( ch ))
+ {
+ return;
+ }
}
if( process )
Modified: trunk/boost/gil/extension/io/formats/pnm/reader_backend.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/pnm/reader_backend.hpp (original)
+++ trunk/boost/gil/extension/io/formats/pnm/reader_backend.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -71,9 +71,9 @@
_info._type = read_char() - '0';
- io_error_if( _info._type < pnm_image_type::mono_asc_t::value || _info._type > pnm_image_type::color_bin_t::value
- , "Invalid PNM file (supports P1 to P6)"
- );
+ io_error_if( _info._type < pnm_image_type::mono_asc_t::value || _info._type > pnm_image_type::color_bin_t::value
+ , "Invalid PNM file (supports P1 to P6)"
+ );
_info._width = read_int();
_info._height = read_int();
@@ -86,9 +86,9 @@
{
_info._max_value = read_int();
- io_error_if( _info._max_value > 255
- , "Unsupported PNM format (supports maximum value 255)"
- );
+ io_error_if( _info._max_value > 255
+ , "Unsupported PNM format (supports maximum value 255)"
+ );
}
}
@@ -135,41 +135,41 @@
return ch;
}
- unsigned int read_int()
- {
- char ch;
+ unsigned int read_int()
+ {
+ char ch;
// skip whitespaces, tabs, and new lines
- do
- {
- ch = read_char();
- }
- while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');
-
- if( ch < '0' || ch > '9' )
- {
- io_error( "Unexpected characters reading decimal digits" );
- }
+ do
+ {
+ ch = read_char();
+ }
+ while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');
+
+ if( ch < '0' || ch > '9' )
+ {
+ io_error( "Unexpected characters reading decimal digits" );
+ }
- unsigned val = 0;
+ unsigned val = 0;
do
{
- unsigned dig = ch - '0';
+ unsigned dig = ch - '0';
- if( val > INT_MAX / 10 - dig )
- {
- io_error( "Integer too large" );
- }
+ if( val > INT_MAX / 10 - dig )
+ {
+ io_error( "Integer too large" );
+ }
- val = val * 10 + dig;
+ val = val * 10 + dig;
- ch = read_char();
- }
- while( '0' <= ch && ch <= '9' );
+ ch = read_char();
+ }
+ while( '0' <= ch && ch <= '9' );
- return val;
- }
+ return val;
+ }
public:
Modified: trunk/boost/gil/extension/io/formats/pnm/scanline_read.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/pnm/scanline_read.hpp (original)
+++ trunk/boost/gil/extension/io/formats/pnm/scanline_read.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -97,10 +97,10 @@
void initialize()
{
switch( this->_info._type )
- {
+ {
// reading mono text is reading grayscale but with only two values
- case pnm_image_type::mono_asc_t::value:
- case pnm_image_type::gray_asc_t::value:
+ case pnm_image_type::mono_asc_t::value:
+ case pnm_image_type::gray_asc_t::value:
{
this->_scanline_length = this->_info._width;
@@ -110,7 +110,7 @@
break;
}
- case pnm_image_type::color_asc_t::value:
+ case pnm_image_type::color_asc_t::value:
{
this->_scanline_length = this->_info._width * num_channels< rgb8_view_t >::value;
@@ -121,7 +121,7 @@
}
- case pnm_image_type::mono_bin_t::value:
+ case pnm_image_type::mono_bin_t::value:
{
//gray1_image_t
this->_scanline_length = ( this->_info._width + 7 ) >> 3;
@@ -132,7 +132,7 @@
break;
}
- case pnm_image_type::gray_bin_t::value:
+ case pnm_image_type::gray_bin_t::value:
{
// gray8_image_t
this->_scanline_length = this->_info._width;
@@ -143,7 +143,7 @@
break;
}
- case pnm_image_type::color_bin_t::value:
+ case pnm_image_type::color_bin_t::value:
{
// rgb8_image_t
this->_scanline_length = this->_info._width * num_channels< rgb8_view_t >::value;
@@ -155,7 +155,7 @@
}
default: { io_error( "Unsupported pnm file." ); break; }
- }
+ }
}
void read_text_row( byte_t* dst )
@@ -164,21 +164,21 @@
{
for( uint32_t k = 0; ; )
{
- int ch = this->_io_dev.getc_unchecked();
+ int ch = this->_io_dev.getc_unchecked();
- if( isdigit( ch ))
- {
+ if( isdigit( ch ))
+ {
_text_buffer[ k++ ] = static_cast< char >( ch );
- }
- else if( k )
- {
- _text_buffer[ k ] = 0;
- break;
- }
- else if( ch == EOF || !isspace( ch ))
- {
- return;
- }
+ }
+ else if( k )
+ {
+ _text_buffer[ k ] = 0;
+ break;
+ }
+ else if( ch == EOF || !isspace( ch ))
+ {
+ return;
+ }
}
int value = atoi( _text_buffer );
@@ -203,20 +203,20 @@
{
for( uint32_t k = 0; ; )
{
- int ch = this->_io_dev.getc_unchecked();
+ int ch = this->_io_dev.getc_unchecked();
- if( isdigit( ch ))
- {
+ if( isdigit( ch ))
+ {
k++;
- }
- else if( k )
- {
- break;
- }
- else if( ch == EOF || !isspace( ch ))
- {
- return;
- }
+ }
+ else if( k )
+ {
+ break;
+ }
+ else if( ch == EOF || !isspace( ch ))
+ {
+ return;
+ }
}
}
}
Modified: trunk/boost/gil/extension/io/formats/pnm/write.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/pnm/write.hpp (original)
+++ trunk/boost/gil/extension/io/formats/pnm/write.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -203,7 +203,7 @@
; y < src.height()
; ++y
)
- {
+ {
//copy_pixels( subimage_view( src
// , 0
// , (int) y
@@ -219,7 +219,7 @@
);
this->_io_dev.write( row_addr, pitch );
- }
+ }
}
};
Modified: trunk/boost/gil/extension/io/formats/tiff/read.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/tiff/read.hpp (original)
+++ trunk/boost/gil/extension/io/formats/tiff/read.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -639,7 +639,7 @@
std::size_t size_to_allocate = buffer_size< typename View::value_type >( dst_view.width()
, is_view_bit_aligned_t() );
- row_buffer_helper_t row_buffer_helper( size_to_allocate, true );
+ row_buffer_helper_t row_buffer_helper( size_to_allocate, true );
it_t begin = row_buffer_helper.begin();
@@ -682,9 +682,8 @@
std::size_t element_size = sizeof( Pixel );
std::size_t ret = std::max( width
- , (( scanline_size_in_bytes + element_size - 1 ) / element_size ));
-
- //assert( this->_scanline_length == ret );
+ , (( scanline_size_in_bytes + element_size - 1 ) / element_size )
+ );
return ret;
}
Modified: trunk/boost/gil/extension/io/formats/tiff/write.hpp
==============================================================================
--- trunk/boost/gil/extension/io/formats/tiff/write.hpp (original)
+++ trunk/boost/gil/extension/io/formats/tiff/write.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -51,13 +51,13 @@
struct my_interleaved_pixel_iterator_type_from_pixel_reference
{
private:
- typedef typename remove_reference< PixelReference >::type::value_type pixel_t;
+ typedef typename remove_reference< PixelReference >::type::value_type pixel_t;
public:
- typedef typename iterator_type_from_pixel< pixel_t
- , false
- , false
- , true
- >::type type;
+ typedef typename iterator_type_from_pixel< pixel_t
+ , false
+ , false
+ , true
+ >::type type;
};
@@ -71,15 +71,15 @@
, Mutable
>
>
- : public iterator_type_from_pixel< const bit_aligned_pixel_reference< uint8_t
- , Channel
- , Layout
- , Mutable
- >
- ,false
- ,false
- ,true
- > {};
+ : public iterator_type_from_pixel< const bit_aligned_pixel_reference< uint8_t
+ , Channel
+ , Layout
+ , Mutable
+ >
+ ,false
+ ,false
+ ,true
+ > {};
struct tiff_write_is_supported
{
Modified: trunk/boost/gil/extension/io/raw_all.hpp
==============================================================================
--- trunk/boost/gil/extension/io/raw_all.hpp (original)
+++ trunk/boost/gil/extension/io/raw_all.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -1,3 +1,12 @@
+/*
+ Copyright 2013 Christian Henning
+ Use, modification and distribution are subject to the Boost Software License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+*/
+
+/*************************************************************************************************/
+
#ifndef BOOST_GIL_EXTENSION_IO_RAW_ALL_HPP
#define BOOST_GIL_EXTENSION_IO_RAW_ALL_HPP
Modified: trunk/boost/gil/extension/io/raw_read.hpp
==============================================================================
--- trunk/boost/gil/extension/io/raw_read.hpp (original)
+++ trunk/boost/gil/extension/io/raw_read.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -1,3 +1,12 @@
+/*
+ Copyright 2013 Christian Henning
+ Use, modification and distribution are subject to the Boost Software License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+*/
+
+/*************************************************************************************************/
+
#ifndef BOOST_GIL_EXTENSION_IO_RAW_READ_HPP
#define BOOST_GIL_EXTENSION_IO_RAW_READ_HPP
Modified: trunk/boost/gil/extension/io/raw_tags.hpp
==============================================================================
--- trunk/boost/gil/extension/io/raw_tags.hpp (original)
+++ trunk/boost/gil/extension/io/raw_tags.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -1,3 +1,12 @@
+/*
+ Copyright 2013 Christian Henning
+ Use, modification and distribution are subject to the Boost Software License,
+ Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt).
+*/
+
+/*************************************************************************************************/
+
#ifndef BOOST_GIL_EXTENSION_IO_RAW_TAGS_HPP
#define BOOST_GIL_EXTENSION_IO_RAW_TAGS_HPP
Modified: trunk/boost/gil/extension/toolbox/color_spaces/cmyka.hpp
==============================================================================
--- trunk/boost/gil/extension/toolbox/color_spaces/cmyka.hpp (original)
+++ trunk/boost/gil/extension/toolbox/color_spaces/cmyka.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -53,7 +53,7 @@
// pixel<T1,cmyk_layout_t>(channel_multiply(get_color(src,cyan_t()), get_color(src,alpha_t())),
// channel_multiply(get_color(src,magenta_t()),get_color(src,alpha_t())),
// channel_multiply(get_color(src,yellow_t()), get_color(src,alpha_t())),
-// channel_multiply(get_color(src,black_t()), get_color(src,alpha_t())))
+// channel_multiply(get_color(src,black_t()), get_color(src,alpha_t())))
// ,dst);
// }
//};
@@ -66,7 +66,7 @@
pixel<T1,cmyk_layout_t>(get_color(src,cyan_t()),
get_color(src,magenta_t()),
get_color(src,yellow_t()),
- get_color(src,black_t()))
+ get_color(src,black_t()))
,dst);
}
};
Modified: trunk/boost/gil/extension/toolbox/metafunctions/channel_type.hpp
==============================================================================
--- trunk/boost/gil/extension/toolbox/metafunctions/channel_type.hpp (original)
+++ trunk/boost/gil/extension/toolbox/metafunctions/channel_type.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -39,10 +39,10 @@
template <typename B, typename C, typename L, bool M>
struct gen_chan_ref
{
- typedef packed_dynamic_channel_reference< B
- , mpl::at_c< C, 0 >::type::value
- , M
- > type;
+ typedef packed_dynamic_channel_reference< B
+ , mpl::at_c< C, 0 >::type::value
+ , M
+ > type;
};
//! This implementation works for bit_algined_pixel_reference
@@ -53,23 +53,23 @@
// bit_aligned_pixel_reference
template <typename B, typename C, typename L, bool M>
struct channel_type< bit_aligned_pixel_reference<B,C,L,M> >
- : lazy_enable_if< is_homogeneous< bit_aligned_pixel_reference< B, C, L, M > >
+ : lazy_enable_if< is_homogeneous< bit_aligned_pixel_reference< B, C, L, M > >
, gen_chan_ref< B, C, L, M >
- > {};
+ > {};
template <typename B, typename C, typename L, bool M>
struct channel_type<const bit_aligned_pixel_reference<B,C,L,M> >
- : lazy_enable_if< is_homogeneous< bit_aligned_pixel_reference< B, C, L, M > >
- , gen_chan_ref< B, C, L, M >
- > {};
+ : lazy_enable_if< is_homogeneous< bit_aligned_pixel_reference< B, C, L, M > >
+ , gen_chan_ref< B, C, L, M >
+ > {};
template <typename B, typename C, typename L>
struct gen_chan_ref_p
{
- typedef packed_dynamic_channel_reference< B
- , get_num_bits< typename mpl::at_c<C,0>::type>::value
- , true
- > type;
+ typedef packed_dynamic_channel_reference< B
+ , get_num_bits< typename mpl::at_c<C,0>::type>::value
+ , true
+ > type;
};
// packed_pixel
@@ -90,13 +90,13 @@
, ChannelRefVec
, Layout
>
- > {};
+ > {};
template <typename B, typename C, typename L>
struct channel_type< const packed_pixel< B, C, L > >
- : lazy_enable_if< is_homogeneous<packed_pixel< B, C, L > >
- , gen_chan_ref_p< B, C, L >
- >
+ : lazy_enable_if< is_homogeneous<packed_pixel< B, C, L > >
+ , gen_chan_ref_p< B, C, L >
+ >
{};
template<>
Modified: trunk/boost/gil/extension/toolbox/metafunctions/is_homogeneous.hpp
==============================================================================
--- trunk/boost/gil/extension/toolbox/metafunctions/is_homogeneous.hpp (original)
+++ trunk/boost/gil/extension/toolbox/metafunctions/is_homogeneous.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -59,7 +59,7 @@
// for packed_pixel
template <typename B, typename C, typename L >
struct is_homogeneous<packed_pixel< B, C, L > >
- : is_homogeneous_impl_p< C
+ : is_homogeneous_impl_p< C
, typename mpl::at_c< C, 0 >::type
, 1
, mpl::size< C >::type::value
@@ -70,21 +70,21 @@
, typename L
>
struct is_homogeneous< const packed_pixel< B, C, L > >
- : is_homogeneous_impl_p< C
- , typename mpl::at_c<C,0>::type
- , 1
- , mpl::size< C >::type::value
- > {};
+ : is_homogeneous_impl_p< C
+ , typename mpl::at_c<C,0>::type
+ , 1
+ , mpl::size< C >::type::value
+ > {};
// for bit_aligned_pixel_reference
template <typename B, typename C, typename L, bool M>
struct is_homogeneous<bit_aligned_pixel_reference<B,C,L,M> >
- : is_homogeneous_impl<C,typename mpl::at_c<C,0>::type,1,mpl::size<C>::type::value>
+ : is_homogeneous_impl<C,typename mpl::at_c<C,0>::type,1,mpl::size<C>::type::value>
{};
template <typename B, typename C, typename L, bool M>
struct is_homogeneous<const bit_aligned_pixel_reference<B,C,L,M> >
- : is_homogeneous_impl<C,typename mpl::at_c<C,0>::type,1,mpl::size<C>::type::value>
+ : is_homogeneous_impl<C,typename mpl::at_c<C,0>::type,1,mpl::size<C>::type::value>
{};
} // namespace gil
Modified: trunk/boost/gil/gil_concept.hpp
==============================================================================
--- trunk/boost/gil/gil_concept.hpp (original)
+++ trunk/boost/gil/gil_concept.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -954,7 +954,7 @@
p[0]=v;
v=p[0];
}
- typename P::template element_type<P>::type v;
+ typename P::template element_type<P>::type v;
P p;
};
Modified: trunk/boost/gil/image.hpp
==============================================================================
--- trunk/boost/gil/image.hpp (original)
+++ trunk/boost/gil/image.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -222,7 +222,7 @@
const std::size_t _channels_in_image = mpl::eval_if< is_pixel< value_type >
, num_channels< view_t >
, mpl::int_< 1 >
- >::type::value;
+ >::type::value;
std::size_t size_in_units = is_planar_impl( get_row_size_in_memunits( dimensions.x ) * dimensions.y
, _channels_in_image
Modified: trunk/boost/gil/locator.hpp
==============================================================================
--- trunk/boost/gil/locator.hpp (original)
+++ trunk/boost/gil/locator.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -355,4 +355,4 @@
};
} } // namespace boost::gil
-#endif
\ No newline at end of file
+#endif
Modified: trunk/boost/gil/planar_pixel_iterator.hpp
==============================================================================
--- trunk/boost/gil/planar_pixel_iterator.hpp (original)
+++ trunk/boost/gil/planar_pixel_iterator.hpp 2013-02-27 20:18:25 EST (Wed, 27 Feb 2013)
@@ -221,4 +221,4 @@
};
} } // namespace boost::gil
-#endif
\ No newline at end of file
+#endif
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk