summaryrefslogtreecommitdiff
path: root/modules/basic
diff options
context:
space:
mode:
Diffstat (limited to 'modules/basic')
-rw-r--r--modules/basic/basic-atsui.c2
-rw-r--r--modules/basic/basic-fc.c6
-rw-r--r--modules/basic/basic-win32.c4
-rw-r--r--modules/basic/basic-x.c8
4 files changed, 10 insertions, 10 deletions
diff --git a/modules/basic/basic-atsui.c b/modules/basic/basic-atsui.c
index 72d83db4..b394102c 100644
--- a/modules/basic/basic-atsui.c
+++ b/modules/basic/basic-atsui.c
@@ -160,7 +160,7 @@ basic_engine_shape (PangoEngineShape *engine,
if (pango_is_zero_width (wc))
{
- set_glyph (font, glyphs, i, p - text, PANGO_GLYPH_NULL);
+ set_glyph (font, glyphs, i, p - text, PANGO_GLYPH_EMPTY);
}
else
{
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index f73f1a56..5b8d90bf 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -166,13 +166,13 @@ fallback_shape (PangoEngineShape *engine,
if (pango_is_zero_width (wc))
{
- set_glyph (font, glyphs, i, p - text, PANGO_GLYPH_NULL);
+ set_glyph (font, glyphs, i, p - text, PANGO_GLYPH_EMPTY);
}
else
{
index = pango_fc_font_get_glyph (fc_font, wc);
- if (index == PANGO_GLYPH_NULL)
+ if (!index)
{
index = pango_fc_font_get_unknown_glyph (fc_font, wc);
set_glyph (font, glyphs, i, p - text, index);
@@ -382,7 +382,7 @@ basic_engine_shape (PangoEngineShape *engine,
if (pango_is_zero_width (wc)) /* Zero-width characters */
{
- pango_ot_buffer_add_glyph (buffer, 0, unknown_property, p - text);
+ pango_ot_buffer_add_glyph (buffer, PANGO_GLYPH_EMPTY, unknown_property, p - text);
}
else
{
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index 433eb21a..2b6c6017 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -1003,12 +1003,12 @@ basic_engine_shape (PangoEngineShape *engine,
if (pango_is_zero_width (wc))
{
- set_glyph (font, glyphs, i, p - text, PANGO_GLYPH_NULL);
+ set_glyph (font, glyphs, i, p - text, PANGO_GLYPH_EMPTY);
}
else
{
index = find_char (font, wc);
- if (index != PANGO_GLYPH_NULL)
+ if (index)
{
set_glyph (font, glyphs, i, p - text, index);
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c
index 1e0a66a0..ffd07329 100644
--- a/modules/basic/basic-x.c
+++ b/modules/basic/basic-x.c
@@ -284,7 +284,7 @@ find_char (CharCache *cache, PangoFont *font, gunichar wc, const char *input)
}
}
- return PANGO_GLYPH_NULL;
+ return 0;
}
static void
@@ -610,12 +610,12 @@ basic_engine_shape (PangoEngineShape *engine,
if (pango_is_zero_width (wc))
{
- set_glyph (font, glyphs, i, p - text, PANGO_GLYPH_NULL);
+ set_glyph (font, glyphs, i, p - text, PANGO_GLYPH_EMPTY);
}
else
{
index = find_char (cache, font, wc, input);
- if (index != PANGO_GLYPH_NULL)
+ if (index)
{
set_glyph (font, glyphs, i, p - text, index);
@@ -680,7 +680,7 @@ basic_engine_covers (PangoEngineShape *engine,
g_unichar_to_utf8 (wc, buf);
- return find_char (cache, font, wc, buf) != PANGO_GLYPH_NULL ? PANGO_COVERAGE_EXACT : PANGO_COVERAGE_NONE;
+ return find_char (cache, font, wc, buf) ? PANGO_COVERAGE_EXACT : PANGO_COVERAGE_NONE;
}
static void