summaryrefslogtreecommitdiff
path: root/basebmp/inc
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-06-27 11:40:53 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-06-27 11:40:53 +0000
commitf6d09649a000bd7aace9a9a268da0957dfa28b50 (patch)
treeebacdffc09075cbb6a7fea1d97485abd2a99e27c /basebmp/inc
parent25a589539997ef00d9e8b821158be3b64d069d90 (diff)
INTEGRATION: CWS basebmp01 (1.4.20); FILE MERGED
2007/05/22 09:59:17 thb 1.4.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/inc')
-rw-r--r--basebmp/inc/basebmp/pixeliterator.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/basebmp/inc/basebmp/pixeliterator.hxx b/basebmp/inc/basebmp/pixeliterator.hxx
index c17707e44c4d..c7edc11e007c 100644
--- a/basebmp/inc/basebmp/pixeliterator.hxx
+++ b/basebmp/inc/basebmp/pixeliterator.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: pixeliterator.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: thb $ $Date: 2006-06-07 14:27:35 $
+ * last change: $Author: hr $ $Date: 2007-06-27 12:40:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -152,7 +152,7 @@ public:
bool operator<=(PixelColumnIterator const & rhs) const
{
- return !less(rhs);
+ return !rhs.less(*this);
}
bool operator>(PixelColumnIterator const & rhs) const
@@ -162,7 +162,7 @@ public:
bool operator>=(PixelColumnIterator const & rhs) const
{
- return !rhs.less(*this);
+ return !less(rhs);
}
difference_type operator-(PixelColumnIterator const & rhs) const