Subject: [Boost-commit] svn:boost r52730 - in trunk: boost/gil libs/gil/test
From: daniel_james_at_[hidden]
Date: 2009-05-02 08:45:53
Author: danieljames
Date: 2009-05-02 08:45:51 EDT (Sat, 02 May 2009)
New Revision: 52730
URL: http://svn.boost.org/trac/boost/changeset/52730
Log:
Detab a few files.
Text files modified:
trunk/boost/gil/channel.hpp | 30 +++++++++++++++---------------
trunk/boost/gil/channel_algorithm.hpp | 6 +++---
trunk/boost/gil/color_base.hpp | 2 +-
trunk/boost/gil/gil_config.hpp | 2 +-
trunk/boost/gil/image.hpp | 26 +++++++++++++-------------
trunk/libs/gil/test/image.cpp | 22 +++++++++++-----------
6 files changed, 44 insertions(+), 44 deletions(-)
Modified: trunk/boost/gil/channel.hpp
==============================================================================
--- trunk/boost/gil/channel.hpp (original)
+++ trunk/boost/gil/channel.hpp 2009-05-02 08:45:51 EDT (Sat, 02 May 2009)
@@ -256,15 +256,15 @@
template <std::size_t K>
struct static_copy_bytes {
- void operator()(const unsigned char* from, unsigned char* to) const {
- *to = *from;
- static_copy_bytes<K-1>()(++from,++to);
- }
+ void operator()(const unsigned char* from, unsigned char* to) const {
+ *to = *from;
+ static_copy_bytes<K-1>()(++from,++to);
+ }
};
template <>
struct static_copy_bytes<0> {
- void operator()(const unsigned char* , unsigned char*) const {}
+ void operator()(const unsigned char* , unsigned char*) const {}
};
template <typename Derived, typename BitField, int NumBits, bool Mutable>
@@ -308,17 +308,17 @@
static const integer_t max_val = (1<<NumBits) - 1;
#ifdef GIL_NONWORD_POINTER_ALIGNMENT_SUPPORTED
- const bitfield_t& get_data() const { return *static_cast<const bitfield_t*>(_data_ptr); }
- void set_data(const bitfield_t& val) const { *static_cast< bitfield_t*>(_data_ptr) = val; }
+ const bitfield_t& get_data() const { return *static_cast<const bitfield_t*>(_data_ptr); }
+ void set_data(const bitfield_t& val) const { *static_cast< bitfield_t*>(_data_ptr) = val; }
#else
- bitfield_t get_data() const {
- bitfield_t ret;
- static_copy_bytes<sizeof(bitfield_t) >()(gil_reinterpret_cast_c<const unsigned char*>(_data_ptr),gil_reinterpret_cast<unsigned char*>(&ret));
- return ret;
- }
- void set_data(const bitfield_t& val) const {
- static_copy_bytes<sizeof(bitfield_t) >()(gil_reinterpret_cast_c<const unsigned char*>(&val),gil_reinterpret_cast<unsigned char*>(_data_ptr));
- }
+ bitfield_t get_data() const {
+ bitfield_t ret;
+ static_copy_bytes<sizeof(bitfield_t) >()(gil_reinterpret_cast_c<const unsigned char*>(_data_ptr),gil_reinterpret_cast<unsigned char*>(&ret));
+ return ret;
+ }
+ void set_data(const bitfield_t& val) const {
+ static_copy_bytes<sizeof(bitfield_t) >()(gil_reinterpret_cast_c<const unsigned char*>(&val),gil_reinterpret_cast<unsigned char*>(_data_ptr));
+ }
#endif
private:
Modified: trunk/boost/gil/channel_algorithm.hpp
==============================================================================
--- trunk/boost/gil/channel_algorithm.hpp (original)
+++ trunk/boost/gil/channel_algorithm.hpp 2009-05-02 08:45:51 EDT (Sat, 02 May 2009)
@@ -342,14 +342,14 @@
type operator()(bits32 x) const { return static_cast<bits32s>(x-(1<<31)); }
};
-} // namespace detail
+} // namespace detail
/// \ingroup ChannelConvertAlgorithm
/// \brief A unary function object converting between channel types
template <typename SrcChannelV, typename DstChannelV> // Model ChannelValueConcept
struct channel_converter : public std::unary_function<SrcChannelV,DstChannelV> {
DstChannelV operator()(SrcChannelV src) const {
- typedef detail::channel_convert_to_unsigned<SrcChannelV> to_unsigned;
+ typedef detail::channel_convert_to_unsigned<SrcChannelV> to_unsigned;
typedef detail::channel_convert_from_unsigned<DstChannelV> from_unsigned;
typedef channel_converter_unsigned<typename to_unsigned::result_type, typename from_unsigned::argument_type> converter_unsigned;
return from_unsigned()(converter_unsigned()(to_unsigned()(src)));
@@ -425,7 +425,7 @@
template <typename ChannelValue>
struct channel_multiplier : public std::binary_function<ChannelValue, ChannelValue, ChannelValue> {
ChannelValue operator()(ChannelValue a, ChannelValue b) const {
- typedef detail::channel_convert_to_unsigned<ChannelValue> to_unsigned;
+ typedef detail::channel_convert_to_unsigned<ChannelValue> to_unsigned;
typedef detail::channel_convert_from_unsigned<ChannelValue> from_unsigned;
typedef channel_multiplier_unsigned<typename to_unsigned::result_type> multiplier_unsigned;
return from_unsigned()(multiplier_unsigned()(to_unsigned()(a), to_unsigned()(b)));
Modified: trunk/boost/gil/color_base.hpp
==============================================================================
--- trunk/boost/gil/color_base.hpp (original)
+++ trunk/boost/gil/color_base.hpp 2009-05-02 08:45:51 EDT (Sat, 02 May 2009)
@@ -182,7 +182,7 @@
_v2(*memunit_advanced(semantic_at_c<2>(ptr),diff)) {}
// Support for planar_pixel_reference operator[]
- Element at_c_dynamic(std::size_t i) const {
+ Element at_c_dynamic(std::size_t i) const {
switch (i) {
case 0: return _v0;
case 1: return _v1;
Modified: trunk/boost/gil/gil_config.hpp
==============================================================================
--- trunk/boost/gil/gil_config.hpp (original)
+++ trunk/boost/gil/gil_config.hpp 2009-05-02 08:45:51 EDT (Sat, 02 May 2009)
@@ -44,7 +44,7 @@
// Enable GIL_NONWORD_POINTER_ALIGNMENT_SUPPORTED if your platform supports dereferencing on non-word memory boundary.
// Enabling the flag results in performance improvement
#if !defined(__hpux) && !defined(sun) && !defined(__sun) && !defined(__osf__)
- #define GIL_NONWORD_POINTER_ALIGNMENT_SUPPORTED
+ #define GIL_NONWORD_POINTER_ALIGNMENT_SUPPORTED
#endif
#endif
Modified: trunk/boost/gil/image.hpp
==============================================================================
--- trunk/boost/gil/image.hpp (original)
+++ trunk/boost/gil/image.hpp 2009-05-02 08:45:51 EDT (Sat, 02 May 2009)
@@ -70,12 +70,12 @@
// Create with dimensions and optional initial value and alignment
image(const point_t& dimensions,
std::size_t alignment=0,
- const Alloc alloc_in = Alloc()) : _memory(0), _align_in_bytes(alignment), _alloc(alloc_in) {
+ const Alloc alloc_in = Alloc()) : _memory(0), _align_in_bytes(alignment), _alloc(alloc_in) {
allocate_and_default_construct(dimensions);
}
image(x_coord_t width, y_coord_t height,
std::size_t alignment=0,
- const Alloc alloc_in = Alloc()) : _memory(0), _align_in_bytes(alignment), _alloc(alloc_in) {
+ const Alloc alloc_in = Alloc()) : _memory(0), _align_in_bytes(alignment), _alloc(alloc_in) {
allocate_and_default_construct(point_t(width,height));
}
image(const point_t& dimensions,
@@ -195,26 +195,26 @@
std::size_t total_allocated_size_in_bytes(const point_t& dimensions) const {
std::size_t size_in_units = get_row_size_in_memunits(dimensions.x)*dimensions.y;
- if (IsPlanar)
- size_in_units = size_in_units*num_channels<view_t>::value;
+ if (IsPlanar)
+ size_in_units = size_in_units*num_channels<view_t>::value;
// return the size rounded up to the nearest byte
return (size_in_units + byte_to_memunit<typename view_t::x_iterator>::value - 1) / byte_to_memunit<typename view_t::x_iterator>::value
- + (_align_in_bytes>0 ? _align_in_bytes-1:0); // add extra padding in case we need to align the first image pixel
+ + (_align_in_bytes>0 ? _align_in_bytes-1:0); // add extra padding in case we need to align the first image pixel
}
std::size_t get_row_size_in_memunits(x_coord_t width) const { // number of units per row
- std::size_t size_in_memunits = width*memunit_step(typename view_t::x_iterator());
- if (_align_in_bytes>0) {
- std::size_t alignment_in_memunits=_align_in_bytes*byte_to_memunit<typename view_t::x_iterator>::value;
- return align(size_in_memunits, alignment_in_memunits);
- }
- return size_in_memunits;
+ std::size_t size_in_memunits = width*memunit_step(typename view_t::x_iterator());
+ if (_align_in_bytes>0) {
+ std::size_t alignment_in_memunits=_align_in_bytes*byte_to_memunit<typename view_t::x_iterator>::value;
+ return align(size_in_memunits, alignment_in_memunits);
+ }
+ return size_in_memunits;
}
void allocate_(const point_t& dimensions, mpl::false_) { // if it throws and _memory!=0 the client must deallocate _memory
_memory=_alloc.allocate(total_allocated_size_in_bytes(dimensions));
- unsigned char* tmp=(_align_in_bytes>0) ? (unsigned char*)align((std::size_t)_memory,_align_in_bytes) : _memory;
+ unsigned char* tmp=(_align_in_bytes>0) ? (unsigned char*)align((std::size_t)_memory,_align_in_bytes) : _memory;
_view=view_t(dimensions,typename view_t::locator(typename view_t::x_iterator(tmp),get_row_size_in_memunits(dimensions.x)));
}
@@ -222,7 +222,7 @@
std::size_t row_size=get_row_size_in_memunits(dimensions.x);
std::size_t plane_size=row_size*dimensions.y;
_memory=_alloc.allocate(total_allocated_size_in_bytes(dimensions));
- unsigned char* tmp=(_align_in_bytes>0) ? (unsigned char*)align((std::size_t)_memory,_align_in_bytes) : _memory;
+ unsigned char* tmp=(_align_in_bytes>0) ? (unsigned char*)align((std::size_t)_memory,_align_in_bytes) : _memory;
typename view_t::x_iterator first;
for (int i=0; i<num_channels<view_t>::value; ++i) {
dynamic_at_c(first,i) = (typename channel_type<view_t>::type*)tmp;
Modified: trunk/libs/gil/test/image.cpp
==============================================================================
--- trunk/libs/gil/test/image.cpp (original)
+++ trunk/libs/gil/test/image.cpp 2009-05-02 08:45:51 EDT (Sat, 02 May 2009)
@@ -294,20 +294,20 @@
// Test alignment and packed images
void image_test::packed_image_test() {
- typedef bit_aligned_image3_type<1,3,1, bgr_layout_t>::type bgr131_image_t;
- typedef bgr131_image_t::value_type bgr131_pixel_t;
- bgr131_pixel_t fill_val(1,3,1);
+ typedef bit_aligned_image3_type<1,3,1, bgr_layout_t>::type bgr131_image_t;
+ typedef bgr131_image_t::value_type bgr131_pixel_t;
+ bgr131_pixel_t fill_val(1,3,1);
- bgr131_image_t bgr131_img(3,10);
- fill_pixels(view(bgr131_img), fill_val);
+ bgr131_image_t bgr131_img(3,10);
+ fill_pixels(view(bgr131_img), fill_val);
- bgr131_image_t bgr131a_img(3,10,1);
- copy_pixels(const_view(bgr131_img), view(bgr131a_img));
+ bgr131_image_t bgr131a_img(3,10,1);
+ copy_pixels(const_view(bgr131_img), view(bgr131a_img));
- bgr131_image_t bgr131b_img(3,10,4);
- copy_pixels(const_view(bgr131_img), view(bgr131b_img));
+ bgr131_image_t bgr131b_img(3,10,4);
+ copy_pixels(const_view(bgr131_img), view(bgr131b_img));
- error_if(bgr131_img!=bgr131a_img || bgr131a_img!=bgr131b_img);
+ error_if(bgr131_img!=bgr131a_img || bgr131a_img!=bgr131b_img);
}
void image_test::dynamic_image_test() {
@@ -348,7 +348,7 @@
image_all_test<rgb8_planar_image_t>("planarrgb8_");
image_all_test<gray8_image_t>("gray8_");
- typedef const bit_aligned_pixel_reference<boost::uint8_t, mpl::vector3_c<int,1,2,1>, bgr_layout_t, true> bgr121_ref_t;
+ typedef const bit_aligned_pixel_reference<boost::uint8_t, mpl::vector3_c<int,1,2,1>, bgr_layout_t, true> bgr121_ref_t;
typedef image<bgr121_ref_t,false> bgr121_image_t;
image_all_test<bgr121_image_t>("bgr121_");