vcl/quartz/salgdicommon.cxx | 8 -------- 1 file changed, 8 deletions(-)
New commits: commit 57248316be882c65eb6431cbba2ad4f971d86c95 Author: Tor Lillqvist <[email protected]> Date: Wed Jan 8 15:14:32 2014 +0200 Fix compilation error for 64-bit OS X by simplifying code The ifdef for __LP64__ is not needed as far as I can see. Fixes error: cannot initialize a parameter of type 'const sal_GlyphId *' (aka 'const unsigned int *') with an lvalue of type 'long *'. Change-Id: I89d3ba29a5cfd1a89141ec86c873eaf384cf446e diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 26d4d3d..cc45334 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -173,16 +173,8 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile, // make the subsetter provide the requested subset FILE* pOutFile = fopen( aToFile.getStr(), "wb" ); -#ifdef __LP64__ - long *pLongGlyphIDs = (long*)alloca(nGlyphCount * sizeof(long)); - for (int i = 0; i < nGlyphCount; i++) - pLongGlyphIDs[i] = pGlyphIds[i]; - bool bRC = rInfo.CreateFontSubset( FontSubsetInfo::TYPE1_PFB, pOutFile, NULL, - pLongGlyphIDs, pEncoding, nGlyphCount, pGlyphWidths ); -#else bool bRC = rInfo.CreateFontSubset( FontSubsetInfo::TYPE1_PFB, pOutFile, NULL, pGlyphIds, pEncoding, nGlyphCount, pGlyphWidths ); -#endif fclose( pOutFile ); return bRC; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
