Author: hdu
Date: Fri May 17 11:59:34 2013
New Revision: 1483755
URL: http://svn.apache.org/r1483755
Log:
fix createFontSubset()'s glyphid type on some platforms
Modified:
openoffice/branches/rejuvenate01/main/vcl/inc/vcl/fontmanager.hxx
openoffice/branches/rejuvenate01/main/vcl/unx/generic/fontmanager/fontmanager.cxx
openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi3.cxx
Modified: openoffice/branches/rejuvenate01/main/vcl/inc/vcl/fontmanager.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/inc/vcl/fontmanager.hxx?rev=1483755&r1=1483754&r2=1483755&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/inc/vcl/fontmanager.hxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/inc/vcl/fontmanager.hxx Fri May
17 11:59:34 2013
@@ -643,7 +643,7 @@ public:
bool createFontSubset( FontSubsetInfo&,
fontID nFont,
const rtl::OUString& rOutFile,
- sal_Int32* pGlyphIDs,
+ sal_uInt32* pGlyphIDs,
sal_uInt8* pNewEncoding,
sal_Int32* pWidths,
int nGlyphs,
Modified:
openoffice/branches/rejuvenate01/main/vcl/unx/generic/fontmanager/fontmanager.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/generic/fontmanager/fontmanager.cxx?rev=1483755&r1=1483754&r2=1483755&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/vcl/unx/generic/fontmanager/fontmanager.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/vcl/unx/generic/fontmanager/fontmanager.cxx
Fri May 17 11:59:34 2013
@@ -3700,7 +3700,7 @@ bool PrintFontManager::createFontSubset(
{
rInfo.LoadFont( FontSubsetInfo::CFF_FONT, pCffBytes, nCffLength
);
#if 1 // TODO: remove 16bit->long conversion when related methods handle
non-16bit glyphids
- long aRequestedGlyphs[256];
+ sal_GlyphId aRequestedGlyphs[256];
for( int i = 0; i < nGlyphs; ++i )
aRequestedGlyphs[i] = pGID[i];
#endif
Modified: openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi3.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi3.cxx?rev=1483755&r1=1483754&r2=1483755&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi3.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/salgdi3.cxx Fri
May 17 11:59:34 2013
@@ -2701,7 +2701,7 @@ int ScopedTrueTypeFont::open(void * pBuf
}
sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData* pFont, long* pGlyphIDs, sal_uInt8* pEncoding,
+ const ImplFontData* pFont, sal_GlyphId* pGlyphIDs, sal_uInt8* pEncoding,
sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rInfo )
{
// TODO: use more of the central font-subsetting code, move stuff there if
needed
@@ -2744,7 +2744,7 @@ sal_Bool WinSalGraphics::CreateFontSubse
const ImplFontCharMap* pCharMap =
pWinFontData->GetImplFontCharMap();
pCharMap->AddReference();
- long nRealGlyphIds[ 256 ];
+ sal_GlyphId nRealGlyphIds[ 256 ];
for( int i = 0; i < nGlyphCount; ++i )
{
// TODO: remap notdef glyph if needed
