diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:43:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:43:14 +0000 |
| commit | 81502ae57aec17d72f716b74438bed1486326121 (patch) | |
| tree | a3341497b69ef67fe746e9a6402ebb1525731cba /basegfx/source/inc | |
| parent | 4299f3998ab0477b795e7721dbb3cefb37f010d1 (diff) | |
INTEGRATION: CWS warnings01 (1.15.8); FILE MERGED
2006/02/21 14:40:21 thb 1.15.8.1: #i55991# Changed matrix template int param to unsigned; int-casting it to reduced range where necessary; reverted senseless bitfield back to bool; renamed function parameter according to naming conventions (i.e. ripped off leading m)
Diffstat (limited to 'basegfx/source/inc')
| -rw-r--r-- | basegfx/source/inc/hommatrixtemplate.hxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx index 587a2843d07a..b67a8bb8730b 100644 --- a/basegfx/source/inc/hommatrixtemplate.hxx +++ b/basegfx/source/inc/hommatrixtemplate.hxx @@ -4,9 +4,9 @@ * * $RCSfile: hommatrixtemplate.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2005-09-07 20:41:51 $ + * last change: $Author: hr $ $Date: 2006-06-20 03:43:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -59,7 +59,7 @@ namespace basegfx return 0.0; } - template < int _RowSize > class ImplMatLine + template < unsigned int _RowSize > class ImplMatLine { enum { RowSize = _RowSize }; @@ -92,7 +92,7 @@ namespace basegfx } }; - template < int _RowSize > class ImplHomMatrixTemplate + template < unsigned int _RowSize > class ImplHomMatrixTemplate { enum { RowSize = _RowSize }; @@ -390,7 +390,8 @@ namespace basegfx bool isIdentity() const { // last line needs no testing if not existing - const sal_uInt16 nMaxLine = (mpLine) ? RowSize : (RowSize - 1); + const sal_uInt16 nMaxLine( + sal::static_int_cast<sal_uInt16>(mpLine ? RowSize : (RowSize - 1)) ); for(sal_uInt16 a(0); a < nMaxLine; a++) { @@ -498,7 +499,8 @@ namespace basegfx fRetval = (double)nParity; // last line needs no multiply if not existing; default value would be 1. - const sal_uInt16 nMaxLine = (aWork.mpLine) ? RowSize : (RowSize - 1); + const sal_uInt16 nMaxLine( + sal::static_int_cast<sal_uInt16>(aWork.mpLine ? RowSize : (RowSize - 1)) ); for(sal_uInt16 a(0); a < nMaxLine; a++) { @@ -512,7 +514,8 @@ namespace basegfx double doTrace() const { double fTrace = (mpLine) ? 0.0 : 1.0; - const sal_uInt16 nMaxLine = (mpLine) ? RowSize : (RowSize - 1); + const sal_uInt16 nMaxLine( + sal::static_int_cast<sal_uInt16>(mpLine ? RowSize : (RowSize - 1)) ); for(sal_uInt16 a(0); a < nMaxLine; a++) { @@ -603,7 +606,8 @@ namespace basegfx bool isEqual(const ImplHomMatrixTemplate& rMat) { - const sal_uInt16 nMaxLine = (mpLine || rMat.mpLine) ? RowSize : (RowSize - 1); + const sal_uInt16 nMaxLine( + sal::static_int_cast<sal_uInt16>((mpLine || rMat.mpLine) ? RowSize : (RowSize - 1)) ); for(sal_uInt16 a(0); a < nMaxLine; a++) { |