Hello community,
here is the log from the commit of package harfbuzz for openSUSE:Factory checked in at 2012-12-14 09:16:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/harfbuzz (Old)
and /work/SRC/openSUSE:Factory/.harfbuzz.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "harfbuzz", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/harfbuzz/harfbuzz.changes 2012-12-08 15:51:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.harfbuzz.new/harfbuzz.changes 2012-12-14 09:17:00.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Dec 10 08:10:45 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 0.9.9:
+ + Fix build on Windows.
+ + Minor improvements.
+
+-------------------------------------------------------------------
Old:
----
harfbuzz-0.9.8.tar.bz2
New:
----
harfbuzz-0.9.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ harfbuzz.spec ++++++
--- /var/tmp/diff_new_pack.cyJqVa/_old 2012-12-14 09:17:03.000000000 +0100
+++ /var/tmp/diff_new_pack.cyJqVa/_new 2012-12-14 09:17:03.000000000 +0100
@@ -17,7 +17,7 @@
Name: harfbuzz
-Version: 0.9.8
+Version: 0.9.9
Release: 0
# FIXME: graphite2 is not packaged / http://projects.palaso.org/projects/graphitedev
Summary: An OpenType text shaping engine
++++++ harfbuzz-0.9.8.tar.bz2 -> harfbuzz-0.9.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.8/NEWS new/harfbuzz-0.9.9/NEWS
--- old/harfbuzz-0.9.8/NEWS 2012-12-04 21:43:25.000000000 +0100
+++ new/harfbuzz-0.9.9/NEWS 2012-12-05 23:36:44.000000000 +0100
@@ -1,3 +1,11 @@
+Overview of changes leading to 0.9.9
+Wednesday, December 5, 2012
+====================================
+
+- Fix build on Windows.
+- Minor improvements.
+
+
Overview of changes leading to 0.9.8
Tuesday, December 4, 2012
====================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.8/configure new/harfbuzz-0.9.9/configure
--- old/harfbuzz-0.9.8/configure 2012-12-04 21:43:37.000000000 +0100
+++ new/harfbuzz-0.9.9/configure 2012-12-05 23:36:52.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for HarfBuzz 0.9.8.
+# Generated by GNU Autoconf 2.68 for HarfBuzz 0.9.9.
#
# Report bugs to http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz.
#
@@ -571,8 +571,8 @@
# Identity of this package.
PACKAGE_NAME='HarfBuzz'
PACKAGE_TARNAME='harfbuzz'
-PACKAGE_VERSION='0.9.8'
-PACKAGE_STRING='HarfBuzz 0.9.8'
+PACKAGE_VERSION='0.9.9'
+PACKAGE_STRING='HarfBuzz 0.9.9'
PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz'
PACKAGE_URL='http://harfbuzz.org/'
@@ -1388,7 +1388,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures HarfBuzz 0.9.8 to adapt to many kinds of systems.
+\`configure' configures HarfBuzz 0.9.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1458,7 +1458,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of HarfBuzz 0.9.8:";;
+ short | recursive ) echo "Configuration of HarfBuzz 0.9.9:";;
esac
cat <<\_ACEOF
@@ -1596,7 +1596,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-HarfBuzz configure 0.9.8
+HarfBuzz configure 0.9.9
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2086,7 +2086,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by HarfBuzz $as_me 0.9.8, which was
+It was created by HarfBuzz $as_me 0.9.9, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2907,7 +2907,7 @@
# Define the identity of the package.
PACKAGE='harfbuzz'
- VERSION='0.9.8'
+ VERSION='0.9.9'
# Some tools Automake needs.
@@ -16077,8 +16077,8 @@
HB_VERSION_MAJOR=0
HB_VERSION_MINOR=9
-HB_VERSION_MICRO=8
-HB_VERSION=0.9.8
+HB_VERSION_MICRO=9
+HB_VERSION=0.9.9
@@ -16089,7 +16089,7 @@
-HB_LIBTOOL_VERSION_INFO=908:0:908
+HB_LIBTOOL_VERSION_INFO=909:0:909
@@ -18135,7 +18135,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by HarfBuzz $as_me 0.9.8, which was
+This file was extended by HarfBuzz $as_me 0.9.9, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18202,7 +18202,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-HarfBuzz config.status 0.9.8
+HarfBuzz config.status 0.9.9
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.8/configure.ac new/harfbuzz-0.9.9/configure.ac
--- old/harfbuzz-0.9.8/configure.ac 2012-12-04 20:59:49.000000000 +0100
+++ new/harfbuzz-0.9.9/configure.ac 2012-12-05 23:36:04.000000000 +0100
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
AC_INIT([HarfBuzz],
- [0.9.8],
+ [0.9.9],
[http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
[harfbuzz],
[http://harfbuzz.org/])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.8/src/hb-ot-layout-gpos-table.hh new/harfbuzz-0.9.9/src/hb-ot-layout-gpos-table.hh
--- old/harfbuzz-0.9.8/src/hb-ot-layout-gpos-table.hh 2012-11-30 07:30:39.000000000 +0100
+++ new/harfbuzz-0.9.9/src/hb-ot-layout-gpos-table.hh 2012-12-04 23:06:16.000000000 +0100
@@ -422,7 +422,7 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+coverage).add_coverage (&c->input);
+ (this+coverage).add_coverage (c->input);
}
inline const Coverage &get_coverage (void) const
@@ -467,7 +467,7 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+coverage).add_coverage (&c->input);
+ (this+coverage).add_coverage (c->input);
}
inline const Coverage &get_coverage (void) const
@@ -572,7 +572,7 @@
unsigned int count = len;
for (unsigned int i = 0; i < count; i++)
{
- c->input.add (record->secondGlyph);
+ c->input->add (record->secondGlyph);
record = &StructAtOffset<PairValueRecord> (record, record_size);
}
}
@@ -638,7 +638,7 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+coverage).add_coverage (&c->input);
+ (this+coverage).add_coverage (c->input);
unsigned int count = pairSet.len;
for (unsigned int i = 0; i < count; i++)
(this+pairSet[i]).collect_glyphs (c, &valueFormat1);
@@ -701,19 +701,19 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- /* (this+coverage).add_coverage (&c->input); // Don't need this. */
+ /* (this+coverage).add_coverage (c->input); // Don't need this. */
/* TODO only add values for pairs that have nonzero adjustments. */
unsigned int count1 = class1Count;
const ClassDef &klass1 = this+classDef1;
for (unsigned int i = 0; i < count1; i++)
- klass1.add_class (&c->input, i);
+ klass1.add_class (c->input, i);
unsigned int count2 = class2Count;
const ClassDef &klass2 = this+classDef2;
for (unsigned int i = 0; i < count2; i++)
- klass2.add_class (&c->input, i);
+ klass2.add_class (c->input, i);
}
inline const Coverage &get_coverage (void) const
@@ -859,7 +859,7 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+coverage).add_coverage (&c->input);
+ (this+coverage).add_coverage (c->input);
}
inline const Coverage &get_coverage (void) const
@@ -1005,8 +1005,8 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+markCoverage).add_coverage (&c->input);
- (this+baseCoverage).add_coverage (&c->input);
+ (this+markCoverage).add_coverage (c->input);
+ (this+baseCoverage).add_coverage (c->input);
/* TODO only add combinations that have nonzero adjustment. */
}
@@ -1109,8 +1109,8 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+markCoverage).add_coverage (&c->input);
- (this+ligatureCoverage).add_coverage (&c->input);
+ (this+markCoverage).add_coverage (c->input);
+ (this+ligatureCoverage).add_coverage (c->input);
/* TODO only add combinations that have nonzero adjustment. */
}
@@ -1225,8 +1225,8 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+mark1Coverage).add_coverage (&c->input);
- (this+mark2Coverage).add_coverage (&c->input);
+ (this+mark1Coverage).add_coverage (c->input);
+ (this+mark2Coverage).add_coverage (c->input);
/* TODO only add combinations that have nonzero adjustment. */
}
@@ -1446,7 +1446,7 @@
inline hb_collect_glyphs_context_t::return_t collect_glyphs_lookup (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- c->set_recurse_func (process_recurse_func);
+ c->set_recurse_func (NULL);
return TRACE_RETURN (process (c));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.8/src/hb-ot-layout-gsub-table.hh new/harfbuzz-0.9.9/src/hb-ot-layout-gsub-table.hh
--- old/harfbuzz-0.9.8/src/hb-ot-layout-gsub-table.hh 2012-11-30 07:30:39.000000000 +0100
+++ new/harfbuzz-0.9.9/src/hb-ot-layout-gsub-table.hh 2012-12-04 23:07:43.000000000 +0100
@@ -54,8 +54,8 @@
Coverage::Iter iter;
for (iter.init (this+coverage); iter.more (); iter.next ()) {
hb_codepoint_t glyph_id = iter.get_glyph ();
- c->input.add (glyph_id);
- c->output.add ((glyph_id + deltaGlyphID) & 0xFFFF);
+ c->input->add (glyph_id);
+ c->output->add ((glyph_id + deltaGlyphID) & 0xFFFF);
}
}
@@ -130,8 +130,8 @@
TRACE_COLLECT_GLYPHS (this);
Coverage::Iter iter;
for (iter.init (this+coverage); iter.more (); iter.next ()) {
- c->input.add (iter.get_glyph ());
- c->output.add (substitute[iter.get_coverage ()]);
+ c->input->add (iter.get_glyph ());
+ c->output->add (substitute[iter.get_coverage ()]);
}
}
@@ -264,7 +264,7 @@
TRACE_COLLECT_GLYPHS (this);
unsigned int count = substitute.len;
for (unsigned int i = 0; i < count; i++)
- c->output.add (substitute[i]);
+ c->output->add (substitute[i]);
}
inline bool apply (hb_apply_context_t *c) const
@@ -320,7 +320,7 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+coverage).add_coverage (&c->input);
+ (this+coverage).add_coverage (c->input);
unsigned int count = sequence.len;
for (unsigned int i = 0; i < count; i++)
(this+sequence[i]).collect_glyphs (c);
@@ -451,11 +451,11 @@
TRACE_COLLECT_GLYPHS (this);
Coverage::Iter iter;
for (iter.init (this+coverage); iter.more (); iter.next ()) {
- c->input.add (iter.get_glyph ());
+ c->input->add (iter.get_glyph ());
const AlternateSet &alt_set = this+alternateSet[iter.get_coverage ()];
unsigned int count = alt_set.len;
for (unsigned int i = 0; i < count; i++)
- c->output.add (alt_set[i]);
+ c->output->add (alt_set[i]);
}
}
@@ -595,8 +595,8 @@
TRACE_COLLECT_GLYPHS (this);
unsigned int count = component.len;
for (unsigned int i = 1; i < count; i++)
- c->input.add (component[i]);
- c->output.add (ligGlyph);
+ c->input->add (component[i]);
+ c->output->add (ligGlyph);
}
inline bool would_apply (hb_would_apply_context_t *c) const
@@ -767,7 +767,7 @@
TRACE_COLLECT_GLYPHS (this);
Coverage::Iter iter;
for (iter.init (this+coverage); iter.more (); iter.next ()) {
- c->input.add (iter.get_glyph ());
+ c->input->add (iter.get_glyph ());
(this+ligatureSet[iter.get_coverage ()]).collect_glyphs (c);
}
}
@@ -933,20 +933,20 @@
unsigned int count;
- (this+coverage).add_coverage (&c->input);
+ (this+coverage).add_coverage (c->input);
count = backtrack.len;
for (unsigned int i = 0; i < count; i++)
- (this+backtrack[i]).add_coverage (&c->before);
+ (this+backtrack[i]).add_coverage (c->before);
count = lookahead.len;
for (unsigned int i = 0; i < count; i++)
- (this+lookahead[i]).add_coverage (&c->after);
+ (this+lookahead[i]).add_coverage (c->after);
const ArrayOf<GlyphID> &substitute = StructAfter (lookahead);
count = substitute.len;
for (unsigned int i = 0; i < count; i++)
- c->output.add (substitute[i]);
+ c->output->add (substitute[i]);
}
inline const Coverage &get_coverage (void) const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.8/src/hb-ot-layout-gsubgpos-private.hh new/harfbuzz-0.9.9/src/hb-ot-layout-gsubgpos-private.hh
--- old/harfbuzz-0.9.8/src/hb-ot-layout-gsubgpos-private.hh 2012-11-30 07:38:20.000000000 +0100
+++ new/harfbuzz-0.9.9/src/hb-ot-layout-gsubgpos-private.hh 2012-12-05 22:48:25.000000000 +0100
@@ -49,7 +49,7 @@
#endif
#define TRACE_CLOSURE(this) \
- hb_auto_trace_t trace \
+ hb_auto_trace_t trace \
(&c->debug_depth, c->get_name (), this, HB_FUNC, \
"");
@@ -57,11 +57,11 @@
{
inline const char *get_name (void) { return "CLOSURE"; }
static const unsigned int max_debug_depth = HB_DEBUG_CLOSURE;
- typedef void_t return_t;
+ typedef hb_void_t return_t;
typedef return_t (*recurse_func_t) (hb_closure_context_t *c, unsigned int lookup_index);
template <typename T>
- inline return_t process (const T &obj) { obj.closure (this); return VOID; }
- static return_t default_return_value (void) { return VOID; }
+ inline return_t process (const T &obj) { obj.closure (this); return HB_VOID; }
+ static return_t default_return_value (void) { return HB_VOID; }
bool stop_sublookup_iteration (const return_t r) const { return false; }
return_t recurse (unsigned int lookup_index)
{
@@ -71,7 +71,7 @@
nesting_level_left--;
recurse_func (this, lookup_index);
nesting_level_left++;
- return VOID;
+ return HB_VOID;
}
hb_face_t *face;
@@ -137,7 +137,7 @@
#endif
#define TRACE_COLLECT_GLYPHS(this) \
- hb_auto_trace_t trace \
+ hb_auto_trace_t trace \
(&c->debug_depth, c->get_name (), this, HB_FUNC, \
"");
@@ -145,30 +145,45 @@
{
inline const char *get_name (void) { return "COLLECT_GLYPHS"; }
static const unsigned int max_debug_depth = HB_DEBUG_COLLECT_GLYPHS;
- typedef void_t return_t;
+ typedef hb_void_t return_t;
typedef return_t (*recurse_func_t) (hb_collect_glyphs_context_t *c, unsigned int lookup_index);
template <typename T>
- inline return_t process (const T &obj) { obj.collect_glyphs (this); return VOID; }
- static return_t default_return_value (void) { return VOID; }
+ inline return_t process (const T &obj) { obj.collect_glyphs (this); return HB_VOID; }
+ static return_t default_return_value (void) { return HB_VOID; }
bool stop_sublookup_iteration (const return_t r) const { return false; }
return_t recurse (unsigned int lookup_index)
{
if (unlikely (nesting_level_left == 0 || !recurse_func))
return default_return_value ();
+ /* Note that GPOS sets recurse_func to NULL already, so it doesn't get
+ * past the previous check. For GSUB, we only want to collect the output
+ * glyphs in the recursion. If output is not requested, we can go home now. */
+
+ if (output == hb_set_get_empty ())
+ return HB_VOID;
+
+ hb_set_t *old_before = before;
+ hb_set_t *old_input = input;
+ hb_set_t *old_after = after;
+ before = input = after = hb_set_get_empty ();
+
nesting_level_left--;
- /* Only collect output glyphs in the recursion. */
- hb_collect_glyphs_context_t new_c (this->face, NULL, NULL, NULL, &output, nesting_level_left);
- recurse_func (&new_c, lookup_index);
+ recurse_func (this, lookup_index);
nesting_level_left++;
- return VOID;
+
+ before = old_before;
+ input = old_input;
+ after = old_after;
+
+ return HB_VOID;
}
hb_face_t *face;
- hb_set_t &before;
- hb_set_t &input;
- hb_set_t &after;
- hb_set_t &output;
+ hb_set_t *before;
+ hb_set_t *input;
+ hb_set_t *after;
+ hb_set_t *output;
recurse_func_t recurse_func;
unsigned int nesting_level_left;
unsigned int debug_depth;
@@ -180,10 +195,10 @@
hb_set_t *glyphs_output, /* OUT. May be NULL */
unsigned int nesting_level_left_ = MAX_NESTING_LEVEL) :
face (face_),
- before (glyphs_before ? *glyphs_before : *hb_set_get_empty ()),
- input (glyphs_input ? *glyphs_input : *hb_set_get_empty ()),
- after (glyphs_after ? *glyphs_after : *hb_set_get_empty ()),
- output (glyphs_output ? *glyphs_output : *hb_set_get_empty ()),
+ before (glyphs_before ? glyphs_before : hb_set_get_empty ()),
+ input (glyphs_input ? glyphs_input : hb_set_get_empty ()),
+ after (glyphs_after ? glyphs_after : hb_set_get_empty ()),
+ output (glyphs_output ? glyphs_output : hb_set_get_empty ()),
recurse_func (NULL),
nesting_level_left (nesting_level_left_),
debug_depth (0) {}
@@ -914,7 +929,7 @@
const LookupRecord lookupRecord[],
ContextCollectGlyphsLookupContext &lookup_context)
{
- collect_array (c, &c->input,
+ collect_array (c, c->input,
inputCount ? inputCount - 1 : 0, input,
lookup_context.funcs.collect, lookup_context.collect_data);
recurse_lookups (c,
@@ -1086,7 +1101,7 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+coverage).add_coverage (&c->input);
+ (this+coverage).add_coverage (c->input);
struct ContextCollectGlyphsLookupContext lookup_context = {
{collect_glyph},
@@ -1174,7 +1189,7 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+coverage).add_coverage (&c->input);
+ (this+coverage).add_coverage (c->input);
struct ContextCollectGlyphsLookupContext lookup_context = {
{collect_class},
@@ -1264,7 +1279,7 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+coverage[0]).add_coverage (&c->input);
+ (this+coverage[0]).add_coverage (c->input);
const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverage, coverage[0].static_size * glyphCount);
struct ContextCollectGlyphsLookupContext lookup_context = {
@@ -1424,13 +1439,13 @@
const LookupRecord lookupRecord[],
ChainContextCollectGlyphsLookupContext &lookup_context)
{
- collect_array (c, &c->before,
+ collect_array (c, c->before,
backtrackCount, backtrack,
lookup_context.funcs.collect, lookup_context.collect_data[0]);
- collect_array (c, &c->input,
+ collect_array (c, c->input,
inputCount ? inputCount - 1 : 0, input,
lookup_context.funcs.collect, lookup_context.collect_data[1]);
- collect_array (c, &c->after,
+ collect_array (c, c->after,
lookaheadCount, lookahead,
lookup_context.funcs.collect, lookup_context.collect_data[2]);
recurse_lookups (c,
@@ -1643,7 +1658,7 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+coverage).add_coverage (&c->input);
+ (this+coverage).add_coverage (c->input);
struct ChainContextCollectGlyphsLookupContext lookup_context = {
{collect_glyph},
@@ -1733,7 +1748,7 @@
inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
{
TRACE_COLLECT_GLYPHS (this);
- (this+coverage).add_coverage (&c->input);
+ (this+coverage).add_coverage (c->input);
struct ChainContextCollectGlyphsLookupContext lookup_context = {
{collect_class},
@@ -1846,7 +1861,7 @@
TRACE_COLLECT_GLYPHS (this);
const OffsetArrayOf<Coverage> &input = StructAfter (backtrack);
- (this+input[0]).add_coverage (&c->input);
+ (this+input[0]).add_coverage (c->input);
const OffsetArrayOf<Coverage> &lookahead = StructAfter (input);
const ArrayOf<LookupRecord> &lookup = StructAfter (lookahead);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.8/src/hb-private.hh new/harfbuzz-0.9.9/src/hb-private.hh
--- old/harfbuzz-0.9.8/src/hb-private.hh 2012-11-23 23:33:08.000000000 +0100
+++ new/harfbuzz-0.9.9/src/hb-private.hh 2012-12-05 22:49:24.000000000 +0100
@@ -63,9 +63,9 @@
/* Void! */
-struct _void_t;
-typedef const _void_t &void_t;
-#define VOID (* (const _void_t *) NULL)
+struct _hb_void_t;
+typedef const _hb_void_t &hb_void_t;
+#define HB_VOID (* (const _hb_void_t *) NULL)
/* Basics */
@@ -679,8 +679,8 @@
};
template <>
-struct hb_printer_t {
- const char *print (void_t v) { return ""; }
+struct hb_printer_t {
+ const char *print (hb_void_t v) { return ""; }
};
@@ -696,7 +696,7 @@
}
}
template <>
-inline void _hb_warn_no_return (bool returned)
+inline void _hb_warn_no_return (bool returned)
{}
template
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.8/src/hb-ucdn/ucdn.c new/harfbuzz-0.9.9/src/hb-ucdn/ucdn.c
--- old/harfbuzz-0.9.8/src/hb-ucdn/ucdn.c 2012-11-22 22:33:46.000000000 +0100
+++ new/harfbuzz-0.9.9/src/hb-ucdn/ucdn.c 2012-12-04 21:56:59.000000000 +0100
@@ -20,13 +20,13 @@
#include "ucdn.h"
typedef struct {
- const unsigned char category;
- const unsigned char combining;
- const unsigned char bidi_class;
- const unsigned char mirrored;
- const unsigned char east_asian_width;
- const unsigned char normalization_check;
- const unsigned char script;
+ unsigned char category;
+ unsigned char combining;
+ unsigned char bidi_class;
+ unsigned char mirrored;
+ unsigned char east_asian_width;
+ unsigned char normalization_check;
+ unsigned char script;
} UCDRecord;
typedef struct {
@@ -86,7 +86,7 @@
return &decomp_data[index];
}
-static const int get_comp_index(uint32_t code, const Reindex *idx)
+static int get_comp_index(uint32_t code, const Reindex *idx)
{
int i;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.8/src/hb-version.h new/harfbuzz-0.9.9/src/hb-version.h
--- old/harfbuzz-0.9.8/src/hb-version.h 2012-12-04 21:43:43.000000000 +0100
+++ new/harfbuzz-0.9.9/src/hb-version.h 2012-12-05 23:36:57.000000000 +0100
@@ -38,9 +38,9 @@
#define HB_VERSION_MAJOR 0
#define HB_VERSION_MINOR 9
-#define HB_VERSION_MICRO 8
+#define HB_VERSION_MICRO 9
-#define HB_VERSION_STRING "0.9.8"
+#define HB_VERSION_STRING "0.9.9"
#define HB_VERSION_CHECK(major,minor,micro) \
((major)*10000+(minor)*100+(micro) >= \
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org