Index: third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh |
diff --git a/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh b/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh |
index 9ff5ca975b666d054edd1a1dc9d10a6989d4fc63..5d19e08fba9a4d1d53c2471a45f836187751e802 100644 |
--- a/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh |
+++ b/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh |
@@ -1,6 +1,6 @@ |
/* |
- * Copyright (C) 2007,2008,2009 Red Hat, Inc. |
- * Copyright (C) 2010 Google, Inc. |
+ * Copyright © 2007,2008,2009 Red Hat, Inc. |
+ * Copyright © 2010 Google, Inc. |
* |
* This is part of HarfBuzz, a text shaping library. |
* |
@@ -38,8 +38,6 @@ |
#define NOT_COVERED ((unsigned int) 0x110000) |
#define MAX_NESTING_LEVEL 8 |
-HB_BEGIN_DECLS |
-HB_END_DECLS |
/* |
@@ -89,10 +87,10 @@ struct RecordArrayOf : SortedArrayOf<Record<Type> > { |
hb_tag_t *record_tags /* OUT */) const |
{ |
if (record_count) { |
- const Record<Type> *array = this->sub_array (start_offset, record_count); |
+ const Record<Type> *arr = this->sub_array (start_offset, record_count); |
unsigned int count = *record_count; |
for (unsigned int i = 0; i < count; i++) |
- record_tags[i] = array[i].tag; |
+ record_tags[i] = arr[i].tag; |
} |
return this->len; |
} |
@@ -150,10 +148,10 @@ struct IndexArray : ArrayOf<Index> |
unsigned int *_indexes /* OUT */) const |
{ |
if (_count) { |
- const USHORT *array = this->sub_array (start_offset, _count); |
+ const USHORT *arr = this->sub_array (start_offset, _count); |
unsigned int count = *_count; |
for (unsigned int i = 0; i < count; i++) |
- _indexes[i] = array[i]; |
+ _indexes[i] = arr[i]; |
} |
return this->len; |
} |
@@ -526,13 +524,13 @@ struct ClassDef |
struct Device |
{ |
- inline hb_position_t get_x_delta (hb_ot_layout_context_t *c) const |
- { return get_delta (c->font->x_ppem, c->font->x_scale); } |
+ inline hb_position_t get_x_delta (hb_font_t *font) const |
+ { return get_delta (font->x_ppem, font->x_scale); } |
- inline hb_position_t get_y_delta (hb_ot_layout_context_t *c) const |
- { return get_delta (c->font->y_ppem, c->font->y_scale); } |
+ inline hb_position_t get_y_delta (hb_font_t *font) const |
+ { return get_delta (font->y_ppem, font->y_scale); } |
- inline int get_delta (unsigned int ppem, unsigned int scale) const |
+ inline int get_delta (unsigned int ppem, int scale) const |
{ |
if (!ppem) return 0; |
@@ -540,10 +538,6 @@ struct Device |
if (!pixels) return 0; |
- /* pixels is at most in the -8..7 range. So 64-bit arithmetic is |
- * not really necessary here. A simple cast to int may just work |
- * as well. But since this code is not reached that often and |
- * for the sake of correctness, we do a 64bit operation. */ |
return pixels * (int64_t) scale / ppem; |
} |
@@ -598,7 +592,5 @@ struct Device |
}; |
-HB_BEGIN_DECLS |
-HB_END_DECLS |
#endif /* HB_OT_LAYOUT_COMMON_PRIVATE_HH */ |