From bb71a3a5d82df192ec08287ed803031701e931ae Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 27 Jun 2007 11:40:09 +0000 Subject: INTEGRATION: CWS basebmp01 (1.2.20); FILE MERGED 2007/05/22 09:59:17 thb 1.2.20.1: #147378# Added support for foreign formats (via GenericColorImageAccessor); fixed typos in CompositeIterator and StridedArrayIterator; fixed comparisons for (Packed)PixelIterator and StridedArrayIterator (which got negative strides wrong); avoiding unnecessary copying in scale_image() now; cleaned up bitmapdevice.cxx from cruft/ad hoc debug code; made unit tests run again --- basebmp/inc/basebmp/compositeiterator.hxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'basebmp') diff --git a/basebmp/inc/basebmp/compositeiterator.hxx b/basebmp/inc/basebmp/compositeiterator.hxx index 3c64e425dff2..00c8c5aa7fa4 100755 --- a/basebmp/inc/basebmp/compositeiterator.hxx +++ b/basebmp/inc/basebmp/compositeiterator.hxx @@ -4,9 +4,9 @@ * * $RCSfile: compositeiterator.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: thb $ $Date: 2006-06-08 00:01:47 $ + * last change: $Author: hr $ $Date: 2007-06-27 12:40:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,22 +69,22 @@ namespace detail void operator-=(int d) {*mpVal1-=d; *mpVal2-=d; } bool operator==(ArithmeticProxy const & rhs) const - { return *mpVal1==*rhs.mpVal1 && *mpVal2==*rhs.mpVal2_; } + { return *mpVal1==*rhs.mpVal1 && *mpVal2==*rhs.mpVal2; } bool operator!=(ArithmeticProxy const & rhs) const - { return *mpVal1!=*rhs.mpVal1 || *mpVal2!=*rhs.mpVal2_; } + { return *mpVal1!=*rhs.mpVal1 || *mpVal2!=*rhs.mpVal2; } bool operator<(ArithmeticProxy const & rhs) const - { return *mpVal1<*rhs.mpVal1 && *mpVal2<*rhs.mpVal2_; } + { return *mpVal1<*rhs.mpVal1 && *mpVal2<*rhs.mpVal2; } bool operator<=(ArithmeticProxy const & rhs) const - { return *mpVal1<=*rhs.mpVal1 && *mpVal2<=*rhs.mpVal2_; } + { return *mpVal1<=*rhs.mpVal1 && *mpVal2<=*rhs.mpVal2; } bool operator>(ArithmeticProxy const & rhs) const - { return *mpVal1>*rhs.mpVal1 && *mpVal2>*rhs.mpVal2_; } + { return *mpVal1>*rhs.mpVal1 && *mpVal2>*rhs.mpVal2; } bool operator>=(ArithmeticProxy const & rhs) const - { return *mpVal1>=*rhs.mpVal1 && *mpVal2>=*rhs.mpVal2_; } + { return *mpVal1>=*rhs.mpVal1 && *mpVal2>=*rhs.mpVal2; } int operator-(ArithmeticProxy const & rhs) const { return *mpVal1 - *rhs.mpVal1; } -- cgit