diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2012-08-27 23:43:38 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2012-08-28 00:05:19 -0400 |
| commit | 4105e20d799a80f9c0c2befdef8f458ee11654a6 (patch) | |
| tree | e98bb1e985584a28267af6e892471c3617053665 /pango/break.c | |
| parent | 26bbf750ab0754c113722e87942174cf2953dad4 (diff) | |
| download | pango-4105e20d799a80f9c0c2befdef8f458ee11654a6.tar.gz | |
More churn
Diffstat (limited to 'pango/break.c')
| -rw-r--r-- | pango/break.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pango/break.c b/pango/break.c index 58d57d4b..c624fbe3 100644 --- a/pango/break.c +++ b/pango/break.c @@ -1871,8 +1871,8 @@ pango_get_log_attrs (const char *text, const char *range_start, *range_end; PangoScript script; PangoEngineLang *range_engine; - static guint engine_type_id = 0; - static guint render_type_id = 0; + static guint engine_type_id = 0; /* MT-safe */ + static guint render_type_id = 0; /* MT-safe */ PangoAnalysis analysis = { NULL }; PangoScriptIter iter; @@ -1884,10 +1884,9 @@ pango_get_log_attrs (const char *text, pango_default_break (text, length, &analysis, log_attrs, attrs_len); if (engine_type_id == 0) - { - engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_LANG); - render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_NONE); - } + engine_type_id = g_quark_from_static_string (PANGO_ENGINE_TYPE_LANG); + if (render_type_id == 0) + render_type_id = g_quark_from_static_string (PANGO_RENDER_TYPE_NONE); lang_map = pango_find_map (language, engine_type_id, render_type_id); |