organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-06 05:55:06 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

Revert "Fixing compiler warnings"

Browse source 
This reverts commit 61a1ba2ff0.
This commit is contained in:
Behdad Esfahbod 2024-03-14 12:34:39 -06:00
parent 61a1ba2ff0
commit 595def8fb8
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/OT/glyf/glyf-helpers.hh
View file

@ -5,7 +5,6 @@
#include "../../hb-open-type.hh"
#include "../../hb-subset-plan.hh"
#include "inttypes.h"
#include "loca.hh"
@ -39,7 +38,7 @@ _write_loca (IteratorIn&& it,
unsigned padded_size = *it++;
offset += padded_size;
DEBUG_MSG (SUBSET, nullptr, "loca entry gid %" PRIu32 " offset %u padded-size %u", gid, offset, padded_size);
DEBUG_MSG (SUBSET, nullptr, "loca entry gid %u offset %u padded-size %u", gid, offset, padded_size);
value = offset >> right_shift;
*dest++ = value;

3
src/hb-common.cc
View file

@ -28,7 +28,6 @@
#include "hb.hh"
#include "hb-machinery.hh"
#include "inttypes.h"
/**
@ -997,7 +996,7 @@ hb_feature_to_string (hb_feature_t *feature,
if (feature->value > 1)
{
s[len++] = '=';
len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%" PRIu32 "", feature->value));
len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%u", feature->value));
}
assert (len < ARRAY_LENGTH (s));
len = hb_min (len, size - 1);

3
src/hb-font.hh
View file

@ -33,7 +33,6 @@
#include "hb-face.hh"
#include "hb-shaper.hh"
#include "inttypes.h"
/*
@ -652,7 +651,7 @@ struct hb_font_t
{
if (get_glyph_name (glyph, s, size)) return;
if (size && snprintf (s, size, "gid%" PRIu32 "", glyph) < 0)
if (size && snprintf (s, size, "gid%u", glyph) < 0)
*s = '\0';
}

10
src/hb-ot-shaper-arabic.cc
View file

@ -30,7 +30,7 @@
#include "hb-ot-shaper-arabic.hh"
#include "hb-ot-shape.hh"
#include "inttypes.h"
/* buffer var allocations */
#define arabic_shaping_action() ot_shaper_var_u8_auxiliary() /* arabic shaping action */
@ -560,9 +560,9 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED,
DEBUG_MSG (ARABIC, nullptr, "%s stretch at (%u,%u,%u)",
step == MEASURE ? "measuring" : "cutting", context, start, end);
DEBUG_MSG (ARABIC, nullptr, "rest of word: count=%u width %" PRId32 "", start - context, w_total);
DEBUG_MSG (ARABIC, nullptr, "fixed tiles: count=%d width=%" PRId32 "", n_fixed, w_fixed);
DEBUG_MSG (ARABIC, nullptr, "repeating tiles: count=%d width=%" PRId32 "", n_repeating, w_repeating);
DEBUG_MSG (ARABIC, nullptr, "rest of word: count=%u width %d", start - context, w_total);
DEBUG_MSG (ARABIC, nullptr, "fixed tiles: count=%d width=%d", n_fixed, w_fixed);
DEBUG_MSG (ARABIC, nullptr, "repeating tiles: count=%d width=%d", n_repeating, w_repeating);
/* Number of additional times to repeat each repeating tile. */
int n_copies = 0;
@ -602,7 +602,7 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED,
if (info[k - 1].arabic_shaping_action() == STCH_REPEATING)
repeat += n_copies;
DEBUG_MSG (ARABIC, nullptr, "appending %u copies of glyph %" PRIu32 "; j=%u",
DEBUG_MSG (ARABIC, nullptr, "appending %u copies of glyph %u; j=%u",
repeat, info[k - 1].codepoint, j);
pos[k - 1].x_advance = 0;
for (unsigned int n = 0; n < repeat; n++)

3
src/hb-ot-tag.cc
View file

@ -27,7 +27,6 @@
*/
#include "hb.hh"
#include "inttypes.h"
#ifndef HB_NO_OT_TAG
@ -548,7 +547,7 @@ hb_ot_tag_to_language (hb_tag_t tag)
buf[3] = '-';
str += 4;
}
snprintf (str, 16, "x-hbot-%08" PRIx32 "", tag);
snprintf (str, 16, "x-hbot-%08x", tag);
return hb_language_from_string (&*buf, -1);
}
}