Ticket #3041: patch.diff

File patch.diff, 1.6 KB (added by peter@…, 13 years ago)

Additional fixes.

  • bit_aligned_pixel_reference.hpp 

    diff -rup /usr/include/boost/gil/bit_aligned_pixel_reference.hpp ./bit_aligned_pixel_reference.hpp
    old new private:  
    169169
    170170private:
    171171    static void check_gray() {  BOOST_STATIC_ASSERT((is_same<typename Layout::color_space_t, gray_t>::value)); }
    172     template <typename Channel> void assign(const Channel& chan, mpl::false_) const { check_gray(); at_c<0>(*this)=chan; }
    173     template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; }
     172    template <typename Channel> void assign(const Channel& chan, mpl::false_) const { check_gray(); gil::at_c<0>(*this)=chan; }
     173    template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; }
    174174};
    175175
    176176/////////////////////////////

  • gil_concept.hpp 

    diff -rup /usr/include/boost/gil/gil_concept.hpp ./gil_concept.hpp
    old new struct ColorBaseConcept {  
    618618        typedef typename kth_element_const_reference_type<ColorBase,num_elements-1>::type CR;
    619619
    620620#if !defined(_MSC_VER) || _MSC_VER > 1310
    621         CR cr=at_c<num_elements-1>(cb);  ignore_unused_variable_warning(cr);
     621        CR cr=gil::at_c<num_elements-1>(cb);  ignore_unused_variable_warning(cr);
    622622#endif
    623623
    624624        // functions that work for every pixel (no need to require them)