[HarfBuzz] harfbuzz: Branch 'master' - 2 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Tue Oct 30 08:08:53 UTC 2018
.circleci/config.yml | 2 +-
src/hb-machinery.hh | 16 ++++++++--------
src/hb-ot-layout-common.hh | 6 +++---
src/hb-ot-layout-gsubgpos.hh | 2 +-
src/hb.hh | 2 +-
test/shaping/run-tests.py | 2 +-
util/options.hh | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 64e41d2c89c533f554e49ffbd18e6653a70ab999
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Tue Oct 30 01:08:34 2018 -0700
[test] Fix Python3
diff --git a/test/shaping/run-tests.py b/test/shaping/run-tests.py
index 99c0a59f..65e0e149 100755
--- a/test/shaping/run-tests.py
+++ b/test/shaping/run-tests.py
@@ -6,7 +6,7 @@ import sys, os, subprocess
def cmd(command):
global process
- process.stdin.write (' '.join (command) + '\n')
+ process.stdin.write ((' '.join (command) + '\n').encode ("utf-8"))
process.stdin.flush ()
return process.stdout.readline().decode ("utf-8").strip ()
commit f7a08cd41df1ff3e44aa838306218ae0565b7273
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date: Tue Oct 30 11:29:09 2018 +0330
Fix extra semicolon issues and test that on CI (#1330)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8ed1c394..90c09405 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -120,7 +120,7 @@ jobs:
- run: apt update || true
- run: apt install -y clang lld binutils libtool autoconf automake make pkg-config gtk-doc-tools ragel libfreetype6-dev libfontconfig1-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip
- run: pip install fonttools
- - run: CFLAGS="-Weverything -Wno-reserved-id-macro -Wno-conversion -Wno-padded -Wno-sign-conversion -Wno-cast-qual -Wno-documentation -Wno-documentation-unknown-command" CXXFLAGS="-Weverything -Wno-old-style-cast -Wno-documentation -Wno-documentation-unknown-command -Wno-c++98-compat -Wno-cast-qual -Wno-c++98-compat-pedantic -Wno-sign-conversion -Wno-padded -Wno-shorten-64-to-32 -Wno-extra-semi -Wno-reserved-id-macro -Wno-float-conversion -Wno-format-pedantic -Wno-shadow -Wno-conversion -Wno-zero-as-null-pointer-constant -Wno-missing-field-initializers -Wno-used-but-marked-unused -Wno-unused-macros -Wno-comma -Wno-float-equal -Wno-disabled-macro-expansion -Wno-weak-vtables -Wno-unused-parameter -Wno-covered-switch-default -Wno-unreachable-code" CC=clang CXX=clang++ ./autogen.sh --with-freetype --with-glib --with-cairo --with-icu --with-graphite2 --with-fontconfig
+ - run: CFLAGS="-Weverything -Wno-reserved-id-macro -Wno-conversion -Wno-padded -Wno-sign-conversion -Wno-cast-qual -Wno-documentation -Wno-documentation-unknown-command" CXXFLAGS="-Weverything -Wno-old-style-cast -Wno-documentation -Wno-documentation-unknown-command -Wno-c++98-compat -Wno-cast-qual -Wno-c++98-compat-pedantic -Wno-sign-conversion -Wno-padded -Wno-shorten-64-to-32 -Wno-reserved-id-macro -Wno-float-conversion -Wno-format-pedantic -Wno-shadow -Wno-conversion -Wno-zero-as-null-pointer-constant -Wno-missing-field-initializers -Wno-used-but-marked-unused -Wno-unused-macros -Wno-comma -Wno-float-equal -Wno-disabled-macro-expansion -Wno-weak-vtables -Wno-unused-parameter -Wno-covered-switch-default -Wno-unreachable-code" CC=clang CXX=clang++ ./autogen.sh --with-freetype --with-glib --with-cairo --with-icu --with-graphite2 --with-fontconfig
- run: make -j32 CPPFLAGS="-Werror"
- run: make check CPPFLAGS="-Werror" || .ci/fail.sh
diff --git a/src/hb-machinery.hh b/src/hb-machinery.hh
index 0ff3a768..9e50bc02 100644
--- a/src/hb-machinery.hh
+++ b/src/hb-machinery.hh
@@ -95,30 +95,30 @@ static inline Type& StructAfter(TObject &X)
#define DEFINE_SIZE_STATIC(size) \
- DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size)); \
+ DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size)) \
+ inline unsigned int get_size (void) const { return (size); } \
enum { static_size = (size) }; \
- enum { min_size = (size) }; \
- inline unsigned int get_size (void) const { return (size); }
+ enum { min_size = (size) }
#define DEFINE_SIZE_UNION(size, _member) \
- DEFINE_INSTANCE_ASSERTION (0*sizeof(this->u._member.static_size) + sizeof(this->u._member) == (size)); \
+ DEFINE_INSTANCE_ASSERTION (0*sizeof(this->u._member.static_size) + sizeof(this->u._member) == (size)) \
static const unsigned int min_size = (size)
#define DEFINE_SIZE_MIN(size) \
- DEFINE_INSTANCE_ASSERTION (sizeof (*this) >= (size)); \
+ DEFINE_INSTANCE_ASSERTION (sizeof (*this) >= (size)) \
static const unsigned int min_size = (size)
#define DEFINE_SIZE_ARRAY(size, array) \
- DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + VAR * sizeof (array[0])); \
+ DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + VAR * sizeof (array[0])) \
DEFINE_COMPILES_ASSERTION ((void) array[0].static_size) \
- enum { min_size = (size) } \
+ enum { min_size = (size) }
#define DEFINE_SIZE_ARRAY_SIZED(size, array) \
inline unsigned int get_size (void) const { return (size - array.min_size + array.get_size ()); } \
DEFINE_SIZE_ARRAY(size, array)
#define DEFINE_SIZE_ARRAY2(size, array1, array2) \
- DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + sizeof (this->array1[0]) + sizeof (this->array2[0])); \
+ DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + sizeof (this->array1[0]) + sizeof (this->array2[0])) \
DEFINE_COMPILES_ASSERTION ((void) array1[0].static_size; (void) array2[0].static_size) \
static const unsigned int min_size = (size)
diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index 3505b9cd..7663bd3d 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -860,8 +860,8 @@ struct CoverageFormat1
public:
/* Older compilers need this to be public. */
struct Iter {
- inline void init (const struct CoverageFormat1 &c_) { c = &c_; i = 0; };
- inline void fini (void) {};
+ inline void init (const struct CoverageFormat1 &c_) { c = &c_; i = 0; }
+ inline void fini (void) {}
inline bool more (void) { return i < c->glyphArray.len; }
inline void next (void) { i++; }
inline hb_codepoint_t get_glyph (void) { return c->glyphArray[i]; }
@@ -988,7 +988,7 @@ struct CoverageFormat2
i = c->rangeRecord.len;
}
}
- inline void fini (void) {};
+ inline void fini (void) {}
inline bool more (void) { return i < c->rangeRecord.len; }
inline void next (void)
{
diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index 03fdac2a..c4af4204 100644
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -271,7 +271,7 @@ struct hb_ot_apply_context_t :
syllable arg1(0),
#undef arg1
match_func (nullptr),
- match_data (nullptr) {};
+ match_data (nullptr) {}
typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const HBUINT16 &value, const void *data);
diff --git a/src/hb.hh b/src/hb.hh
index 6f5d6aab..fa6a7404 100644
--- a/src/hb.hh
+++ b/src/hb.hh
@@ -360,7 +360,7 @@ static_assert ((sizeof (hb_var_int_t) == 4), "");
#define HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2(TypeName, T1, T2) \
TypeName(void); \
TypeName(const TypeName<T1, T2>&); \
- void operator=(const TypeName<T1, T2>&);
+ void operator=(const TypeName<T1, T2>&)
#else /* __cpluspplus >= 201103L */
diff --git a/util/options.hh b/util/options.hh
index 6f35ea3f..36f680f0 100644
--- a/util/options.hh
+++ b/util/options.hh
@@ -536,7 +536,7 @@ struct text_options_t : option_group_t
g_set_error (error,
G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
"Only one of text and text-file can be set");
- };
+ }
const char *get_line (unsigned int *len);
More information about the HarfBuzz
mailing list