summaryrefslogtreecommitdiff
path: root/vcl/source/fontsubset/cff.cxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-02-26 18:29:17 +1100
committerCaolán McNamara <caolanm@redhat.com>2014-02-26 05:48:00 -0600
commit81afed113d2f49c600eb2c8d3827ff8cbd83139f (patch)
tree822c6131a00a0facbe417ecba52fd075bb32e2a1 /vcl/source/fontsubset/cff.cxx
parent3edcdd43f94e605c08314ab61f64c418b01f8dde (diff)
Removed unnecessary comment decorations from VCL sources
Conflicts: vcl/headless/svpgdi.cxx vcl/source/app/dbggui.cxx vcl/source/app/help.cxx vcl/source/app/idlemgr.cxx vcl/source/app/settings.cxx vcl/source/app/stdtext.cxx vcl/source/app/svdata.cxx vcl/source/app/svmain.cxx vcl/source/control/fixed.cxx vcl/source/control/ilstbox.cxx vcl/source/control/spinbtn.cxx vcl/source/filter/sgfbram.cxx vcl/source/filter/sgvmain.cxx vcl/source/filter/sgvtext.cxx vcl/source/filter/wmf/emfwr.hxx vcl/source/filter/wmf/winmtf.hxx vcl/source/filter/wmf/wmfwr.hxx vcl/source/fontsubset/cff.cxx vcl/source/fontsubset/fontsubset.cxx vcl/source/fontsubset/xlat.cxx Change-Id: Ifc4fa21e552a8b031645eb883bdc23563eebb602 Reviewed-on: https://gerrit.libreoffice.org/8357 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/fontsubset/cff.cxx')
-rw-r--r--vcl/source/fontsubset/cff.cxx106
1 files changed, 0 insertions, 106 deletions
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index b1411ac27e7d..bfcf0780d51c 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -39,8 +39,6 @@ typedef RealType ValType;
#include <vector>
typedef std::vector<ValType> ValVector;
-
-
static const char* pStringIds[] = {
/*0*/ ".notdef", "space", "exclam", "quotedbl",
"numbersign", "dollar", "percent", "ampersand",
@@ -142,10 +140,6 @@ static const char* pStringIds[] = {
"Regular", "Roman", "Semibold"
};
-
-
-
-
// TOP DICT keywords (also covers PRIV DICT keywords)
static const char* pDictOps[] = {
"sVersion", "sNotice", "sFullName", "sFamilyName",
@@ -158,8 +152,6 @@ static const char* pDictOps[] = {
"shortint", "longint", "BCD", NULL
};
-
-
// TOP DICT escapes (also covers PRIV DICT escapes)
static const char* pDictEscs[] = {
"sCopyright", "bIsFixedPitch", "nItalicAngle", "nUnderlinePosition",
@@ -174,8 +166,6 @@ static const char* pDictEscs[] = {
"nFDArray", "nFDSelect", "sFontName"
};
-
-
static const char* pType1Ops[] = {
NULL, "2hstem", NULL, "2vstem",
"1vmoveto", "Arlineto", "1hlineto", "1vlineto",
@@ -187,8 +177,6 @@ static const char* pType1Ops[] = {
NULL, NULL, "4vhcurveto", "4hvcurveto"
};
-
-
static const char* pT1EscOps[] = {
"0dotsection", "6vstem3", "6hstem3", NULL,
NULL, NULL, "5seac", "4sbw",
@@ -201,8 +189,6 @@ static const char* pT1EscOps[] = {
NULL, "2setcurrentpoint"
};
-
-
struct TYPE1OP
{
enum OPS
@@ -222,8 +208,6 @@ struct TYPE1OP
};
};
-
-
static const char* pType2Ops[] = {
NULL, "hhstem", NULL, "vvstem",
"mvmoveto", "Arlineto", "Ehlineto", "Evlineto",
@@ -235,8 +219,6 @@ static const char* pType2Ops[] = {
".shortint", "Gcallgsubr", ".vhcurveto", ".hvcurveto"
};
-
-
static const char* pT2EscOps[] = {
NULL, NULL, NULL, "2and",
"2or", "1not", NULL, NULL,
@@ -250,8 +232,6 @@ static const char* pT2EscOps[] = {
"9hflex1", "fflex1"
};
-
-
struct TYPE2OP
{
enum OPS
@@ -276,8 +256,6 @@ struct TYPE2OP
};
};
-
-
struct CffGlobal
{
explicit CffGlobal();
@@ -306,8 +284,6 @@ struct CffGlobal
int mnFamilyNameSID;
};
-
-
struct CffLocal
{
explicit CffLocal();
@@ -339,8 +315,6 @@ struct CffLocal
bool mbForceBold;
};
-
-
class SubsetterContext
{
public:
@@ -355,8 +329,6 @@ public:
SubsetterContext::~SubsetterContext( void)
{}
-
-
class CffSubsetterContext
: public SubsetterContext
, private CffGlobal
@@ -568,8 +540,6 @@ void CffSubsetterContext::addHints( bool bVerticalHints)
mnStackIdx = 0;
}
-
-
void CffSubsetterContext::setCharStringType( int nVal)
{
switch( nVal) {
@@ -579,8 +549,6 @@ void CffSubsetterContext::setCharStringType( int nVal)
}
}
-
-
void CffSubsetterContext::readDictOp( void)
{
ValType nVal = 0;
@@ -718,8 +686,6 @@ void CffSubsetterContext::readDictOp( void)
}
}
-
-
void CffSubsetterContext::read2push()
{
ValType aVal = 0;
@@ -752,8 +718,6 @@ void CffSubsetterContext::read2push()
push( aVal);
}
-
-
void CffSubsetterContext::writeType1Val( ValType aVal)
{
U8* pOut = mpWritePtr;
@@ -789,31 +753,23 @@ void CffSubsetterContext::writeType1Val( ValType aVal)
mpWritePtr = pOut;
}
-
-
inline void CffSubsetterContext::pop2write( void)
{
const ValType aVal = popVal();
writeType1Val( aVal);
}
-
-
inline void CffSubsetterContext::writeTypeOp( int nTypeOp)
{
*(mpWritePtr++) = static_cast<U8>(nTypeOp);
}
-
-
inline void CffSubsetterContext::writeTypeEsc( int nTypeEsc)
{
*(mpWritePtr++) = TYPE1OP::T1ESC;
*(mpWritePtr++) = static_cast<U8>(nTypeEsc);
}
-
-
void CffSubsetterContext::pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTypeXor)
{
for( int i = 0; i < mnStackIdx;) {
@@ -828,8 +784,6 @@ void CffSubsetterContext::pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTy
clear();
}
-
-
void CffSubsetterContext::popAll2Write( int nTypeOp)
{
// pop in reverse order, then write
@@ -841,8 +795,6 @@ void CffSubsetterContext::popAll2Write( int nTypeOp)
writeTypeOp( nTypeOp);
}
-
-
void CffSubsetterContext::writeCurveTo( int nStackPos,
int nIX1, int nIY1, int nIX2, int nIY2, int nIX3, int nIY3)
{
@@ -866,8 +818,6 @@ void CffSubsetterContext::writeCurveTo( int nStackPos,
writeTypeOp( TYPE1OP::RCURVETO );
}
-
-
void CffSubsetterContext::convertOneTypeOp( void)
{
const int nType2Op = *(mpReadPtr++);
@@ -1093,8 +1043,6 @@ void CffSubsetterContext::convertOneTypeOp( void)
}
}
-
-
void CffSubsetterContext::convertOneTypeEsc( void)
{
const int nType2Esc = *(mpReadPtr++);
@@ -1276,8 +1224,6 @@ void CffSubsetterContext::convertOneTypeEsc( void)
}
}
-
-
void CffSubsetterContext::callType2Subr( bool bGlobal, int nSubrNumber)
{
const U8* const pOldReadPtr = mpReadPtr;
@@ -1298,8 +1244,6 @@ void CffSubsetterContext::callType2Subr( bool bGlobal, int nSubrNumber)
mpReadEnd = pOldReadEnd;
}
-
-
static const int MAX_T1OPS_SIZE = 81920; // TODO: use dynamic value
int CffSubsetterContext::convert2Type1Ops( CffLocal* pCffLocal, const U8* const pT2Ops, int nT2Len, U8* const pT1Ops)
@@ -1375,8 +1319,6 @@ if( mbSawError) {
return nType1Len;
}
-
-
RealType CffSubsetterContext::readRealVal()
{
// TODO: more thorough number validity test
@@ -1447,8 +1389,6 @@ RealType CffSubsetterContext::readRealVal()
return fReal;
}
-
-
// prepare to access an element inside a CFF/CID index table
int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex)
{
@@ -1488,8 +1428,6 @@ int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex)
return (nOfs2 - nOfs1);
}
-
-
// skip over a CFF/CID index table
void CffSubsetterContext::seekIndexEnd( int nIndexBase)
{
@@ -1514,8 +1452,6 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase)
assert( mpReadEnd <= mpBaseEnd);
}
-
-
// initialize FONTDICT specific values
CffLocal::CffLocal( void)
: mnPrivDictBase( 0)
@@ -1543,8 +1479,6 @@ CffLocal::CffLocal( void)
maFamilyOtherBlues.clear();
}
-
-
CffGlobal::CffGlobal( void)
: mnNameIdxBase( 0)
, mnNameIdxCount( 0)
@@ -1569,8 +1503,6 @@ CffGlobal::CffGlobal( void)
// TODO; maFontMatrix.clear();
}
-
-
void CffSubsetterContext::initialCffRead( void)
{
// get the CFFHeader
@@ -1672,8 +1604,6 @@ void CffSubsetterContext::initialCffRead( void)
// ignore the Notices info
}
-
-
// get a cstring from a StringID
const char* CffSubsetterContext::getString( int nStringID)
{
@@ -1706,8 +1636,6 @@ const char* CffSubsetterContext::getString( int nStringID)
return aNameBuf;
}
-
-
// access a CID's FDSelect table
int CffSubsetterContext::getFDSelect( int nGlyphIndex) const
{
@@ -1752,8 +1680,6 @@ int CffSubsetterContext::getFDSelect( int nGlyphIndex) const
return -1;
}
-
-
int CffSubsetterContext::getGlyphSID( int nGlyphIndex) const
{
if( nGlyphIndex == 0)
@@ -1801,8 +1727,6 @@ int CffSubsetterContext::getGlyphSID( int nGlyphIndex) const
return nSID;
}
-
-
// NOTE: the result becomes invalid with the next call to this method
const char* CffSubsetterContext::getGlyphName( int nGlyphIndex)
{
@@ -1839,8 +1763,6 @@ const char* CffSubsetterContext::getGlyphName( int nGlyphIndex)
return pGlyphName;
}
-
-
class Type1Emitter
{
public:
@@ -1868,8 +1790,6 @@ public:
int mnHexLineCol;
};
-
-
Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset)
: mpFileOut( pOutFile)
, mbCloseOutfile( false)
@@ -1881,8 +1801,6 @@ Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset)
maSubsetName[0] = '\0';
}
-
-
Type1Emitter::~Type1Emitter( void)
{
if( !mpFileOut)
@@ -1892,8 +1810,6 @@ Type1Emitter::~Type1Emitter( void)
mpFileOut = NULL;
}
-
-
void Type1Emitter::setSubsetName( const char* pSubsetName)
{
maSubsetName[0] = '\0';
@@ -1902,16 +1818,12 @@ void Type1Emitter::setSubsetName( const char* pSubsetName)
maSubsetName[sizeof(maSubsetName)-1] = '\0';
}
-
-
int Type1Emitter::tellPos( void) const
{
int nTellPos = ftell( mpFileOut);
return nTellPos;
}
-
-
size_t Type1Emitter::updateLen( int nTellPos, size_t nLength)
{
// update PFB segment header length
@@ -1928,15 +1840,11 @@ size_t Type1Emitter::updateLen( int nTellPos, size_t nLength)
return nWrote;
}
-
-
inline size_t Type1Emitter::emitRawData(const char* pData, size_t nLength) const
{
return fwrite( pData, 1, nLength, mpFileOut);
}
-
-
inline void Type1Emitter::emitAllRaw( void)
{
// writeout raw data
@@ -1946,8 +1854,6 @@ inline void Type1Emitter::emitAllRaw( void)
mpPtr = maBuffer;
}
-
-
inline void Type1Emitter::emitAllHex( void)
{
assert( (mpPtr - maBuffer) < (int)sizeof(maBuffer));
@@ -1974,8 +1880,6 @@ inline void Type1Emitter::emitAllHex( void)
mpPtr = maBuffer;
}
-
-
void Type1Emitter::emitAllCrypted( void)
{
// apply t1crypt
@@ -1991,8 +1895,6 @@ void Type1Emitter::emitAllCrypted( void)
emitAllHex();
}
-
-
// #i110387# quick-and-dirty double->ascii conversion
// needed because sprintf/ecvt/etc. alone are too localized (LC_NUMERIC)
// also strip off trailing zeros in fraction while we are at it
@@ -2002,8 +1904,6 @@ inline int dbl2str( char* pOut, double fVal, int nPrecision=6)
return nLen;
}
-
-
void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
const ValVector& rVector)
{
@@ -2028,8 +1928,6 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
mpPtr += sprintf( mpPtr, "%s", pLineTail);
}
-
-
bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
const sal_GlyphId* pReqGlyphIds, const U8* pReqEncoding,
GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rFSInfo)
@@ -2335,8 +2233,6 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
return true;
}
-
-
bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths )
{
CffSubsetterContext aCff( mpInFontBytes, mnInByteLength);
@@ -2353,6 +2249,4 @@ bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths )
return bRC;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */