From 25a589539997ef00d9e8b821158be3b64d069d90 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 27 Jun 2007 11:40:38 +0000 Subject: INTEGRATION: CWS basebmp01 (1.9.20); FILE MERGED 2007/05/22 09:59:17 thb 1.9.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/packedpixeliterator.hxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'basebmp/inc') diff --git a/basebmp/inc/basebmp/packedpixeliterator.hxx b/basebmp/inc/basebmp/packedpixeliterator.hxx index 9ee27130fe5f..4ff7faa0fcca 100644 --- a/basebmp/inc/basebmp/packedpixeliterator.hxx +++ b/basebmp/inc/basebmp/packedpixeliterator.hxx @@ -4,9 +4,9 @@ * * $RCSfile: packedpixeliterator.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: thb $ $Date: 2006-07-13 12:03:25 $ + * last change: $Author: hr $ $Date: 2007-06-27 12:40:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -205,7 +205,7 @@ public: bool operator<=(PackedPixelColumnIterator const & rhs) const { - return !less(rhs); + return !rhs.less(*this); } bool operator>(PackedPixelColumnIterator const & rhs) const @@ -215,7 +215,7 @@ public: bool operator>=(PackedPixelColumnIterator const & rhs) const { - return !rhs.less(*this); + return !less(rhs); } difference_type operator-(PackedPixelColumnIterator const & rhs) const @@ -436,7 +436,7 @@ public: bool operator<=(PackedPixelRowIterator const & rhs) const { - return !less(rhs); + return !rhs.less(*this); } bool operator>(PackedPixelRowIterator const & rhs) const @@ -446,7 +446,7 @@ public: bool operator>=(PackedPixelRowIterator const & rhs) const { - return !rhs.less(*this); + return !less(rhs); } difference_type operator-(PackedPixelRowIterator const & rhs) const -- cgit v1.2.3