|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r67592 - sandbox/gil/boost/gil/extension/io2
From: dsaritz_at_[hidden]
Date: 2011-01-02 15:44:43
Author: psiha
Date: 2011-01-02 15:44:42 EST (Sun, 02 Jan 2011)
New Revision: 67592
URL: http://svn.boost.org/trac/boost/changeset/67592
Log:
Cleaned up MSVC++ specifics.
Minor refactoring.
Text files modified:
sandbox/gil/boost/gil/extension/io2/libtiff_image.hpp | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
Modified: sandbox/gil/boost/gil/extension/io2/libtiff_image.hpp
==============================================================================
--- sandbox/gil/boost/gil/extension/io2/libtiff_image.hpp (original)
+++ sandbox/gil/boost/gil/extension/io2/libtiff_image.hpp 2011-01-02 15:44:42 EST (Sun, 02 Jan 2011)
@@ -19,11 +19,12 @@
//------------------------------------------------------------------------------
#include "formatted_image.hpp"
+#include "detail/platform_specifics.hpp"
#include "detail/io_error.hpp"
#include "detail/libx_shared.hpp"
#if BOOST_MPL_LIMIT_VECTOR_SIZE < 35
-...error...libtiff support requires mpl vectors of size 35 or greater...
+ #error libtiff support requires mpl vectors of size 35 or greater...
#endif
#include <boost/array.hpp>
@@ -208,22 +209,19 @@
inline tsize_t memory_read_proc( thandle_t /*handle*/, tdata_t /*buf*/, tsize_t /*size*/ )
{
- BOOST_ASSERT( !"Should not get called." );
- __assume( false );
+ BF_UNREACHABLE_CODE
return 0;
}
inline tsize_t memory_write_proc( thandle_t /*handle*/, tdata_t /*buf*/, tsize_t /*size*/ )
{
- BOOST_ASSERT( !"Should not get called." );
- __assume( false );
+ BF_UNREACHABLE_CODE
return 0;
}
inline toff_t memory_seek_proc( thandle_t /*handle*/, toff_t /*off*/, int /*whence*/ )
{
- BOOST_ASSERT( !"Should not get called." );
- __assume( false );
+ BF_UNREACHABLE_CODE
return 0;
}
@@ -234,8 +232,7 @@
inline toff_t memory_size_proc( thandle_t /*handle*/ )
{
- BOOST_ASSERT( !"Should not get called." );
- __assume( false );
+ BF_UNREACHABLE_CODE
return 0;
}
@@ -382,8 +379,7 @@
construction_check();
}
- __declspec( nothrow )
- ~libtiff_base()
+ BF_NOTHROW ~libtiff_base()
{
::TIFFClose( &lib_object() );
}
@@ -558,8 +554,6 @@
return bits.bits_per_sample * ( ( bits.planar_configuration == PLANARCONFIG_CONTIG ) ? bits.samples_per_pixel : 1 ) / 8;
}
- detail::full_format_t::format_bitfield const & format_bits() const { return format_.bits; }
-
private:
template <typename T>
T get_field( ttag_t const tag ) const
@@ -619,6 +613,8 @@
}
private:
+ detail::full_format_t::format_bitfield const & format_bits() const { return format_.bits; }
+
static unsigned int round_up_divide( unsigned int const dividend, unsigned int const divisor )
{
return ( dividend + divisor - 1 ) / divisor;
@@ -1175,8 +1171,7 @@
generic_scanline_buffer_t const buffer_;
};
- __declspec( nothrow )
- skip_row_results_t skip_to_row
+ skip_row_results_t BF_NOTHROWNOALIAS skip_to_row
(
unsigned int const row_to_skip_to,
unsigned int const sample,
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