minor style fix, use void in methods on no argument
diff --git a/src/hb-aat-fdsc-table.hh b/src/hb-aat-fdsc-table.hh
index c3bc1d5..a7458b9 100644
--- a/src/hb-aat-fdsc-table.hh
+++ b/src/hb-aat-fdsc-table.hh
@@ -40,11 +40,11 @@
struct FontDescriptor
{
- inline bool has_data () const { return tag; }
+ inline bool has_data (void) const { return tag; }
inline int cmp (hb_tag_t a) const { return tag.cmp (a); }
- inline float get_value () const { return u.value.to_float (); }
+ inline float get_value (void) const { return u.value.to_float (); }
enum non_alphabetic_value_t {
Alphabetic = 0,
diff --git a/src/hb-aat-layout-common.hh b/src/hb-aat-layout-common.hh
index 74c70de..5be0f6f 100644
--- a/src/hb-aat-layout-common.hh
+++ b/src/hb-aat-layout-common.hh
@@ -513,10 +513,8 @@
return (this+classTable).get_class (glyph_id, num_glyphs, 1);
}
- inline const Entry<Extra> *get_entries () const
- {
- return (this+entryTable).arrayZ;
- }
+ inline const Entry<Extra> *get_entries (void) const
+ { return (this+entryTable).arrayZ; }
inline const Entry<Extra> *get_entryZ (int state, unsigned int klass) const
{
diff --git a/src/hb-aat-layout-feat-table.hh b/src/hb-aat-layout-feat-table.hh
index 1565d43..30d5686 100644
--- a/src/hb-aat-layout-feat-table.hh
+++ b/src/hb-aat-layout-feat-table.hh
@@ -125,10 +125,10 @@
return settings_table.len;
}
- inline hb_aat_layout_feature_type_t get_feature_type () const
+ inline hb_aat_layout_feature_type_t get_feature_type (void) const
{ return (hb_aat_layout_feature_type_t) (unsigned int) feature; }
- inline hb_ot_name_id_t get_feature_name_id () const { return nameIndex; }
+ inline hb_ot_name_id_t get_feature_name_id (void) const { return nameIndex; }
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
{
diff --git a/src/hb-aat-layout-trak-table.hh b/src/hb-aat-layout-trak-table.hh
index 1658e0f..62215a4 100644
--- a/src/hb-aat-layout-trak-table.hh
+++ b/src/hb-aat-layout-trak-table.hh
@@ -46,25 +46,19 @@
{
friend struct TrackData;
- inline float get_track_value () const
- {
- return track.to_float ();
- }
+ inline float get_track_value (void) const { return track.to_float (); }
- inline int get_value (const void *base,
- unsigned int index,
- unsigned int nSizes) const
- {
- return (base+valuesZ).as_array (nSizes)[index];
- }
+ inline int get_value (const void *base, unsigned int index,
+ unsigned int table_size) const
+ { return (base+valuesZ).as_array (table_size)[index]; }
public:
inline bool sanitize (hb_sanitize_context_t *c, const void *base,
- unsigned int nSizes) const
+ unsigned int table_size) const
{
TRACE_SANITIZE (this);
return_trace (likely (c->check_struct (this) &&
- (valuesZ.sanitize (c, base, nSizes))));
+ (valuesZ.sanitize (c, base, table_size))));
}
protected:
diff --git a/src/hb-aat-layout.cc b/src/hb-aat-layout.cc
index 08afa5d..a59ad08 100644
--- a/src/hb-aat-layout.cc
+++ b/src/hb-aat-layout.cc
@@ -361,7 +361,9 @@
hb_ot_name_id_t
hb_aat_layout_feature_type_get_name_id (hb_face_t *face,
hb_aat_layout_feature_type_t feature_type)
-{ return face->table.feat->get_feature_name_id (feature_type); }
+{
+ return face->table.feat->get_feature_name_id (feature_type);
+}
/**
* hb_aat_layout_feature_type_get_selectors:
diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc
index 1a5547b..3266c57 100644
--- a/src/hb-buffer.cc
+++ b/src/hb-buffer.cc
@@ -574,7 +574,7 @@
set_cluster (out_info[i], cluster);
}
void
-hb_buffer_t::delete_glyph ()
+hb_buffer_t::delete_glyph (void)
{
/* The logic here is duplicated in hb_ot_hide_default_ignorables(). */
@@ -727,7 +727,7 @@
/**
* hb_buffer_get_empty:
*
- *
+ *
*
* Return value: (transfer full):
*
@@ -785,14 +785,14 @@
/**
* hb_buffer_set_user_data: (skip)
* @buffer: an #hb_buffer_t.
- * @key:
- * @data:
- * @destroy:
- * @replace:
+ * @key:
+ * @data:
+ * @destroy:
+ * @replace:
*
- *
*
- * Return value:
+ *
+ * Return value:
*
* Since: 0.9.2
**/
@@ -809,11 +809,11 @@
/**
* hb_buffer_get_user_data: (skip)
* @buffer: an #hb_buffer_t.
- * @key:
+ * @key:
*
- *
*
- * Return value:
+ *
+ * Return value:
*
* Since: 0.9.2
**/
@@ -863,9 +863,9 @@
/**
* hb_buffer_set_unicode_funcs:
* @buffer: an #hb_buffer_t.
- * @unicode_funcs:
+ * @unicode_funcs:
*
- *
+ *
*
* Since: 0.9.2
**/
@@ -888,9 +888,9 @@
* hb_buffer_get_unicode_funcs:
* @buffer: an #hb_buffer_t.
*
- *
*
- * Return value:
+ *
+ * Return value:
*
* Since: 0.9.2
**/
@@ -1094,7 +1094,7 @@
*
* See hb_buffer_set_flags().
*
- * Return value:
+ * Return value:
* The @buffer flags.
*
* Since: 0.9.7
@@ -1108,9 +1108,9 @@
/**
* hb_buffer_set_cluster_level:
* @buffer: an #hb_buffer_t.
- * @cluster_level:
+ * @cluster_level:
*
- *
+ *
*
* Since: 0.9.42
**/
@@ -1128,9 +1128,9 @@
* hb_buffer_get_cluster_level:
* @buffer: an #hb_buffer_t.
*
- *
*
- * Return value:
+ *
+ * Return value:
*
* Since: 0.9.42
**/
@@ -1169,7 +1169,7 @@
*
* See hb_buffer_set_replacement_codepoint().
*
- * Return value:
+ * Return value:
* The @buffer replacement #hb_codepoint_t.
*
* Since: 0.9.31
@@ -1209,7 +1209,7 @@
*
* See hb_buffer_set_invisible_glyph().
*
- * Return value:
+ * Return value:
* The @buffer invisible #hb_codepoint_t.
*
* Since: 2.0.0
@@ -1320,7 +1320,7 @@
* Similar to hb_buffer_pre_allocate(), but clears any new items added at the
* end.
*
- * Return value:
+ * Return value:
* %true if @buffer memory allocation succeeded, %false otherwise.
*
* Since: 0.9.2
@@ -2000,7 +2000,7 @@
* @user_data:
* @destroy:
*
- *
+ *
*
* Since: 1.1.3
**/
diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc
index f9b2d26..c4b6e94 100644
--- a/src/hb-directwrite.cc
+++ b/src/hb-directwrite.cc
@@ -35,9 +35,9 @@
* to override malloc/free, we will redefine new/delete so users
* won't need to do that by their own.
*/
-void* operator new (size_t size) { return malloc (size); }
-void* operator new [] (size_t size) { return malloc (size); }
-void operator delete (void* pointer) { free (pointer); }
+void* operator new (size_t size) { return malloc (size); }
+void* operator new [] (size_t size) { return malloc (size); }
+void operator delete (void* pointer) { free (pointer); }
void operator delete [] (void* pointer) { free (pointer); }
@@ -54,19 +54,19 @@
IDWriteFontFileStream *mFontFileStream;
public:
DWriteFontFileLoader (IDWriteFontFileStream *fontFileStream)
- {
- mFontFileStream = fontFileStream;
- }
+ { mFontFileStream = fontFileStream; }
// IUnknown interface
- IFACEMETHOD (QueryInterface) (IID const& iid, OUT void** ppObject) { return S_OK; }
- IFACEMETHOD_ (ULONG, AddRef) () { return 1; }
- IFACEMETHOD_ (ULONG, Release) () { return 1; }
+ IFACEMETHOD (QueryInterface) (IID const& iid, OUT void** ppObject)
+ { return S_OK; }
+ IFACEMETHOD_ (ULONG, AddRef) (void) { return 1; }
+ IFACEMETHOD_ (ULONG, Release) (void) { return 1; }
// IDWriteFontFileLoader methods
- virtual HRESULT STDMETHODCALLTYPE CreateStreamFromKey (void const* fontFileReferenceKey,
- uint32_t fontFileReferenceKeySize,
- OUT IDWriteFontFileStream** fontFileStream)
+ virtual HRESULT STDMETHODCALLTYPE
+ CreateStreamFromKey (void const* fontFileReferenceKey,
+ uint32_t fontFileReferenceKeySize,
+ OUT IDWriteFontFileStream** fontFileStream)
{
*fontFileStream = mFontFileStream;
return S_OK;
@@ -86,19 +86,20 @@
}
// IUnknown interface
- IFACEMETHOD (QueryInterface) (IID const& iid, OUT void** ppObject) { return S_OK; }
- IFACEMETHOD_ (ULONG, AddRef) () { return 1; }
- IFACEMETHOD_ (ULONG, Release) () { return 1; }
+ IFACEMETHOD (QueryInterface) (IID const& iid, OUT void** ppObject)
+ { return S_OK; }
+ IFACEMETHOD_ (ULONG, AddRef) (void) { return 1; }
+ IFACEMETHOD_ (ULONG, Release) (void) { return 1; }
// IDWriteFontFileStream methods
- virtual HRESULT STDMETHODCALLTYPE ReadFileFragment (void const** fragmentStart,
- UINT64 fileOffset,
- UINT64 fragmentSize,
- OUT void** fragmentContext)
+ virtual HRESULT STDMETHODCALLTYPE
+ ReadFileFragment (void const** fragmentStart,
+ UINT64 fileOffset,
+ UINT64 fragmentSize,
+ OUT void** fragmentContext)
{
// We are required to do bounds checking.
- if (fileOffset + fragmentSize > mSize)
- return E_FAIL;
+ if (fileOffset + fragmentSize > mSize) return E_FAIL;
// truncate the 64 bit fileOffset to size_t sized index into mData
size_t index = static_cast<size_t> (fileOffset);
@@ -109,18 +110,18 @@
return S_OK;
}
- virtual void STDMETHODCALLTYPE ReleaseFileFragment (void* fragmentContext) { }
+ virtual void STDMETHODCALLTYPE
+ ReleaseFileFragment (void* fragmentContext) {}
- virtual HRESULT STDMETHODCALLTYPE GetFileSize (OUT UINT64* fileSize)
+ virtual HRESULT STDMETHODCALLTYPE
+ GetFileSize (OUT UINT64* fileSize)
{
*fileSize = mSize;
return S_OK;
}
- virtual HRESULT STDMETHODCALLTYPE GetLastWriteTime (OUT UINT64* lastWriteTime)
- {
- return E_NOTIMPL;
- }
+ virtual HRESULT STDMETHODCALLTYPE
+ GetLastWriteTime (OUT UINT64* lastWriteTime) { return E_NOTIMPL; }
};
@@ -147,17 +148,14 @@
// TODO: factory and fontFileLoader should be cached separately
IDWriteFactory* dwriteFactory;
- DWriteCreateFactory (
- DWRITE_FACTORY_TYPE_SHARED,
- __uuidof (IDWriteFactory),
- (IUnknown**) &dwriteFactory
- );
+ DWriteCreateFactory (DWRITE_FACTORY_TYPE_SHARED, __uuidof (IDWriteFactory),
+ (IUnknown**) &dwriteFactory);
HRESULT hr;
hb_blob_t *blob = hb_face_reference_blob (face);
- DWriteFontFileStream *fontFileStream = new DWriteFontFileStream (
- (uint8_t *) hb_blob_get_data (blob, nullptr),
- hb_blob_get_length (blob));
+ DWriteFontFileStream *fontFileStream;
+ fontFileStream = new DWriteFontFileStream ((uint8_t *) hb_blob_get_data (blob, nullptr),
+ hb_blob_get_length (blob));
DWriteFontFileLoader *fontFileLoader = new DWriteFontFileLoader (fontFileStream);
dwriteFactory->RegisterFontFileLoader (fontFileLoader);
@@ -165,7 +163,7 @@
IDWriteFontFile *fontFile;
uint64_t fontFileKey = 0;
hr = dwriteFactory->CreateCustomFontFileReference (&fontFileKey, sizeof (fontFileKey),
- fontFileLoader, &fontFile);
+ fontFileLoader, &fontFile);
#define FAIL(...) \
HB_STMT_START { \
@@ -188,7 +186,7 @@
IDWriteFontFace *fontFace;
dwriteFactory->CreateFontFace (faceType, 1, &fontFile, 0,
- DWRITE_FONT_SIMULATIONS_NONE, &fontFace);
+ DWRITE_FONT_SIMULATIONS_NONE, &fontFace);
data->dwriteFactory = dwriteFactory;
data->fontFile = fontFile;
@@ -228,9 +226,7 @@
* shaper font data
*/
-struct hb_directwrite_font_data_t
-{
-};
+struct hb_directwrite_font_data_t {};
hb_directwrite_font_data_t *
_hb_directwrite_shaper_font_data_create (hb_font_t *font)
@@ -251,14 +247,14 @@
// Most of TextAnalysis is originally written by Bas Schouten for Mozilla project
// but now is relicensed to MIT for HarfBuzz use
-class TextAnalysis
- : public IDWriteTextAnalysisSource, public IDWriteTextAnalysisSink
+class TextAnalysis : public IDWriteTextAnalysisSource, public IDWriteTextAnalysisSink
{
public:
- IFACEMETHOD (QueryInterface) (IID const& iid, OUT void** ppObject) { return S_OK; }
- IFACEMETHOD_ (ULONG, AddRef) () { return 1; }
- IFACEMETHOD_ (ULONG, Release) () { return 1; }
+ IFACEMETHOD (QueryInterface) (IID const& iid, OUT void** ppObject)
+ { return S_OK; }
+ IFACEMETHOD_ (ULONG, AddRef) (void) { return 1; }
+ IFACEMETHOD_ (ULONG, Release) (void) { return 1; }
// A single contiguous run of characters containing the same analysis
// results.
@@ -283,17 +279,11 @@
};
public:
- TextAnalysis (const wchar_t* text,
- uint32_t textLength,
- const wchar_t* localeName,
- DWRITE_READING_DIRECTION readingDirection)
- : mText (text)
- , mTextLength (textLength)
- , mLocaleName (localeName)
- , mReadingDirection (readingDirection)
- , mCurrentRun (nullptr) { };
-
- ~TextAnalysis ()
+ TextAnalysis (const wchar_t* text, uint32_t textLength,
+ const wchar_t* localeName, DWRITE_READING_DIRECTION readingDirection)
+ : mText (text), mTextLength (textLength), mLocaleName (localeName),
+ mReadingDirection (readingDirection), mCurrentRun (nullptr) {}
+ ~TextAnalysis (void)
{
// delete runs, except mRunHead which is part of the TextAnalysis object
for (Run *run = mRunHead.nextRun; run;)
@@ -304,8 +294,8 @@
}
}
- STDMETHODIMP GenerateResults (IDWriteTextAnalyzer* textAnalyzer,
- Run **runHead)
+ STDMETHODIMP
+ GenerateResults (IDWriteTextAnalyzer* textAnalyzer, Run **runHead)
{
// Analyzes the text using the script analyzer and returns
// the result as a series of runs.
@@ -330,9 +320,10 @@
// IDWriteTextAnalysisSource implementation
- IFACEMETHODIMP GetTextAtPosition (uint32_t textPosition,
- OUT wchar_t const** textString,
- OUT uint32_t* textLength)
+ IFACEMETHODIMP
+ GetTextAtPosition (uint32_t textPosition,
+ OUT wchar_t const** textString,
+ OUT uint32_t* textLength)
{
if (textPosition >= mTextLength)
{
@@ -348,9 +339,10 @@
return S_OK;
}
- IFACEMETHODIMP GetTextBeforePosition (uint32_t textPosition,
- OUT wchar_t const** textString,
- OUT uint32_t* textLength)
+ IFACEMETHODIMP
+ GetTextBeforePosition (uint32_t textPosition,
+ OUT wchar_t const** textString,
+ OUT uint32_t* textLength)
{
if (textPosition == 0 || textPosition > mTextLength)
{
@@ -368,19 +360,16 @@
}
IFACEMETHODIMP_ (DWRITE_READING_DIRECTION)
- GetParagraphReadingDirection () { return mReadingDirection; }
+ GetParagraphReadingDirection (void) { return mReadingDirection; }
- IFACEMETHODIMP GetLocaleName (uint32_t textPosition,
- uint32_t* textLength,
- wchar_t const** localeName)
- {
- return S_OK;
- }
+ IFACEMETHODIMP GetLocaleName (uint32_t textPosition, uint32_t* textLength,
+ wchar_t const** localeName)
+ { return S_OK; }
IFACEMETHODIMP
- GetNumberSubstitution (uint32_t textPosition,
- OUT uint32_t* textLength,
- OUT IDWriteNumberSubstitution** numberSubstitution)
+ GetNumberSubstitution (uint32_t textPosition,
+ OUT uint32_t* textLength,
+ OUT IDWriteNumberSubstitution** numberSubstitution)
{
// We do not support number substitution.
*numberSubstitution = nullptr;
@@ -392,9 +381,8 @@
// IDWriteTextAnalysisSink implementation
IFACEMETHODIMP
- SetScriptAnalysis (uint32_t textPosition,
- uint32_t textLength,
- DWRITE_SCRIPT_ANALYSIS const* scriptAnalysis)
+ SetScriptAnalysis (uint32_t textPosition, uint32_t textLength,
+ DWRITE_SCRIPT_ANALYSIS const* scriptAnalysis)
{
SetCurrentRun (textPosition);
SplitCurrentRun (textPosition);
@@ -408,19 +396,19 @@
}
IFACEMETHODIMP
- SetLineBreakpoints (uint32_t textPosition,
- uint32_t textLength,
- const DWRITE_LINE_BREAKPOINT* lineBreakpoints) { return S_OK; }
+ SetLineBreakpoints (uint32_t textPosition,
+ uint32_t textLength,
+ const DWRITE_LINE_BREAKPOINT* lineBreakpoints)
+ { return S_OK; }
- IFACEMETHODIMP SetBidiLevel (uint32_t textPosition,
- uint32_t textLength,
- uint8_t explicitLevel,
- uint8_t resolvedLevel) { return S_OK; }
+ IFACEMETHODIMP SetBidiLevel (uint32_t textPosition, uint32_t textLength,
+ uint8_t explicitLevel, uint8_t resolvedLevel)
+ { return S_OK; }
IFACEMETHODIMP
- SetNumberSubstitution (uint32_t textPosition,
- uint32_t textLength,
- IDWriteNumberSubstitution* numberSubstitution) { return S_OK; }
+ SetNumberSubstitution (uint32_t textPosition, uint32_t textLength,
+ IDWriteNumberSubstitution* numberSubstitution)
+ { return S_OK; }
protected:
Run *FetchNextRun (IN OUT uint32_t* textLength)
@@ -520,11 +508,11 @@
static hb_bool_t
_hb_directwrite_shape_full (hb_shape_plan_t *shape_plan,
- hb_font_t *font,
- hb_buffer_t *buffer,
- const hb_feature_t *features,
- unsigned int num_features,
- float lineWidth)
+ hb_font_t *font,
+ hb_buffer_t *buffer,
+ const hb_feature_t *features,
+ unsigned int num_features,
+ float lineWidth)
{
hb_face_t *face = font->face;
const hb_directwrite_face_data_t *face_data = face->data.directwrite;
@@ -580,9 +568,10 @@
// TODO: Handle TEST_DISABLE_OPTIONAL_LIGATURES
- DWRITE_READING_DIRECTION readingDirection = buffer->props.direction ?
- DWRITE_READING_DIRECTION_RIGHT_TO_LEFT :
- DWRITE_READING_DIRECTION_LEFT_TO_RIGHT;
+ DWRITE_READING_DIRECTION readingDirection;
+ readingDirection = buffer->props.direction ?
+ DWRITE_READING_DIRECTION_RIGHT_TO_LEFT :
+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT;
/*
* There's an internal 16-bit limit on some things inside the analyzer,
@@ -611,10 +600,8 @@
const wchar_t localeName[20] = {0};
if (buffer->props.language != nullptr)
- {
mbstowcs ((wchar_t*) localeName,
- hb_language_to_string (buffer->props.language), 20);
- }
+ hb_language_to_string (buffer->props.language), 20);
// TODO: it does work but doesn't care about ranges
DWRITE_TYPOGRAPHIC_FEATURES typographic_features;
@@ -625,27 +612,29 @@
for (unsigned int i = 0; i < num_features; ++i)
{
typographic_features.features[i].nameTag = (DWRITE_FONT_FEATURE_TAG)
- hb_uint32_swap (features[i].tag);
+ hb_uint32_swap (features[i].tag);
typographic_features.features[i].parameter = features[i].value;
}
}
- const DWRITE_TYPOGRAPHIC_FEATURES* dwFeatures =
- (const DWRITE_TYPOGRAPHIC_FEATURES*) &typographic_features;
+ const DWRITE_TYPOGRAPHIC_FEATURES* dwFeatures;
+ dwFeatures = (const DWRITE_TYPOGRAPHIC_FEATURES*) &typographic_features;
const uint32_t featureRangeLengths[] = { textLength };
//
- uint16_t* clusterMap = new uint16_t[textLength];
- DWRITE_SHAPING_TEXT_PROPERTIES* textProperties =
- new DWRITE_SHAPING_TEXT_PROPERTIES[textLength];
+ uint16_t* clusterMap;
+ clusterMap = new uint16_t[textLength];
+ DWRITE_SHAPING_TEXT_PROPERTIES* textProperties;
+ textProperties = new DWRITE_SHAPING_TEXT_PROPERTIES[textLength];
retry_getglyphs:
uint16_t* glyphIndices = new uint16_t[maxGlyphCount];
- DWRITE_SHAPING_GLYPH_PROPERTIES* glyphProperties =
- new DWRITE_SHAPING_GLYPH_PROPERTIES[maxGlyphCount];
+ DWRITE_SHAPING_GLYPH_PROPERTIES* glyphProperties;
+ glyphProperties = new DWRITE_SHAPING_GLYPH_PROPERTIES[maxGlyphCount];
hr = analyzer->GetGlyphs (textString, textLength, fontFace, false,
- isRightToLeft, &runHead->mScript, localeName, nullptr, &dwFeatures,
- featureRangeLengths, 1, maxGlyphCount, clusterMap, textProperties, glyphIndices,
- glyphProperties, &glyphCount);
+ isRightToLeft, &runHead->mScript, localeName,
+ nullptr, &dwFeatures, featureRangeLengths, 1,
+ maxGlyphCount, clusterMap, textProperties,
+ glyphIndices, glyphProperties, &glyphCount);
if (unlikely (hr == HRESULT_FROM_WIN32 (ERROR_INSUFFICIENT_BUFFER)))
{
@@ -665,30 +654,28 @@
/* The -2 in the following is to compensate for possible
* alignment needed after the WORD array. sizeof (WORD) == 2. */
unsigned int glyphs_size = (scratch_size * sizeof (int) - 2)
- / (sizeof (WORD) +
- sizeof (DWRITE_SHAPING_GLYPH_PROPERTIES) +
- sizeof (int) +
- sizeof (DWRITE_GLYPH_OFFSET) +
- sizeof (uint32_t));
+ / (sizeof (WORD) +
+ sizeof (DWRITE_SHAPING_GLYPH_PROPERTIES) +
+ sizeof (int) +
+ sizeof (DWRITE_GLYPH_OFFSET) +
+ sizeof (uint32_t));
ALLOCATE_ARRAY (uint32_t, vis_clusters, glyphs_size);
#undef ALLOCATE_ARRAY
int fontEmSize = font->face->get_upem ();
- if (fontEmSize < 0)
- fontEmSize = -fontEmSize;
+ if (fontEmSize < 0) fontEmSize = -fontEmSize;
- if (fontEmSize < 0)
- fontEmSize = -fontEmSize;
+ if (fontEmSize < 0) fontEmSize = -fontEmSize;
double x_mult = (double) font->x_scale / fontEmSize;
double y_mult = (double) font->y_scale / fontEmSize;
- hr = analyzer->GetGlyphPlacements (textString,
- clusterMap, textProperties, textLength, glyphIndices,
- glyphProperties, glyphCount, fontFace, fontEmSize,
- false, isRightToLeft, &runHead->mScript, localeName,
- &dwFeatures, featureRangeLengths, 1,
- glyphAdvances, glyphOffsets);
+ hr = analyzer->GetGlyphPlacements (textString, clusterMap, textProperties,
+ textLength, glyphIndices, glyphProperties,
+ glyphCount, fontFace, fontEmSize,
+ false, isRightToLeft, &runHead->mScript, localeName,
+ &dwFeatures, featureRangeLengths, 1,
+ glyphAdvances, glyphOffsets);
if (FAILED (hr))
FAIL ("Analyzer failed to get glyph placements.");
@@ -698,12 +685,12 @@
if (analyzer1 && lineWidth)
{
-
DWRITE_JUSTIFICATION_OPPORTUNITY* justificationOpportunities =
new DWRITE_JUSTIFICATION_OPPORTUNITY[maxGlyphCount];
- hr = analyzer1->GetJustificationOpportunities (fontFace, fontEmSize,
- runHead->mScript, textLength, glyphCount, textString, clusterMap,
- glyphProperties, justificationOpportunities);
+ hr = analyzer1->GetJustificationOpportunities (fontFace, fontEmSize, runHead->mScript,
+ textLength, glyphCount, textString,
+ clusterMap, glyphProperties,
+ justificationOpportunities);
if (FAILED (hr))
FAIL ("Analyzer failed to get justification opportunities.");
@@ -711,15 +698,14 @@
float* justifiedGlyphAdvances = new float[maxGlyphCount];
DWRITE_GLYPH_OFFSET* justifiedGlyphOffsets = new DWRITE_GLYPH_OFFSET[glyphCount];
hr = analyzer1->JustifyGlyphAdvances (lineWidth, glyphCount, justificationOpportunities,
- glyphAdvances, glyphOffsets, justifiedGlyphAdvances, justifiedGlyphOffsets);
+ glyphAdvances, glyphOffsets, justifiedGlyphAdvances,
+ justifiedGlyphOffsets);
- if (FAILED (hr))
- FAIL ("Analyzer failed to get justified glyph advances.");
+ if (FAILED (hr)) FAIL ("Analyzer failed to get justify glyph advances.");
DWRITE_SCRIPT_PROPERTIES scriptProperties;
hr = analyzer1->GetScriptProperties (runHead->mScript, &scriptProperties);
- if (FAILED (hr))
- FAIL ("Analyzer failed to get script properties.");
+ if (FAILED (hr)) FAIL ("Analyzer failed to get script properties.");
uint32_t justificationCharacter = scriptProperties.justificationCharacter;
// if a script justificationCharacter is not space, it can have GetJustifiedGlyphs
@@ -729,14 +715,15 @@
retry_getjustifiedglyphs:
uint16_t* modifiedGlyphIndices = new uint16_t[maxGlyphCount];
float* modifiedGlyphAdvances = new float[maxGlyphCount];
- DWRITE_GLYPH_OFFSET* modifiedGlyphOffsets =
- new DWRITE_GLYPH_OFFSET[maxGlyphCount];
+ DWRITE_GLYPH_OFFSET* modifiedGlyphOffsets = new DWRITE_GLYPH_OFFSET[maxGlyphCount];
uint32_t actualGlyphsCount;
hr = analyzer1->GetJustifiedGlyphs (fontFace, fontEmSize, runHead->mScript,
- textLength, glyphCount, maxGlyphCount, clusterMap, glyphIndices,
- glyphAdvances, justifiedGlyphAdvances, justifiedGlyphOffsets,
- glyphProperties, &actualGlyphsCount, modifiedClusterMap, modifiedGlyphIndices,
- modifiedGlyphAdvances, modifiedGlyphOffsets);
+ textLength, glyphCount, maxGlyphCount,
+ clusterMap, glyphIndices, glyphAdvances,
+ justifiedGlyphAdvances, justifiedGlyphOffsets,
+ glyphProperties, &actualGlyphsCount,
+ modifiedClusterMap, modifiedGlyphIndices,
+ modifiedGlyphAdvances, modifiedGlyphOffsets);
if (hr == HRESULT_FROM_WIN32 (ERROR_INSUFFICIENT_BUFFER))
{
@@ -776,7 +763,6 @@
}
delete [] justificationOpportunities;
-
}
/* Ok, we've got everything we need, now compose output buffer,
@@ -826,13 +812,11 @@
/* TODO vertical */
pos->x_advance = x_mult * (int32_t) info->mask;
- pos->x_offset =
- x_mult * (isRightToLeft ? -info->var1.i32 : info->var1.i32);
+ pos->x_offset = x_mult * (isRightToLeft ? -info->var1.i32 : info->var1.i32);
pos->y_offset = y_mult * info->var2.i32;
}
- if (isRightToLeft)
- hb_buffer_reverse (buffer);
+ if (isRightToLeft) hb_buffer_reverse (buffer);
delete [] clusterMap;
delete [] glyphIndices;
@@ -850,13 +834,13 @@
hb_bool_t
_hb_directwrite_shape (hb_shape_plan_t *shape_plan,
- hb_font_t *font,
- hb_buffer_t *buffer,
- const hb_feature_t *features,
- unsigned int num_features)
+ hb_font_t *font,
+ hb_buffer_t *buffer,
+ const hb_feature_t *features,
+ unsigned int num_features)
{
return _hb_directwrite_shape_full (shape_plan, font, buffer,
- features, num_features, 0);
+ features, num_features, 0);
}
/*
@@ -865,16 +849,17 @@
hb_bool_t
hb_directwrite_shape_experimental_width (hb_font_t *font,
- hb_buffer_t *buffer,
- const hb_feature_t *features,
- unsigned int num_features,
- float width)
+ hb_buffer_t *buffer,
+ const hb_feature_t *features,
+ unsigned int num_features,
+ float width)
{
static const char *shapers = "directwrite";
- hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached (font->face,
- &buffer->props, features, num_features, &shapers);
+ hb_shape_plan_t *shape_plan;
+ shape_plan = hb_shape_plan_create_cached (font->face, &buffer->props,
+ features, num_features, &shapers);
hb_bool_t res = _hb_directwrite_shape_full (shape_plan, font, buffer,
- features, num_features, width);
+ features, num_features, width);
buffer->unsafe_to_break_all ();
diff --git a/src/hb-dsalgs.hh b/src/hb-dsalgs.hh
index 653dd6a..f7bba57 100644
--- a/src/hb-dsalgs.hh
+++ b/src/hb-dsalgs.hh
@@ -619,8 +619,7 @@
return not_found;
}
template <typename T>
- inline const Type *lsearch (const T &x,
- const Type *not_found = nullptr) const
+ inline const Type *lsearch (const T &x, const Type *not_found = nullptr) const
{
unsigned int count = len;
for (unsigned int i = 0; i < count; i++)
@@ -799,7 +798,7 @@
{ return process<HbOpAnd> (o); }
inline hb_vector_size_t operator ^ (const hb_vector_size_t &o) const
{ return process<HbOpXor> (o); }
- inline hb_vector_size_t operator ~ () const
+ inline hb_vector_size_t operator ~ (void) const
{
hb_vector_size_t r;
#if HB_VECTOR_SIZE && 0
diff --git a/src/hb-map.hh b/src/hb-map.hh
index 16b2255..520c479 100644
--- a/src/hb-map.hh
+++ b/src/hb-map.hh
@@ -156,14 +156,10 @@
return items[i].key == key ? items[i].value : INVALID;
}
- inline void del (hb_codepoint_t key)
- {
- set (key, INVALID);
- }
+ inline void del (hb_codepoint_t key) { set (key, INVALID); }
+
inline bool has (hb_codepoint_t key) const
- {
- return get (key) != INVALID;
- }
+ { return get (key) != INVALID; }
inline hb_codepoint_t operator [] (unsigned int key) const
{ return get (key); }
@@ -176,15 +172,9 @@
population = occupancy = 0;
}
- inline bool is_empty (void) const
- {
- return population == 0;
- }
+ inline bool is_empty (void) const { return population == 0; }
- inline unsigned int get_population () const
- {
- return population;
- }
+ inline unsigned int get_population (void) const { return population; }
protected:
diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh
index 7f32fb3..5347691 100644
--- a/src/hb-ot-cmap-table.hh
+++ b/src/hb-ot-cmap-table.hh
@@ -847,7 +847,7 @@
struct subset_plan
{
- inline size_t final_size () const
+ inline size_t final_size (void) const
{
return 4 // header
+ 8 * 3 // 3 EncodingRecord
diff --git a/src/hb-ot-color-cbdt-table.hh b/src/hb-ot-color-cbdt-table.hh
index 2b49f2c..9a2be91 100644
--- a/src/hb-ot-color-cbdt-table.hh
+++ b/src/hb-ot-color-cbdt-table.hh
@@ -505,7 +505,7 @@
return hb_blob_get_empty ();
}
- inline bool has_data () const { return cbdt.get_length (); }
+ inline bool has_data (void) const { return cbdt.get_length (); }
private:
hb_blob_ptr_t<CBLC> cblc;
diff --git a/src/hb-ot-color-cpal-table.hh b/src/hb-ot-color-cpal-table.hh
index 095f96f..8f3e582 100644
--- a/src/hb-ot-color-cpal-table.hh
+++ b/src/hb-ot-color-cpal-table.hh
@@ -117,8 +117,8 @@
inline unsigned int get_size (void) const
{ return min_size + numPalettes * sizeof (colorRecordIndicesZ[0]); }
- inline unsigned int get_palette_count () const { return numPalettes; }
- inline unsigned int get_color_count () const { return numColors; }
+ inline unsigned int get_palette_count (void) const { return numPalettes; }
+ inline unsigned int get_color_count (void) const { return numColors; }
inline hb_ot_color_palette_flags_t get_palette_flags (unsigned int palette_index) const
{ return v1 ().get_palette_flags (this, palette_index, numPalettes); }
diff --git a/src/hb-ot-color-sbix-table.hh b/src/hb-ot-color-sbix-table.hh
index 2d24fba..a9b0843 100644
--- a/src/hb-ot-color-sbix-table.hh
+++ b/src/hb-ot-color-sbix-table.hh
@@ -144,15 +144,9 @@
num_glyphs = face->get_num_glyphs ();
}
- inline void fini (void)
- {
- table.destroy ();
- }
+ inline void fini (void) { table.destroy (); }
- inline bool has_data () const
- {
- return table->has_data ();
- }
+ inline bool has_data (void) const { return table->has_data (); }
inline bool get_extents (hb_font_t *font,
hb_codepoint_t glyph,
diff --git a/src/hb-ot-color-svg-table.hh b/src/hb-ot-color-svg-table.hh
index 0b8ec1a..5c424e5 100644
--- a/src/hb-ot-color-svg-table.hh
+++ b/src/hb-ot-color-svg-table.hh
@@ -80,14 +80,9 @@
struct accelerator_t
{
inline void init (hb_face_t *face)
- {
- table = hb_sanitize_context_t().reference_table<SVG> (face);
- }
+ { table = hb_sanitize_context_t().reference_table<SVG> (face); }
- inline void fini (void)
- {
- table.destroy ();
- }
+ inline void fini (void) { table.destroy (); }
inline hb_blob_t *reference_blob_for_glyph (hb_codepoint_t glyph_id) const
{
@@ -95,16 +90,14 @@
table->svgDocEntries);
}
- inline bool has_data () const { return table->has_data (); }
+ inline bool has_data (void) const { return table->has_data (); }
private:
hb_blob_ptr_t<SVG> table;
};
inline const SVGDocumentIndexEntry &get_glyph_entry (hb_codepoint_t glyph_id) const
- {
- return (this+svgDocEntries).bsearch (glyph_id);
- }
+ { return (this+svgDocEntries).bsearch (glyph_id); }
inline bool sanitize (hb_sanitize_context_t *c) const
{
diff --git a/src/hb-ot-glyf-table.hh b/src/hb-ot-glyf-table.hh
index ad047a2..42e4c52 100644
--- a/src/hb-ot-glyf-table.hh
+++ b/src/hb-ot-glyf-table.hh
@@ -177,7 +177,7 @@
const char *glyph_end;
const CompositeGlyphHeader *current;
- inline bool move_to_next ()
+ inline bool move_to_next (void)
{
if (current->flags & CompositeGlyphHeader::MORE_COMPONENTS)
{
diff --git a/src/hb-ot-hdmx-table.hh b/src/hb-ot-hdmx-table.hh
index 6545f26..8e7fd1c 100644
--- a/src/hb-ot-hdmx-table.hh
+++ b/src/hb-ot-hdmx-table.hh
@@ -56,10 +56,8 @@
this->subset_plan = subset_plan;
}
- inline unsigned int len () const
- {
- return this->subset_plan->glyphs.len;
- }
+ inline unsigned int len (void) const
+ { return this->subset_plan->glyphs.len; }
inline const HBUINT8* operator [] (unsigned int i) const
{
diff --git a/src/hb-ot-layout-base-table.hh b/src/hb-ot-layout-base-table.hh
index 320f003..4c3b861 100644
--- a/src/hb-ot-layout-base-table.hh
+++ b/src/hb-ot-layout-base-table.hh
@@ -44,7 +44,7 @@
struct BaseCoordFormat1
{
- inline hb_position_t get_coord () const { return coordinate; }
+ inline hb_position_t get_coord (void) const { return coordinate; }
inline bool sanitize (hb_sanitize_context_t *c) const
{
@@ -61,7 +61,7 @@
struct BaseCoordFormat2
{
- inline hb_position_t get_coord () const
+ inline hb_position_t get_coord (void) const
{
/* TODO */
return coordinate;
@@ -280,7 +280,7 @@
0;
}
- inline const MinMax &get_min_max () const
+ inline const MinMax &get_min_max (void) const
{ return this+minMax; }
inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
@@ -315,8 +315,7 @@
inline const BaseCoord &get_base_coord (int baseline_tag_index) const
{ return (this+baseValues).get_base_coord (baseline_tag_index); }
- inline bool is_empty () const
- { return !baseValues; }
+ inline bool is_empty (void) const { return !baseValues; }
inline bool sanitize (hb_sanitize_context_t *c) const
{
@@ -470,7 +469,7 @@
inline const Axis &get_axis (hb_direction_t direction) const
{ return HB_DIRECTION_IS_VERTICAL (direction) ? this+vAxis : this+hAxis; }
- inline const VariationStore &get_var_store () const
+ inline const VariationStore &get_var_store (void) const
{ return version.to_int () < 0x00010001u ? Null (VariationStore) : this+varStore; }
inline bool get_baseline (hb_font_t *font,
diff --git a/src/hb-ot-os2-table.hh b/src/hb-ot-os2-table.hh
index 67890f7..724f274 100644
--- a/src/hb-ot-os2-table.hh
+++ b/src/hb-ot-os2-table.hh
@@ -1,5 +1,6 @@
/*
* Copyright © 2011,2012 Google, Inc.
+ * Copyright © 2018 Ebrahim Byagowi
*
* This is part of HarfBuzz, a text shaping library.
*
@@ -93,13 +94,13 @@
{
enum { tableTag = HB_OT_TAG_OS2 };
- inline bool has_data () const { return this != &Null (OS2); }
+ inline bool has_data (void) const { return this != &Null (OS2); }
inline const OS2V1Tail &v1 (void) const { return version >= 1 ? v1X : Null (OS2V1Tail); }
inline const OS2V2Tail &v2 (void) const { return version >= 2 ? v2X : Null (OS2V2Tail); }
inline const OS2V5Tail &v5 (void) const { return version >= 5 ? v5X : Null (OS2V5Tail); }
- enum fs_selection_flag_t {
+ enum selection_flag_t {
ITALIC = 1u<<0,
UNDERSCORE = 1u<<1,
NEGATIVE = 1u<<2,
@@ -128,7 +129,7 @@
FWIDTH_ULTRA_EXPANDED = 9 /* 200% */
};
- inline float get_width () const
+ inline float get_width (void) const
{
switch (usWidthClass) {
case FWIDTH_ULTRA_CONDENSED:return 50.f;
@@ -214,12 +215,8 @@
};
// https://github.com/Microsoft/Font-Validator/blob/520aaae/OTFontFileVal/val_OS2.cs#L644-L681
- inline font_page_t get_font_page () const
- {
- if (version != 0)
- return (font_page_t) 0;
- return (font_page_t) (fsSelection & 0xFF00);
- }
+ inline font_page_t get_font_page (void) const
+ { return (font_page_t) (version == 0 ? fsSelection & 0xFF00 : 0); }
inline bool sanitize (hb_sanitize_context_t *c) const
{
