src/share/native/sun/font/layout/ClassDefinitionTables.h

rev 663 : 6501644: sync LayoutEngine *code* structure to match ICU
Reviewed-by: prr, omajid
rev 665 : 8001031: Better font processing.
Reviewed-by: vadim, prr, mschoene, omajid

*** 30,59 ****
   */
  
  #ifndef __CLASSDEFINITIONTABLES_H
  #define __CLASSDEFINITIONTABLES_H
  
  #include "LETypes.h"
  #include "OpenTypeTables.h"
  
  struct ClassDefinitionTable
  {
      le_uint16 classFormat;
  
!     le_int32  getGlyphClass(LEGlyphID glyphID) const;
!     le_bool   hasGlyphClass(le_int32 glyphClass) const;
  };
  
  struct ClassDefFormat1Table : ClassDefinitionTable
  {
      TTGlyphID  startGlyph;
      le_uint16  glyphCount;
      le_uint16  classValueArray[ANY_NUMBER];
  
!     le_int32 getGlyphClass(LEGlyphID glyphID) const;
!     le_bool  hasGlyphClass(le_int32 glyphClass) const;
  };
  
  struct ClassRangeRecord
  {
      TTGlyphID start;
      TTGlyphID end;
--- 30,80 ----
   */
  
  #ifndef __CLASSDEFINITIONTABLES_H
  #define __CLASSDEFINITIONTABLES_H
  
+ /**
+  * \file
+  * \internal
+  */
+ 
  #include "LETypes.h"
  #include "OpenTypeTables.h"
  
+ U_NAMESPACE_BEGIN
+ 
  struct ClassDefinitionTable
  {
      le_uint16 classFormat;
  
!     le_int32  getGlyphClass(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const;
!     le_bool   hasGlyphClass(const LETableReference &base, le_int32 glyphClass, LEErrorCode &success) const;
! 
!   le_int32 getGlyphClass(LEGlyphID glyphID) const {
!     LETableReference base((const le_uint8*)this);
!     LEErrorCode ignored = LE_NO_ERROR;
!     return getGlyphClass(base,glyphID,ignored);
!   }
! 
!   le_bool hasGlyphClass(le_int32 glyphClass) const {
!     LETableReference base((const le_uint8*)this);
!     LEErrorCode ignored = LE_NO_ERROR;
!     return hasGlyphClass(base,glyphClass,ignored);
!   }
  };
  
  struct ClassDefFormat1Table : ClassDefinitionTable
  {
      TTGlyphID  startGlyph;
      le_uint16  glyphCount;
      le_uint16  classValueArray[ANY_NUMBER];
  
!     le_int32 getGlyphClass(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const;
!     le_bool  hasGlyphClass(const LETableReference &base, le_int32 glyphClass, LEErrorCode &success) const;
  };
+ LE_VAR_ARRAY(ClassDefFormat1Table, classValueArray)
+ 
  
  struct ClassRangeRecord
  {
      TTGlyphID start;
      TTGlyphID end;
*** 63,72 ****
  struct ClassDefFormat2Table : ClassDefinitionTable
  {
      le_uint16        classRangeCount;
      GlyphRangeRecord classRangeRecordArray[ANY_NUMBER];
  
!     le_int32 getGlyphClass(LEGlyphID glyphID) const;
!     le_bool hasGlyphClass(le_int32 glyphClass) const;
  };
  
  #endif
--- 84,95 ----
  struct ClassDefFormat2Table : ClassDefinitionTable
  {
      le_uint16        classRangeCount;
      GlyphRangeRecord classRangeRecordArray[ANY_NUMBER];
  
!     le_int32 getGlyphClass(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const;
!     le_bool hasGlyphClass(const LETableReference &base, le_int32 glyphClass, LEErrorCode &success) const;
  };
+ LE_VAR_ARRAY(ClassDefFormat2Table, classRangeRecordArray)
  
+ U_NAMESPACE_END
  #endif