ICU-4288 declare iinline methods as inline.

X-SVN-Rev: 17259
This commit is contained in:
Eric Mader 2005-02-26 00:40:09 +00:00
parent a715e415bd
commit 65675a2e42
6 changed files with 90 additions and 83 deletions

View File

@ -1,6 +1,6 @@
/* /*
* *
* (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved * (C) Copyright IBM Corp. 1998-2005 - All Rights Reserved
* *
*/ */
@ -27,7 +27,8 @@ struct AttachmentPositioningSubtable : GlyphPositioningSubtable
Offset markArrayOffset; Offset markArrayOffset;
Offset baseArrayOffset; Offset baseArrayOffset;
le_int32 getBaseCoverage(LEGlyphID baseGlyphId) const; inline le_int32 getBaseCoverage(LEGlyphID baseGlyphId) const;
le_uint32 process(GlyphIterator *glyphIterator) const; le_uint32 process(GlyphIterator *glyphIterator) const;
}; };

View File

@ -26,28 +26,28 @@ private:
class Adjustment : public UMemory { class Adjustment : public UMemory {
public: public:
Adjustment(); inline Adjustment();
Adjustment(float xPlace, float yPlace, float xAdv, float yAdv, le_int32 baseOff = -1); inline Adjustment(float xPlace, float yPlace, float xAdv, float yAdv, le_int32 baseOff = -1);
~Adjustment(); inline ~Adjustment();
float getXPlacement() const; inline float getXPlacement() const;
float getYPlacement() const; inline float getYPlacement() const;
float getXAdvance() const; inline float getXAdvance() const;
float getYAdvance() const; inline float getYAdvance() const;
le_int32 getBaseOffset() const; inline le_int32 getBaseOffset() const;
void setXPlacement(float newXPlacement); inline void setXPlacement(float newXPlacement);
void setYPlacement(float newYPlacement); inline void setYPlacement(float newYPlacement);
void setXAdvance(float newXAdvance); inline void setXAdvance(float newXAdvance);
void setYAdvance(float newYAdvance); inline void setYAdvance(float newYAdvance);
void setBaseOffset(le_int32 newBaseOffset); inline void setBaseOffset(le_int32 newBaseOffset);
void adjustXPlacement(float xAdjustment); inline void adjustXPlacement(float xAdjustment);
void adjustYPlacement(float yAdjustment); inline void adjustYPlacement(float yAdjustment);
void adjustXAdvance(float xAdjustment); inline void adjustXAdvance(float xAdjustment);
void adjustYAdvance(float yAdjustment); inline void adjustYAdvance(float yAdjustment);
private: private:
float xPlacement; float xPlacement;
@ -58,22 +58,23 @@ private:
le_int32 baseOffset; le_int32 baseOffset;
// allow copying of this class because all of its fields are simple types // allow copying of this class because all of its fields are simple types
}; };
class EntryExitPoint : public UMemory class EntryExitPoint : public UMemory
{ {
public: public:
EntryExitPoint(); inline EntryExitPoint();
~EntryExitPoint(); inline ~EntryExitPoint();
inline le_bool isCursiveGlyph() const;
inline le_bool baselineIsLogicalEnd() const;
le_bool isCursiveGlyph() const;
le_bool baselineIsLogicalEnd() const;
LEPoint *getEntryPoint(LEPoint &entryPoint) const; LEPoint *getEntryPoint(LEPoint &entryPoint) const;
LEPoint *getExitPoint(LEPoint &exitPoint) const; LEPoint *getExitPoint(LEPoint &exitPoint) const;
void setEntryPoint(LEPoint &newEntryPoint, le_bool baselineIsLogicalEnd); inline void setEntryPoint(LEPoint &newEntryPoint, le_bool baselineIsLogicalEnd);
void setExitPoint(LEPoint &newExitPoint, le_bool baselineIsLogicalEnd); inline void setExitPoint(LEPoint &newExitPoint, le_bool baselineIsLogicalEnd);
void setCursiveGlyph(le_bool baselineIsLogicalEnd); inline void setCursiveGlyph(le_bool baselineIsLogicalEnd);
private: private:
enum EntryExitFlags enum EntryExitFlags
@ -99,31 +100,31 @@ public:
GlyphPositionAdjustments(le_int32 glyphCount); GlyphPositionAdjustments(le_int32 glyphCount);
~GlyphPositionAdjustments(); ~GlyphPositionAdjustments();
le_bool hasCursiveGlyphs() const; inline le_bool hasCursiveGlyphs() const;
le_bool isCursiveGlyph(le_int32 index) const; inline le_bool isCursiveGlyph(le_int32 index) const;
le_bool baselineIsLogicalEnd(le_int32 index) const; inline le_bool baselineIsLogicalEnd(le_int32 index) const;
const LEPoint *getEntryPoint(le_int32 index, LEPoint &entryPoint) const; const LEPoint *getEntryPoint(le_int32 index, LEPoint &entryPoint) const;
const LEPoint *getExitPoint(le_int32 index, LEPoint &exitPoint) const; const LEPoint *getExitPoint(le_int32 index, LEPoint &exitPoint) const;
float getXPlacement(le_int32 index) const; inline float getXPlacement(le_int32 index) const;
float getYPlacement(le_int32 index) const; inline float getYPlacement(le_int32 index) const;
float getXAdvance(le_int32 index) const; inline float getXAdvance(le_int32 index) const;
float getYAdvance(le_int32 index) const; inline float getYAdvance(le_int32 index) const;
le_int32 getBaseOffset(le_int32 index) const; inline le_int32 getBaseOffset(le_int32 index) const;
void setXPlacement(le_int32 index, float newXPlacement); inline void setXPlacement(le_int32 index, float newXPlacement);
void setYPlacement(le_int32 index, float newYPlacement); inline void setYPlacement(le_int32 index, float newYPlacement);
void setXAdvance(le_int32 index, float newXAdvance); inline void setXAdvance(le_int32 index, float newXAdvance);
void setYAdvance(le_int32 index, float newYAdvance); inline void setYAdvance(le_int32 index, float newYAdvance);
void setBaseOffset(le_int32 index, le_int32 newBaseOffset); inline void setBaseOffset(le_int32 index, le_int32 newBaseOffset);
void adjustXPlacement(le_int32 index, float xAdjustment); inline void adjustXPlacement(le_int32 index, float xAdjustment);
void adjustYPlacement(le_int32 index, float yAdjustment); inline void adjustYPlacement(le_int32 index, float yAdjustment);
void adjustXAdvance(le_int32 index, float xAdjustment); inline void adjustXAdvance(le_int32 index, float xAdjustment);
void adjustYAdvance(le_int32 index, float yAdjustment); inline void adjustYAdvance(le_int32 index, float yAdjustment);
void setEntryPoint(le_int32 index, LEPoint &newEntryPoint, le_bool baselineIsLogicalEnd); void setEntryPoint(le_int32 index, LEPoint &newEntryPoint, le_bool baselineIsLogicalEnd);
void setExitPoint(le_int32 index, LEPoint &newExitPoint, le_bool baselineIsLogicalEnd); void setExitPoint(le_int32 index, LEPoint &newExitPoint, le_bool baselineIsLogicalEnd);

View File

@ -1,6 +1,6 @@
/* /*
* *
* (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved * (C) Copyright IBM Corp. 1998-2005 - All Rights Reserved
* *
*/ */
@ -94,38 +94,39 @@ struct IndicClassTable
const CharClass *classTable; const CharClass *classTable;
const SplitMatra *splitMatraTable; const SplitMatra *splitMatraTable;
le_int32 getWorstCaseExpansion() const; inline le_int32 getWorstCaseExpansion() const;
CharClass getCharClass(LEUnicode ch) const; CharClass getCharClass(LEUnicode ch) const;
const SplitMatra *getSplitMatra(CharClass charClass) const;
le_bool isVowelModifier(LEUnicode ch) const; inline const SplitMatra *getSplitMatra(CharClass charClass) const;
le_bool isStressMark(LEUnicode ch) const;
le_bool isConsonant(LEUnicode ch) const;
le_bool isReph(LEUnicode ch) const;
le_bool isVirama(LEUnicode ch) const;
le_bool isNukta(LEUnicode ch) const;
le_bool isVattu(LEUnicode ch) const;
le_bool isMatra(LEUnicode ch) const;
le_bool isSplitMatra(LEUnicode ch) const;
le_bool isLengthMark(LEUnicode ch) const;
le_bool hasPostOrBelowBaseForm(LEUnicode ch) const;
le_bool hasPostBaseForm(LEUnicode ch) const;
le_bool hasBelowBaseForm(LEUnicode ch) const;
static le_bool isVowelModifier(CharClass charClass); inline le_bool isVowelModifier(LEUnicode ch) const;
static le_bool isStressMark(CharClass charClass); inline le_bool isStressMark(LEUnicode ch) const;
static le_bool isConsonant(CharClass charClass); inline le_bool isConsonant(LEUnicode ch) const;
static le_bool isReph(CharClass charClass); inline le_bool isReph(LEUnicode ch) const;
static le_bool isVirama(CharClass charClass); inline le_bool isVirama(LEUnicode ch) const;
static le_bool isNukta(CharClass charClass); inline le_bool isNukta(LEUnicode ch) const;
static le_bool isVattu(CharClass charClass); inline le_bool isVattu(LEUnicode ch) const;
static le_bool isMatra(CharClass charClass); inline le_bool isMatra(LEUnicode ch) const;
static le_bool isSplitMatra(CharClass charClass); inline le_bool isSplitMatra(LEUnicode ch) const;
static le_bool isLengthMark(CharClass charClass); inline le_bool isLengthMark(LEUnicode ch) const;
static le_bool hasPostOrBelowBaseForm(CharClass charClass); inline le_bool hasPostOrBelowBaseForm(LEUnicode ch) const;
static le_bool hasPostBaseForm(CharClass charClass); inline le_bool hasPostBaseForm(LEUnicode ch) const;
static le_bool hasBelowBaseForm(CharClass charClass); inline le_bool hasBelowBaseForm(LEUnicode ch) const;
inline static le_bool isVowelModifier(CharClass charClass);
inline static le_bool isStressMark(CharClass charClass);
inline static le_bool isConsonant(CharClass charClass);
inline static le_bool isReph(CharClass charClass);
inline static le_bool isVirama(CharClass charClass);
inline static le_bool isNukta(CharClass charClass);
inline static le_bool isVattu(CharClass charClass);
inline static le_bool isMatra(CharClass charClass);
inline static le_bool isSplitMatra(CharClass charClass);
inline static le_bool isLengthMark(CharClass charClass);
inline static le_bool hasPostOrBelowBaseForm(CharClass charClass);
inline static le_bool hasPostBaseForm(CharClass charClass);
inline static le_bool hasBelowBaseForm(CharClass charClass);
static const IndicClassTable *getScriptClassTable(le_int32 scriptCode); static const IndicClassTable *getScriptClassTable(le_int32 scriptCode);
}; };

View File

@ -1,6 +1,6 @@
/* /*
********************************************************************** **********************************************************************
* Copyright (C) 1998-2004, International Business Machines * Copyright (C) 1998-2005, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
********************************************************************** **********************************************************************
*/ */
@ -125,10 +125,7 @@ public:
* *
* @draft ICU 3.0 * @draft ICU 3.0
*/ */
le_int32 getGlyphCount() const inline le_int32 getGlyphCount() const;
{
return fGlyphCount;
};
/** /**
* This method copies the glyph array into a caller supplied array. * This method copies the glyph array into a caller supplied array.
@ -304,7 +301,7 @@ public:
* *
* @draft ICU 3.0 * @draft ICU 3.0
*/ */
LEGlyphID &operator[](le_int32 glyphIndex) const; inline LEGlyphID &operator[](le_int32 glyphIndex) const;
/** /**
* Call this method to replace a single glyph in the glyph array * Call this method to replace a single glyph in the glyph array
@ -488,6 +485,11 @@ public:
static UClassID getStaticClassID(); static UClassID getStaticClassID();
}; };
inline le_int32 LEGlyphStorage::getGlyphCount() const
{
return fGlyphCount;
}
inline LEGlyphID &LEGlyphStorage::operator[](le_int32 glyphIndex) const inline LEGlyphID &LEGlyphStorage::operator[](le_int32 glyphIndex) const
{ {
return fGlyphs[glyphIndex]; return fGlyphs[glyphIndex];

View File

@ -1,6 +1,6 @@
/* /*
* *
* (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved * (C) Copyright IBM Corp. 1998-2005 - All Rights Reserved
* *
*/ */
@ -33,7 +33,8 @@ struct LookupSubtable
le_uint16 subtableFormat; le_uint16 subtableFormat;
Offset coverageTableOffset; Offset coverageTableOffset;
le_int32 getGlyphCoverage(LEGlyphID glyphID) const; inline le_int32 getGlyphCoverage(LEGlyphID glyphID) const;
le_int32 getGlyphCoverage(Offset tableOffset, LEGlyphID glyphID) const; le_int32 getGlyphCoverage(Offset tableOffset, LEGlyphID glyphID) const;
}; };

View File

@ -1,6 +1,6 @@
/* /*
* *
* (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved * (C) Copyright IBM Corp. 1998-2005 - All Rights Reserved
* *
*/ */
@ -77,7 +77,8 @@ private:
static const le_uint8 classTable[]; static const le_uint8 classTable[];
static const StateTransition thaiStateTable[][classCount]; static const StateTransition thaiStateTable[][classCount];
static StateTransition getTransition(le_uint8 state, le_uint8 currClass); inline static StateTransition getTransition(le_uint8 state, le_uint8 currClass);
static le_uint8 doTransition(StateTransition transition, LEUnicode currChar, le_int32 inputIndex, le_uint8 glyphSet, static le_uint8 doTransition(StateTransition transition, LEUnicode currChar, le_int32 inputIndex, le_uint8 glyphSet,
LEUnicode errorChar, LEUnicode *outputBuffer, LEGlyphStorage &glyphStorage, le_int32 &outputIndex); LEUnicode errorChar, LEUnicode *outputBuffer, LEGlyphStorage &glyphStorage, le_int32 &outputIndex);