diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-02 12:58:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-02 12:58:45 +0000 |
| commit | a896ce2c3f5bbc0cbf97c75154e02dd4426aacab (patch) | |
| tree | b6cfa333de92dd7d88d201a0d9e229279ed49089 /basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx | |
| parent | 3d5eb8a5491f7f6cc03623c352521776b34f8389 (diff) | |
INTEGRATION: CWS canvas02 (1.3.12); FILE MERGED
2005/10/08 13:20:31 thb 1.3.12.3: RESYNC: (1.3-1.4); FILE MERGED
2005/07/28 10:10:20 thb 1.3.12.2: Join from cws_src680_aw024: #i48939# and new rendering subsystem need AW's clipper changes
2005/06/08 16:19:08 thb 1.3.12.1: #i50485# Made the check 64bit-safe
Diffstat (limited to 'basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx')
| -rw-r--r-- | basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx index c2ebc8753479..4d2f9c7986bb 100644 --- a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx +++ b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: b2dpolypolygonrasterconverter.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:47:23 $ + * last change: $Author: kz $ $Date: 2005-11-02 13:58:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,9 +40,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#ifndef BOOST_MEM_FN_HPP_INCLUDED #include <boost/mem_fn.hpp> -#endif #include <algorithm> @@ -121,7 +119,7 @@ namespace basegfx m_indices2 = new sal_uInt32[nNumElements]; // check for out of memory situation - if(!((sal_uInt32)m_indices1|(sal_uInt32)m_indices2)) { + if(!m_indices1 || !m_indices2) { delete [] m_indices1; delete [] m_indices2; m_indices1 = NULL; @@ -151,23 +149,24 @@ namespace basegfx // clear counters sal_uInt32 *ptr = m_counter; - for(int i=0; i<64; ++i) { - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; - *ptr++ = NULL; + for(int i=0; i<64; ++i) + { + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; } // prepare pointers to relevant memory addresses |