src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c

*** 1,24 ****
! /***************************************************************************/
! /*                                                                         */
! /*  ttsbit.c                                                               */
! /*                                                                         */
! /*    TrueType and OpenType embedded bitmap support (body).                */
! /*                                                                         */
! /*  Copyright 2005-2018 by                                                 */
! /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
! /*                                                                         */
! /*  Copyright 2013 by Google, Inc.                                         */
! /*  Google Author(s): Behdad Esfahbod.                                     */
! /*                                                                         */
! /*  This file is part of the FreeType project, and may only be used,       */
! /*  modified, and distributed under the terms of the FreeType project      */
! /*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
! /*  this file you indicate that you have read the license and              */
! /*  understand and accept it fully.                                        */
! /*                                                                         */
! /***************************************************************************/
  
  
  #include <ft2build.h>
  #include FT_INTERNAL_DEBUG_H
  #include FT_INTERNAL_STREAM_H
--- 1,24 ----
! /****************************************************************************
!  *
!  * ttsbit.c
!  *
!  *   TrueType and OpenType embedded bitmap support (body).
!  *
!  * Copyright (C) 2005-2019 by
!  * David Turner, Robert Wilhelm, and Werner Lemberg.
!  *
!  * Copyright 2013 by Google, Inc.
!  * Google Author(s): Behdad Esfahbod.
!  *
!  * This file is part of the FreeType project, and may only be used,
!  * modified, and distributed under the terms of the FreeType project
!  * license, LICENSE.TXT.  By continuing to use, modify, or distribute
!  * this file you indicate that you have read the license and
!  * understand and accept it fully.
!  *
!  */
  
  
  #include <ft2build.h>
  #include FT_INTERNAL_DEBUG_H
  #include FT_INTERNAL_STREAM_H
*** 34,51 ****
  
  #include "ttmtx.h"
  #include "pngshim.h"
  
  
!   /*************************************************************************/
!   /*                                                                       */
!   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
!   /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log  */
!   /* messages during execution.                                            */
!   /*                                                                       */
  #undef  FT_COMPONENT
! #define FT_COMPONENT  trace_ttsbit
  
  
    FT_LOCAL_DEF( FT_Error )
    tt_face_load_sbit( TT_Face    face,
                       FT_Stream  stream )
--- 34,51 ----
  
  #include "ttmtx.h"
  #include "pngshim.h"
  
  
!   /**************************************************************************
!    *
!    * The macro FT_COMPONENT is used in trace mode.  It is an implicit
!    * parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log
!    * messages during execution.
!    */
  #undef  FT_COMPONENT
! #define FT_COMPONENT  ttsbit
  
  
    FT_LOCAL_DEF( FT_Error )
    tt_face_load_sbit( TT_Face    face,
                       FT_Stream  stream )
*** 1012,1023 ****
                  num_components == 1 ? "" : "s" ));
  
      for ( nn = 0; nn < num_components; nn++ )
      {
        FT_UInt  gindex = FT_NEXT_USHORT( p );
!       FT_Byte  dx     = FT_NEXT_BYTE( p );
!       FT_Byte  dy     = FT_NEXT_BYTE( p );
  
  
        /* NB: a recursive call */
        error = tt_sbit_decoder_load_image( decoder,
                                            gindex,
--- 1012,1023 ----
                  num_components == 1 ? "" : "s" ));
  
      for ( nn = 0; nn < num_components; nn++ )
      {
        FT_UInt  gindex = FT_NEXT_USHORT( p );
!       FT_Char  dx     = FT_NEXT_CHAR( p );
!       FT_Char  dy     = FT_NEXT_CHAR( p );
  
  
        /* NB: a recursive call */
        error = tt_sbit_decoder_load_image( decoder,
                                            gindex,