diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-01-25 10:23:14 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-25 10:29:50 +0000 |
commit | 90b755b2838a49d80e83bd2642bc8ff5c399396b (patch) | |
tree | e25da95adf84864adf53cc6345e432c6cdad3e82 /vcl/source/fontsubset | |
parent | 5a21fcc73f4346ea78a777e91de506d8f47e485f (diff) |
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'vcl/source/fontsubset')
-rw-r--r-- | vcl/source/fontsubset/cff.cxx | 6 | ||||
-rw-r--r-- | vcl/source/fontsubset/sft.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 26a0100c3db8..b0c17df110b7 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -1306,13 +1306,12 @@ void CffSubsetterContext::callType2Subr( bool bGlobal, int nSubrNumber) const U8* const pOldReadPtr = mpReadPtr; const U8* const pOldReadEnd = mpReadEnd; - int nLen = 0; if( bGlobal ) { nSubrNumber += mnGlobalSubrBias; - nLen = seekIndexData( mnGlobalSubrBase, nSubrNumber); + seekIndexData( mnGlobalSubrBase, nSubrNumber); } else { nSubrNumber += mpCffLocal->mnLocalSubrBias; - nLen = seekIndexData( mpCffLocal->mnLocalSubrBase, nSubrNumber); + seekIndexData( mpCffLocal->mnLocalSubrBase, nSubrNumber); } while( mpReadPtr < mpReadEnd) @@ -1754,6 +1753,7 @@ int CffSubsetterContext::getFDSelect( int nGlyphIndex) const assert( nRangeCount <= mnCharStrCount); U16 nPrev = (pReadPtr[2]<<8) + pReadPtr[3]; assert( nPrev == 0); + (void)nPrev; pReadPtr += 4; // TODO? binary search for( int i = 0; i < nRangeCount; ++i) { diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 001d7790cb20..3b7e5eb5b5f3 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -1333,7 +1333,7 @@ static sal_uInt32 getGlyph4(const sal_uInt8 *cmap, sal_uInt32 c) { sal_uInt16 * idDelta; /* sal_uInt16 * glyphIdArray; */ sal_uInt16 * idRangeOffset; - sal_uInt16 * glyphIndexArray; + /*sal_uInt16 * glyphIndexArray;*/ sal_uInt16 *CMAP4 = (sal_uInt16 *) cmap; /* sal_uInt16 GEbinsearch(sal_uInt16 *ar, sal_uInt16 length, sal_uInt16 toSearch); */ @@ -1351,7 +1351,7 @@ static sal_uInt32 getGlyph4(const sal_uInt8 *cmap, sal_uInt32 c) { } idDelta = startCode + segCount; idRangeOffset = idDelta + segCount; - glyphIndexArray = idRangeOffset + segCount; + /*glyphIndexArray = idRangeOffset + segCount;*/ if(Int16FromMOTA(idRangeOffset[i]) != 0) { c = Int16FromMOTA(*(&(idRangeOffset[i]) + (Int16FromMOTA(idRangeOffset[i])/2 + (c - Int16FromMOTA(startCode[i]))))); |