forked from amazingfate/loongoffice
83a9c8e046
apparently harfbuzz is not build with std=c++11 everywhere Change-Id: Ie105706212d9dd32f33bc67c8a878ce8a55e60ef Reviewed-on: https://gerrit.libreoffice.org/32521 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
65 lines
1.8 KiB
Diff
65 lines
1.8 KiB
Diff
--- src/hb-ot-font.cc
|
|
+++ src/hb-ot-font.cc
|
|
@@ -125,7 +125,7 @@
|
|
if (glyph >= this->num_advances)
|
|
glyph = this->num_advances - 1;
|
|
|
|
- return this->table->longMetric[glyph].advance;
|
|
+ return static_cast<OT::LongMetric const *>(this->table->longMetric)[glyph].advance;
|
|
}
|
|
};
|
|
|
|
@@ -394,8 +394,9 @@
|
|
}
|
|
|
|
static void
|
|
-_hb_ot_font_destroy (hb_ot_font_t *ot_font)
|
|
+_hb_ot_font_destroy (void *ot_font_)
|
|
{
|
|
+ hb_ot_font_t *ot_font = static_cast<hb_ot_font_t *>(ot_font_);
|
|
ot_font->cmap.fini ();
|
|
ot_font->h_metrics.fini ();
|
|
ot_font->v_metrics.fini ();
|
|
--- src/hb-ot-map-private.hh
|
|
+++ src/hb-ot-map-private.hh
|
|
@@ -52,8 +52,11 @@
|
|
unsigned int needs_fallback : 1;
|
|
unsigned int auto_zwj : 1;
|
|
|
|
- static int cmp (const feature_map_t *a, const feature_map_t *b)
|
|
- { return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0; }
|
|
+ static int cmp (void const * a_, void const * b_) {
|
|
+ feature_map_t const * a = static_cast<feature_map_t const *>(a_);
|
|
+ feature_map_t const * b = static_cast<feature_map_t const *>(b_);
|
|
+ return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0;
|
|
+ }
|
|
};
|
|
|
|
struct lookup_map_t {
|
|
--- src/hb-ot-tag.cc
|
|
+++ src/hb-ot-tag.cc
|
|
@@ -778,9 +778,11 @@
|
|
};
|
|
|
|
static int
|
|
-lang_compare_first_component (const char *a,
|
|
- const char *b)
|
|
+lang_compare_first_component (void const * a_,
|
|
+ void const * b_)
|
|
{
|
|
+ char const * a = static_cast<char const *>(a_);
|
|
+ char const * b = static_cast<char const *>(b_);
|
|
unsigned int da, db;
|
|
const char *p;
|
|
|
|
--- src/hb-private.hh
|
|
+++ src/hb-private.hh
|
|
@@ -466,6 +466,7 @@
|
|
template <typename T>
|
|
inline const Type *bsearch (T *key) const
|
|
{
|
|
+ if (len == 0) return NULL;
|
|
return (const Type *) ::bsearch (key, array, len, sizeof (Type), (hb_compare_func_t) Type::cmp);
|
|
}
|
|
|