src/java.desktop/share/native/libfreetype/src/psnames/psmodule.c

*** 1,21 ****
! /***************************************************************************/
! /*                                                                         */
! /*  psmodule.c                                                             */
! /*                                                                         */
! /*    PSNames module implementation (body).                                */
! /*                                                                         */
! /*  Copyright 1996-2018 by                                                 */
! /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
! /*                                                                         */
! /*  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_OBJECTS_H
--- 1,21 ----
! /****************************************************************************
!  *
!  * psmodule.c
!  *
!  *   psnames module implementation (body).
!  *
!  * Copyright (C) 1996-2019 by
!  * David Turner, Robert Wilhelm, and Werner Lemberg.
!  *
!  * 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_OBJECTS_H
*** 39,49 ****
  #define  DEFINE_PS_TABLES
  #define  DEFINE_PS_TABLES_DATA
  #include "pstables.h"
  
  #include "psnamerr.h"
- #include "pspic.h"
  
  
  #ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
  
  
--- 39,48 ----
*** 391,401 ****
        else
        {
          /* Reallocate if the number of used entries is much smaller. */
          if ( count < num_glyphs / 2 )
          {
!           (void)FT_RENEW_ARRAY( table->maps, num_glyphs, count );
            error = FT_Err_Ok;
          }
  
          /* Sort the table in increasing order of unicode values, */
          /* taking care of glyph variants.                        */
--- 390,402 ----
        else
        {
          /* Reallocate if the number of used entries is much smaller. */
          if ( count < num_glyphs / 2 )
          {
!           (void)FT_RENEW_ARRAY( table->maps,
!                                 num_glyphs + EXTRA_GLYPH_LIST_SIZE,
!                                 count );
            error = FT_Err_Ok;
          }
  
          /* Sort the table in increasing order of unicode values, */
          /* taking care of glyph variants.                        */
*** 575,606 ****
  
  
    FT_DEFINE_SERVICEDESCREC1(
      pscmaps_services,
  
!     FT_SERVICE_ID_POSTSCRIPT_CMAPS, &PSCMAPS_INTERFACE_GET )
  
  
    static FT_Pointer
    psnames_get_service( FT_Module    module,
                         const char*  service_id )
    {
-     /* PSCMAPS_SERVICES_GET dereferences `library' in PIC mode */
- #ifdef FT_CONFIG_OPTION_PIC
-     FT_Library  library;
- 
- 
-     if ( !module )
-       return NULL;
-     library = module->library;
-     if ( !library )
-       return NULL;
- #else
      FT_UNUSED( module );
- #endif
  
!     return ft_service_list_lookup( PSCMAPS_SERVICES_GET, service_id );
    }
  
  #endif /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */
  
  
--- 576,595 ----
  
  
    FT_DEFINE_SERVICEDESCREC1(
      pscmaps_services,
  
!     FT_SERVICE_ID_POSTSCRIPT_CMAPS, &pscmaps_interface )
  
  
    static FT_Pointer
    psnames_get_service( FT_Module    module,
                         const char*  service_id )
    {
      FT_UNUSED( module );
  
!     return ft_service_list_lookup( pscmaps_services, service_id );
    }
  
  #endif /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */
  
  
*** 619,629 ****
      "psnames",  /* driver name                         */
      0x10000L,   /* driver version                      */
      0x20000L,   /* driver requires FreeType 2 or above */
  
      PUT_PS_NAMES_SERVICE(
!       (void*)&PSCMAPS_INTERFACE_GET ),   /* module specific interface */
  
      (FT_Module_Constructor)NULL,                                       /* module_init   */
      (FT_Module_Destructor) NULL,                                       /* module_done   */
      (FT_Module_Requester)  PUT_PS_NAMES_SERVICE( psnames_get_service ) /* get_interface */
    )
--- 608,618 ----
      "psnames",  /* driver name                         */
      0x10000L,   /* driver version                      */
      0x20000L,   /* driver requires FreeType 2 or above */
  
      PUT_PS_NAMES_SERVICE(
!       (void*)&pscmaps_interface ),   /* module specific interface */
  
      (FT_Module_Constructor)NULL,                                       /* module_init   */
      (FT_Module_Destructor) NULL,                                       /* module_done   */
      (FT_Module_Requester)  PUT_PS_NAMES_SERVICE( psnames_get_service ) /* get_interface */
    )