[pango] [HB] Remove a few 'inline's, though the compiler mostly ignores them
- From: Behdad Esfahbod <behdad src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pango] [HB] Remove a few 'inline's, though the compiler mostly ignores them
- Date: Thu, 6 Aug 2009 19:29:56 +0000 (UTC)
commit d653b893b1cf5def17dda4dbcb1e0e70e8f1bae2
Author: Behdad Esfahbod <behdad behdad org>
Date: Thu Aug 6 14:28:18 2009 -0400
[HB] Remove a few 'inline's, though the compiler mostly ignores them
pango/opentype/hb-open-file-private.hh | 1 -
pango/opentype/hb-open-type-private.hh | 16 ++++++++--------
pango/opentype/hb-ot-layout-gsubgpos-private.hh | 6 +++---
3 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/pango/opentype/hb-open-file-private.hh b/pango/opentype/hb-open-file-private.hh
index 03d9e14..0d4912a 100644
--- a/pango/opentype/hb-open-file-private.hh
+++ b/pango/opentype/hb-open-file-private.hh
@@ -120,7 +120,6 @@ struct TTCHeader
if (version.major < 1 || version.major > 2) return true;
/* XXX Maybe we shouldn't NEUTER these offsets, they may cause a full copy of
* the whole font right now. */
- //if (!table.sanitize (SANITIZE_ARG)) return false;
return table.sanitize (SANITIZE_ARG, CONST_CHARP(this), CONST_CHARP(this));
}
diff --git a/pango/opentype/hb-open-type-private.hh b/pango/opentype/hb-open-type-private.hh
index 8c01c68..e580203 100644
--- a/pango/opentype/hb-open-type-private.hh
+++ b/pango/opentype/hb-open-type-private.hh
@@ -499,21 +499,21 @@ struct GenericOffsetTo : OffsetType
return CONST_CAST(Type, *CONST_CHARP(base), offset);
}
- inline bool sanitize (SANITIZE_ARG_DEF, const void *base) {
+ bool sanitize (SANITIZE_ARG_DEF, const void *base) {
SANITIZE_DEBUG ();
if (!SANITIZE_OBJ (*this)) return false;
unsigned int offset = *this;
if (HB_UNLIKELY (!offset)) return true;
return SANITIZE (CAST(Type, *DECONST_CHARP(base), offset)) || NEUTER (DECONST_CAST(OffsetType,*this,0), 0);
}
- inline bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) {
+ bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) {
SANITIZE_DEBUG ();
if (!SANITIZE_OBJ (*this)) return false;
unsigned int offset = *this;
if (HB_UNLIKELY (!offset)) return true;
return SANITIZE_BASE (CAST(Type, *DECONST_CHARP(base), offset), base2) || NEUTER (DECONST_CAST(OffsetType,*this,0), 0);
}
- inline bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) {
+ bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) {
SANITIZE_DEBUG ();
if (!SANITIZE_OBJ (*this)) return false;
unsigned int offset = *this;
@@ -544,7 +544,7 @@ struct GenericArrayOf
inline unsigned int get_size () const
{ return sizeof (len) + len * sizeof (array[0]); }
- inline bool sanitize (SANITIZE_ARG_DEF) {
+ bool sanitize (SANITIZE_ARG_DEF) {
SANITIZE_DEBUG ();
if (!SANITIZE_GET_SIZE()) return false;
/* Note; for non-recursive types, this is not much needed
@@ -555,7 +555,7 @@ struct GenericArrayOf
*/
return true;
}
- inline bool sanitize (SANITIZE_ARG_DEF, const void *base) {
+ bool sanitize (SANITIZE_ARG_DEF, const void *base) {
SANITIZE_DEBUG ();
if (!SANITIZE_GET_SIZE()) return false;
unsigned int count = len;
@@ -564,7 +564,7 @@ struct GenericArrayOf
return false;
return true;
}
- inline bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) {
+ bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) {
SANITIZE_DEBUG ();
if (!SANITIZE_GET_SIZE()) return false;
unsigned int count = len;
@@ -573,7 +573,7 @@ struct GenericArrayOf
return false;
return true;
}
- inline bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) {
+ bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) {
SANITIZE_DEBUG ();
if (!SANITIZE_GET_SIZE()) return false;
unsigned int count = len;
@@ -620,7 +620,7 @@ struct HeadlessArrayOf
inline unsigned int get_size () const
{ return sizeof (len) + (len ? len - 1 : 0) * sizeof (array[0]); }
- inline bool sanitize (SANITIZE_ARG_DEF) {
+ bool sanitize (SANITIZE_ARG_DEF) {
SANITIZE_DEBUG ();
if (!SANITIZE_GET_SIZE()) return false;
/* Note; for non-recursive types, this is not much needed
diff --git a/pango/opentype/hb-ot-layout-gsubgpos-private.hh b/pango/opentype/hb-ot-layout-gsubgpos-private.hh
index 6fce03a..63ae463 100644
--- a/pango/opentype/hb-ot-layout-gsubgpos-private.hh
+++ b/pango/opentype/hb-ot-layout-gsubgpos-private.hh
@@ -449,7 +449,7 @@ struct Context
}
}
- inline bool sanitize (SANITIZE_ARG_DEF) {
+ bool sanitize (SANITIZE_ARG_DEF) {
SANITIZE_DEBUG ();
if (!SANITIZE (u.format)) return false;
switch (u.format) {
@@ -756,7 +756,7 @@ struct ChainContext
}
}
- inline bool sanitize (SANITIZE_ARG_DEF) {
+ bool sanitize (SANITIZE_ARG_DEF) {
SANITIZE_DEBUG ();
if (!SANITIZE (u.format)) return false;
switch (u.format) {
@@ -826,7 +826,7 @@ struct Extension
}
}
- inline bool sanitize (SANITIZE_ARG_DEF) {
+ bool sanitize (SANITIZE_ARG_DEF) {
SANITIZE_DEBUG ();
if (!SANITIZE (u.format)) return false;
switch (u.format) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]