src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh

rev 16297 : 8171248: Minor HarfBuzz fixes to pacify Coverity code scan

*** 687,697 ****
    {
      TRACE_COLLECT_GLYPHS (this);
      (this+coverage).add_coverage (c->input);
      unsigned int count = pairSet.len;
      for (unsigned int i = 0; i < count; i++)
!       (this+pairSet[i]).collect_glyphs (c, &valueFormat1);
    }
  
    inline const Coverage &get_coverage (void) const
    {
      return this+coverage;
--- 687,697 ----
    {
      TRACE_COLLECT_GLYPHS (this);
      (this+coverage).add_coverage (c->input);
      unsigned int count = pairSet.len;
      for (unsigned int i = 0; i < count; i++)
!       (this+pairSet[i]).collect_glyphs (c, valueFormat);
    }
  
    inline const Coverage &get_coverage (void) const
    {
      return this+coverage;
*** 706,729 ****
  
      hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
      skippy_iter.reset (buffer->idx, 1);
      if (!skippy_iter.next ()) return_trace (false);
  
!     return_trace ((this+pairSet[index]).apply (c, &valueFormat1, skippy_iter.idx));
    }
  
    inline bool sanitize (hb_sanitize_context_t *c) const
    {
      TRACE_SANITIZE (this);
  
      if (!c->check_struct (this)) return_trace (false);
  
!     unsigned int len1 = valueFormat1.get_len ();
!     unsigned int len2 = valueFormat2.get_len ();
      PairSet::sanitize_closure_t closure = {
        this,
!       &valueFormat1,
        len1,
        1 + len1 + len2
      };
  
      return_trace (coverage.sanitize (c, this) && pairSet.sanitize (c, this, &closure));
--- 706,729 ----
  
      hb_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
      skippy_iter.reset (buffer->idx, 1);
      if (!skippy_iter.next ()) return_trace (false);
  
!     return_trace ((this+pairSet[index]).apply (c, valueFormat, skippy_iter.idx));
    }
  
    inline bool sanitize (hb_sanitize_context_t *c) const
    {
      TRACE_SANITIZE (this);
  
      if (!c->check_struct (this)) return_trace (false);
  
!     unsigned int len1 = valueFormat[0].get_len ();
!     unsigned int len2 = valueFormat[1].get_len ();
      PairSet::sanitize_closure_t closure = {
        this,
!       valueFormat,
        len1,
        1 + len1 + len2
      };
  
      return_trace (coverage.sanitize (c, this) && pairSet.sanitize (c, this, &closure));
*** 732,745 ****
    protected:
    USHORT        format;                 /* Format identifier--format = 1 */
    OffsetTo<Coverage>
                  coverage;               /* Offset to Coverage table--from
                                           * beginning of subtable */
!   ValueFormat   valueFormat1;           /* Defines the types of data in
                                           * ValueRecord1--for the first glyph
                                           * in the pair--may be zero (0) */
!   ValueFormat   valueFormat2;           /* Defines the types of data in
                                           * ValueRecord2--for the second glyph
                                           * in the pair--may be zero (0) */
    OffsetArrayOf<PairSet>
                  pairSet;                /* Array of PairSet tables
                                           * ordered by Coverage Index */
--- 732,745 ----
    protected:
    USHORT        format;                 /* Format identifier--format = 1 */
    OffsetTo<Coverage>
                  coverage;               /* Offset to Coverage table--from
                                           * beginning of subtable */
!   ValueFormat   valueFormat[2];         /* [0] Defines the types of data in
                                           * ValueRecord1--for the first glyph
                                           * in the pair--may be zero (0) */
!                                         /* [1] Defines the types of data in
                                           * ValueRecord2--for the second glyph
                                           * in the pair--may be zero (0) */
    OffsetArrayOf<PairSet>
                  pairSet;                /* Array of PairSet tables
                                           * ordered by Coverage Index */