walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Whitespace

This commit is contained in:
Behdad Esfahbod 2012-06-08 10:23:03 -04:00
parent 8e7beba7c3
commit 0dd86f9f68
1 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/hb-uniscribe.cc
View File

@ -342,78 +342,78 @@ retry:
bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
for (unsigned int j = 0; j < item_count; j++) for (unsigned int j = 0; j < item_count; j++)
{ {
unsigned int i = backward ? item_count - 1 - j : j; unsigned int i = backward ? item_count - 1 - j : j;
unsigned int chars_offset = items[i].iCharPos; unsigned int chars_offset = items[i].iCharPos;
unsigned int item_chars_len = items[i + 1].iCharPos - chars_offset; unsigned int item_chars_len = items[i + 1].iCharPos - chars_offset;
OPENTYPE_TAG script_tag; OPENTYPE_TAG script_tag;
/* We ignore what script tag Uniscribe chose, except to differentiate /* We ignore what script tag Uniscribe chose, except to differentiate
* between old/new tags. Not sure if this picks DFLT up correctly... * between old/new tags. Not sure if this picks DFLT up correctly...
* This also screws things up as the item.analysis also has an opaque * This also screws things up as the item.analysis also has an opaque
* script member. */ * script member. */
if (script_tags[i] == hb_uint32_swap (buffer_script_tags[1])) if (script_tags[i] == hb_uint32_swap (buffer_script_tags[1]))
script_tag = hb_uint32_swap (buffer_script_tags[1]); script_tag = hb_uint32_swap (buffer_script_tags[1]);
else else
script_tag = hb_uint32_swap (buffer_script_tags[0]); script_tag = hb_uint32_swap (buffer_script_tags[0]);
hr = ScriptShapeOpenType (font_data->hdc, hr = ScriptShapeOpenType (font_data->hdc,
&font_data->script_cache, &font_data->script_cache,
&items[i].a, &items[i].a,
script_tag, script_tag,
language_tag, language_tag,
range_char_counts, range_char_counts,
range_properties, range_properties,
range_count, range_count,
wchars + chars_offset, wchars + chars_offset,
item_chars_len, item_chars_len,
glyphs_size - glyphs_offset, glyphs_size - glyphs_offset,
/* out */ /* out */
log_clusters + chars_offset, log_clusters + chars_offset,
char_props + chars_offset, char_props + chars_offset,
glyphs + glyphs_offset, glyphs + glyphs_offset,
glyph_props + glyphs_offset, glyph_props + glyphs_offset,
(int *) &glyphs_len); (int *) &glyphs_len);
for (unsigned int j = chars_offset; j < chars_offset + item_chars_len; j++) for (unsigned int j = chars_offset; j < chars_offset + item_chars_len; j++)
log_clusters[j] += glyphs_offset; log_clusters[j] += glyphs_offset;
if (unlikely (items[i].a.fNoGlyphIndex)) if (unlikely (items[i].a.fNoGlyphIndex))
FAIL ("ScriptShapeOpenType() set fNoGlyphIndex"); FAIL ("ScriptShapeOpenType() set fNoGlyphIndex");
if (unlikely (hr == E_OUTOFMEMORY)) if (unlikely (hr == E_OUTOFMEMORY))
{ {
buffer->ensure (buffer->allocated * 2); buffer->ensure (buffer->allocated * 2);
if (buffer->in_error) if (buffer->in_error)
FAIL ("Buffer resize failed"); FAIL ("Buffer resize failed");
goto retry; goto retry;
} }
if (unlikely (hr == USP_E_SCRIPT_NOT_IN_FONT)) if (unlikely (hr == USP_E_SCRIPT_NOT_IN_FONT))
FAIL ("ScriptShapeOpenType() failed: Font doesn't support script"); FAIL ("ScriptShapeOpenType() failed: Font doesn't support script");
if (unlikely (FAILED (hr))) if (unlikely (FAILED (hr)))
FAIL ("ScriptShapeOpenType() failed: 0x%08xL", hr); FAIL ("ScriptShapeOpenType() failed: 0x%08xL", hr);
hr = ScriptPlaceOpenType (font_data->hdc, hr = ScriptPlaceOpenType (font_data->hdc,
&font_data->script_cache, &font_data->script_cache,
&items[i].a, &items[i].a,
script_tag, script_tag,
language_tag, language_tag,
range_char_counts, range_char_counts,
range_properties, range_properties,
range_count, range_count,
wchars + chars_offset, wchars + chars_offset,
log_clusters + chars_offset, log_clusters + chars_offset,
char_props + chars_offset, char_props + chars_offset,
item_chars_len, item_chars_len,
glyphs + glyphs_offset, glyphs + glyphs_offset,
glyph_props + glyphs_offset, glyph_props + glyphs_offset,
glyphs_len, glyphs_len,
/* out */ /* out */
advances + glyphs_offset, advances + glyphs_offset,
offsets + glyphs_offset, offsets + glyphs_offset,
NULL); NULL);
if (unlikely (FAILED (hr))) if (unlikely (FAILED (hr)))
FAIL ("ScriptPlaceOpenType() failed: 0x%08xL", hr); FAIL ("ScriptPlaceOpenType() failed: 0x%08xL", hr);
glyphs_offset += glyphs_len; glyphs_offset += glyphs_len;
} }
glyphs_len = glyphs_offset; glyphs_len = glyphs_offset;