diff options
| author | Michael Stahl <mst@openoffice.org> | 2012-08-02 12:07:32 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-08-02 15:38:29 +0200 |
| commit | b21ac0f0c6782804fad58a070e5b84aac711bc18 (patch) | |
| tree | b9571acd2177f7f7c90a4d04033784634e2ac61c /vcl | |
| parent | f15f1a61e4a5ccfacc8a0df78241ca205015ce3d (diff) | |
basic, cui, extensions, filter, vcl: fix some warnings
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/metric.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/outmap.cxx | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index a523b414ee89..bb9673ccbc98 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -714,7 +714,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) while( cMin < cEnd ) { int j = 0; - for(; (cMin < cEnd) && (j < NINSIZE); ++cMin ) + for (; (cMin < cEnd) && (j < (NINSIZE-1)); ++cMin) { if( cMin >= 0x0100 ) cCharsInp[ j++ ] = static_cast<sal_Char>(cMin >> 8); diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 42e96c2e068a..284f473d1c5d 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -61,9 +61,10 @@ DBG_NAMEEX( Region ) // ======================================================================= -static long aImplNumeratorAry[MAP_PIXEL+1] = +static int const s_ImplArySize = MAP_PIXEL+1; +static long aImplNumeratorAry[s_ImplArySize] = { 1, 1, 5, 50, 1, 1, 1, 1, 1, 1, 1 }; -static long aImplDenominatorAry[MAP_PIXEL+1] = +static long aImplDenominatorAry[s_ImplArySize] = { 2540, 254, 127, 127, 1000, 100, 10, 1, 72, 1440, 1 }; // ----------------------------------------------------------------------- @@ -1660,9 +1661,9 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo #define ENTER3( eUnitSource, eUnitDest ) \ long nNumerator = 1; \ long nDenominator = 1; \ - DBG_ASSERT( eUnitSource <= MAP_PIXEL, "nonpermitted source map unit"); \ - DBG_ASSERT( eUnitDest <= MAP_PIXEL, "nonpermitted destination map unit"); \ - if( (eUnitSource <= MAP_PIXEL) && (eUnitDest <= MAP_PIXEL) ) \ + DBG_ASSERT( eUnitSource < s_ImplArySize, "Invalid source map unit"); \ + DBG_ASSERT( eUnitDest < s_ImplArySize, "Invalid destination map unit"); \ + if( (eUnitSource < s_ImplArySize) && (eUnitDest < s_ImplArySize) ) \ { \ nNumerator = aImplNumeratorAry[eUnitSource] * \ aImplDenominatorAry[eUnitDest]; \ |