| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright © 2007,2008,2009 Red Hat, Inc. | 2 * Copyright © 2007,2008,2009 Red Hat, Inc. |
| 3 * Copyright © 2012,2013 Google, Inc. | 3 * Copyright © 2012,2013 Google, Inc. |
| 4 * | 4 * |
| 5 * This is part of HarfBuzz, a text shaping library. | 5 * This is part of HarfBuzz, a text shaping library. |
| 6 * | 6 * |
| 7 * Permission is hereby granted, without written agreement and without | 7 * Permission is hereby granted, without written agreement and without |
| 8 * license or royalty fees, to use, copy, modify, and distribute this | 8 * license or royalty fees, to use, copy, modify, and distribute this |
| 9 * software and its documentation for any purpose, provided that the | 9 * software and its documentation for any purpose, provided that the |
| 10 * above copyright notice and the following two paragraphs appear in | 10 * above copyright notice and the following two paragraphs appear in |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 } | 510 } |
| 511 | 511 |
| 512 static inline void | 512 static inline void |
| 513 _hb_glyph_info_clear_ligated_and_multiplied (hb_glyph_info_t *info) | 513 _hb_glyph_info_clear_ligated_and_multiplied (hb_glyph_info_t *info) |
| 514 { | 514 { |
| 515 info->glyph_props() &= ~(HB_OT_LAYOUT_GLYPH_PROPS_LIGATED | | 515 info->glyph_props() &= ~(HB_OT_LAYOUT_GLYPH_PROPS_LIGATED | |
| 516 HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED); | 516 HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED); |
| 517 } | 517 } |
| 518 | 518 |
| 519 static inline void | 519 static inline void |
| 520 _hb_glyph_info_clear_substituted_and_ligated_and_multiplied (hb_glyph_info_t *in
fo) | 520 _hb_glyph_info_clear_substituted (hb_glyph_info_t *info) |
| 521 { | 521 { |
| 522 info->glyph_props() &= ~(HB_OT_LAYOUT_GLYPH_PROPS_SUBSTITUTED | | 522 info->glyph_props() &= ~(HB_OT_LAYOUT_GLYPH_PROPS_SUBSTITUTED); |
| 523 » » » HB_OT_LAYOUT_GLYPH_PROPS_LIGATED | | |
| 524 » » » HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED); | |
| 525 } | 523 } |
| 526 | 524 |
| 527 | 525 |
| 528 /* Allocation / deallocation. */ | 526 /* Allocation / deallocation. */ |
| 529 | 527 |
| 530 static inline void | 528 static inline void |
| 531 _hb_buffer_allocate_unicode_vars (hb_buffer_t *buffer) | 529 _hb_buffer_allocate_unicode_vars (hb_buffer_t *buffer) |
| 532 { | 530 { |
| 533 HB_BUFFER_ALLOCATE_VAR (buffer, unicode_props); | 531 HB_BUFFER_ALLOCATE_VAR (buffer, unicode_props); |
| 534 } | 532 } |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 570 } | 568 } |
| 571 | 569 |
| 572 /* Make sure no one directly touches our props... */ | 570 /* Make sure no one directly touches our props... */ |
| 573 #undef unicode_props0 | 571 #undef unicode_props0 |
| 574 #undef unicode_props1 | 572 #undef unicode_props1 |
| 575 #undef lig_props | 573 #undef lig_props |
| 576 #undef glyph_props | 574 #undef glyph_props |
| 577 | 575 |
| 578 | 576 |
| 579 #endif /* HB_OT_LAYOUT_PRIVATE_HH */ | 577 #endif /* HB_OT_LAYOUT_PRIVATE_HH */ |
| OLD | NEW |