diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 11:40:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 11:40:38 +0000 |
| commit | 25a589539997ef00d9e8b821158be3b64d069d90 (patch) | |
| tree | 3afb2c88e1f15a6749867e404cfd3ecfdedfc836 /basebmp | |
| parent | 952dcc17eb70a7100bc5e888551e9654749ebb83 (diff) | |
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
Diffstat (limited to 'basebmp')
| -rw-r--r-- | basebmp/inc/basebmp/packedpixeliterator.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
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 |