| Index: third_party/harfbuzz-ng/src/hb-buffer-deserialize-json.hh
|
| diff --git a/third_party/harfbuzz-ng/src/hb-buffer-deserialize-json.hh b/third_party/harfbuzz-ng/src/hb-buffer-deserialize-json.hh
|
| index dead700db8289b8c873277d4ada568fbc771a844..3f626bda40d9a63730f81188631d6a789dd25174 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-buffer-deserialize-json.hh
|
| +++ b/third_party/harfbuzz-ng/src/hb-buffer-deserialize-json.hh
|
| @@ -1,5 +1,5 @@
|
|
|
| -#line 1 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 1 "hb-buffer-deserialize-json.rl"
|
| /*
|
| * Copyright © 2013 Google, Inc.
|
| *
|
| @@ -32,7 +32,7 @@
|
| #include "hb-private.hh"
|
|
|
|
|
| -#line 36 "hb-buffer-deserialize-json.hh.tmp"
|
| +#line 36 "hb-buffer-deserialize-json.hh"
|
| static const unsigned char _deserialize_json_trans_keys[] = {
|
| 0u, 0u, 9u, 123u, 9u, 34u, 97u, 103u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u,
|
| 48u, 57u, 9u, 125u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u,
|
| @@ -435,7 +435,7 @@ static const int deserialize_json_error = 0;
|
| static const int deserialize_json_en_main = 1;
|
|
|
|
|
| -#line 97 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 97 "hb-buffer-deserialize-json.rl"
|
|
|
|
|
| static hb_bool_t
|
| @@ -459,15 +459,15 @@ _hb_buffer_deserialize_glyphs_json (hb_buffer_t *buffer,
|
|
|
| const char *tok = NULL;
|
| int cs;
|
| - hb_glyph_info_t info;
|
| - hb_glyph_position_t pos;
|
| + hb_glyph_info_t info = {0};
|
| + hb_glyph_position_t pos = {0};
|
|
|
| -#line 466 "hb-buffer-deserialize-json.hh.tmp"
|
| +#line 466 "hb-buffer-deserialize-json.hh"
|
| {
|
| cs = deserialize_json_start;
|
| }
|
|
|
| -#line 471 "hb-buffer-deserialize-json.hh.tmp"
|
| +#line 471 "hb-buffer-deserialize-json.hh"
|
| {
|
| int _slen;
|
| int _trans;
|
| @@ -493,14 +493,14 @@ _resume:
|
|
|
| switch ( _deserialize_json_trans_actions[_trans] ) {
|
| case 1:
|
| -#line 38 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 38 "hb-buffer-deserialize-json.rl"
|
| {
|
| memset (&info, 0, sizeof (info));
|
| memset (&pos , 0, sizeof (pos ));
|
| }
|
| break;
|
| case 5:
|
| -#line 43 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 43 "hb-buffer-deserialize-json.rl"
|
| {
|
| buffer->add_info (info);
|
| if (buffer->in_error)
|
| @@ -510,13 +510,13 @@ _resume:
|
| }
|
| break;
|
| case 2:
|
| -#line 51 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 51 "hb-buffer-deserialize-json.rl"
|
| {
|
| tok = p;
|
| }
|
| break;
|
| case 14:
|
| -#line 55 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 55 "hb-buffer-deserialize-json.rl"
|
| {
|
| if (!hb_font_glyph_from_string (font,
|
| tok, p - tok,
|
| @@ -525,33 +525,33 @@ _resume:
|
| }
|
| break;
|
| case 15:
|
| -#line 62 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 62 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_uint (tok, p, &info.codepoint)) return false; }
|
| break;
|
| case 8:
|
| -#line 63 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 63 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_uint (tok, p, &info.cluster )) return false; }
|
| break;
|
| case 10:
|
| -#line 64 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 64 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_int (tok, p, &pos.x_offset )) return false; }
|
| break;
|
| case 12:
|
| -#line 65 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 65 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_int (tok, p, &pos.y_offset )) return false; }
|
| break;
|
| case 3:
|
| -#line 66 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 66 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_int (tok, p, &pos.x_advance)) return false; }
|
| break;
|
| case 6:
|
| -#line 67 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 67 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_int (tok, p, &pos.y_advance)) return false; }
|
| break;
|
| case 16:
|
| -#line 62 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 62 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_uint (tok, p, &info.codepoint)) return false; }
|
| -#line 43 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 43 "hb-buffer-deserialize-json.rl"
|
| {
|
| buffer->add_info (info);
|
| if (buffer->in_error)
|
| @@ -561,9 +561,9 @@ _resume:
|
| }
|
| break;
|
| case 9:
|
| -#line 63 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 63 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_uint (tok, p, &info.cluster )) return false; }
|
| -#line 43 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 43 "hb-buffer-deserialize-json.rl"
|
| {
|
| buffer->add_info (info);
|
| if (buffer->in_error)
|
| @@ -573,9 +573,9 @@ _resume:
|
| }
|
| break;
|
| case 11:
|
| -#line 64 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 64 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_int (tok, p, &pos.x_offset )) return false; }
|
| -#line 43 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 43 "hb-buffer-deserialize-json.rl"
|
| {
|
| buffer->add_info (info);
|
| if (buffer->in_error)
|
| @@ -585,9 +585,9 @@ _resume:
|
| }
|
| break;
|
| case 13:
|
| -#line 65 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 65 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_int (tok, p, &pos.y_offset )) return false; }
|
| -#line 43 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 43 "hb-buffer-deserialize-json.rl"
|
| {
|
| buffer->add_info (info);
|
| if (buffer->in_error)
|
| @@ -597,9 +597,9 @@ _resume:
|
| }
|
| break;
|
| case 4:
|
| -#line 66 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 66 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_int (tok, p, &pos.x_advance)) return false; }
|
| -#line 43 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 43 "hb-buffer-deserialize-json.rl"
|
| {
|
| buffer->add_info (info);
|
| if (buffer->in_error)
|
| @@ -609,9 +609,9 @@ _resume:
|
| }
|
| break;
|
| case 7:
|
| -#line 67 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 67 "hb-buffer-deserialize-json.rl"
|
| { if (!parse_int (tok, p, &pos.y_advance)) return false; }
|
| -#line 43 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 43 "hb-buffer-deserialize-json.rl"
|
| {
|
| buffer->add_info (info);
|
| if (buffer->in_error)
|
| @@ -620,7 +620,7 @@ _resume:
|
| *end_ptr = p;
|
| }
|
| break;
|
| -#line 624 "hb-buffer-deserialize-json.hh.tmp"
|
| +#line 624 "hb-buffer-deserialize-json.hh"
|
| }
|
|
|
| _again:
|
| @@ -632,7 +632,7 @@ _again:
|
| _out: {}
|
| }
|
|
|
| -#line 125 "../../src/hb-buffer-deserialize-json.rl"
|
| +#line 125 "hb-buffer-deserialize-json.rl"
|
|
|
|
|
| *end_ptr = p;
|
|
|