projects
/
profile
/
ivi
/
org.tizen.video-player.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
281f59b
)
Remove the IN_CURINFO() macro
author
Behdad Esfahbod
<behdad@behdad.org>
Sat, 15 May 2010 01:37:18 +0000
(21:37 -0400)
committer
Behdad Esfahbod
<behdad@behdad.org>
Sat, 15 May 2010 01:37:18 +0000
(21:37 -0400)
src/hb-buffer-private.hh
patch
|
blob
|
history
src/hb-ot-layout-gpos-private.hh
patch
|
blob
|
history
src/hb-ot-layout-gsub-private.hh
patch
|
blob
|
history
src/hb-ot-layout-gsubgpos-private.hh
patch
|
blob
|
history
diff --git
a/src/hb-buffer-private.hh
b/src/hb-buffer-private.hh
index
223f935
..
fa5ac55
100644
(file)
--- a/
src/hb-buffer-private.hh
+++ b/
src/hb-buffer-private.hh
@@
-157,7
+157,6
@@
struct _hb_buffer_t {
/* convenience macros */
#define IN_CURGLYPH() (BUFFER->in_string[BUFFER->in_pos].codepoint)
/* convenience macros */
#define IN_CURGLYPH() (BUFFER->in_string[BUFFER->in_pos].codepoint)
-#define IN_CURINFO() (&BUFFER->in_string[BUFFER->in_pos])
HB_END_DECLS
HB_END_DECLS
diff --git
a/src/hb-ot-layout-gpos-private.hh
b/src/hb-ot-layout-gpos-private.hh
index
d0a01da
..
0e97d93
100644
(file)
--- a/
src/hb-ot-layout-gpos-private.hh
+++ b/
src/hb-ot-layout-gpos-private.hh
@@
-1517,7
+1517,7
@@
struct PosLookup : Lookup
c->nesting_level_left = nesting_level_left;
c->lookup_flag = get_flag ();
c->nesting_level_left = nesting_level_left;
c->lookup_flag = get_flag ();
- if (!_hb_ot_layout_check_glyph_property (c->layout->face,
IN_CURINFO ()
, c->lookup_flag, &c->property))
+ if (!_hb_ot_layout_check_glyph_property (c->layout->face,
&c->buffer->in_string[c->buffer->in_pos]
, c->lookup_flag, &c->property))
return false;
for (unsigned int i = 0; i < get_subtable_count (); i++)
return false;
for (unsigned int i = 0; i < get_subtable_count (); i++)
diff --git
a/src/hb-ot-layout-gsub-private.hh
b/src/hb-ot-layout-gsub-private.hh
index
ff3a82e
..
90d5b58
100644
(file)
--- a/
src/hb-ot-layout-gsub-private.hh
+++ b/
src/hb-ot-layout-gsub-private.hh
@@
-419,7
+419,7
@@
struct Ligature
for ( i = 1; i < count; i++ )
{
for ( i = 1; i < count; i++ )
{
- while (_hb_ot_layout_skip_mark (c->layout->face,
IN_CURINFO ()
, c->lookup_flag, NULL))
+ while (_hb_ot_layout_skip_mark (c->layout->face,
&c->buffer->in_string[c->buffer->in_pos]
, c->lookup_flag, NULL))
c->buffer->add_output_glyph (IN_CURGLYPH (), i, lig_id);
(c->buffer->in_pos)++;
c->buffer->add_output_glyph (IN_CURGLYPH (), i, lig_id);
(c->buffer->in_pos)++;
@@
-793,7
+793,7
@@
struct SubstLookup : Lookup
c->nesting_level_left = nesting_level_left;
c->lookup_flag = get_flag ();
c->nesting_level_left = nesting_level_left;
c->lookup_flag = get_flag ();
- if (!_hb_ot_layout_check_glyph_property (c->layout->face,
IN_CURINFO ()
, c->lookup_flag, &c->property))
+ if (!_hb_ot_layout_check_glyph_property (c->layout->face,
&c->buffer->in_string[c->buffer->in_pos]
, c->lookup_flag, &c->property))
return false;
if (unlikely (lookup_type == SubstLookupSubTable::Extension))
return false;
if (unlikely (lookup_type == SubstLookupSubTable::Extension))
diff --git
a/src/hb-ot-layout-gsubgpos-private.hh
b/src/hb-ot-layout-gsubgpos-private.hh
index
7340206
..
14e769d
100644
(file)
--- a/
src/hb-ot-layout-gsubgpos-private.hh
+++ b/
src/hb-ot-layout-gsubgpos-private.hh
@@
-203,7
+203,7
@@
static inline bool apply_lookup (hb_apply_context_t *c,
*/
for (unsigned int i = 0; i < count; /* NOP */)
{
*/
for (unsigned int i = 0; i < count; /* NOP */)
{
- while (_hb_ot_layout_skip_mark (c->layout->face,
IN_CURINFO ()
, c->lookup_flag, NULL))
+ while (_hb_ot_layout_skip_mark (c->layout->face,
&c->buffer->in_string[c->buffer->in_pos]
, c->lookup_flag, NULL))
{
if (unlikely (c->buffer->in_pos == end))
return true;
{
if (unlikely (c->buffer->in_pos == end))
return true;