summaryrefslogtreecommitdiff
path: root/third_party/freetype/src/psnames
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/freetype/src/psnames')
-rw-r--r--third_party/freetype/src/psnames/Jamfile6
-rw-r--r--third_party/freetype/src/psnames/psmodule.c6
-rw-r--r--third_party/freetype/src/psnames/psmodule.h2
-rw-r--r--third_party/freetype/src/psnames/psnamerr.h2
-rw-r--r--third_party/freetype/src/psnames/psnames.c2
-rw-r--r--third_party/freetype/src/psnames/pspic.c2
-rw-r--r--third_party/freetype/src/psnames/pspic.h12
-rw-r--r--third_party/freetype/src/psnames/pstables.h2
8 files changed, 19 insertions, 15 deletions
diff --git a/third_party/freetype/src/psnames/Jamfile b/third_party/freetype/src/psnames/Jamfile
index 06c0dda66f..6dcc8b8e94 100644
--- a/third_party/freetype/src/psnames/Jamfile
+++ b/third_party/freetype/src/psnames/Jamfile
@@ -1,6 +1,6 @@
# FreeType 2 src/psnames Jamfile
#
-# Copyright 2001 by
+# Copyright 2001-2015 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -16,7 +16,9 @@ SubDir FT2_TOP $(FT2_SRC_DIR) psnames ;
if $(FT2_MULTI)
{
- _sources = psmodule pspic ;
+ _sources = psmodule
+ pspic
+ ;
}
else
{
diff --git a/third_party/freetype/src/psnames/psmodule.c b/third_party/freetype/src/psnames/psmodule.c
index 0a5bcb7d2a..0f04c2fa7d 100644
--- a/third_party/freetype/src/psnames/psmodule.c
+++ b/third_party/freetype/src/psnames/psmodule.c
@@ -4,7 +4,7 @@
/* */
/* PSNames module implementation (body). */
/* */
-/* Copyright 1996-2003, 2005-2008, 2012, 2013 by */
+/* Copyright 1996-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -312,7 +312,7 @@
/* we first allocate the table */
table->num_maps = 0;
- table->maps = 0;
+ table->maps = NULL;
if ( !FT_NEW_ARRAY( table->maps, num_glyphs + EXTRA_GLYPH_LIST_SIZE ) )
{
@@ -563,7 +563,7 @@
psnames_get_service( FT_Module module,
const char* service_id )
{
- /* PSCMAPS_SERVICES_GET derefers `library' in PIC mode */
+ /* PSCMAPS_SERVICES_GET dereferences `library' in PIC mode */
#ifdef FT_CONFIG_OPTION_PIC
FT_Library library;
diff --git a/third_party/freetype/src/psnames/psmodule.h b/third_party/freetype/src/psnames/psmodule.h
index 28fa14807c..f85f322193 100644
--- a/third_party/freetype/src/psnames/psmodule.h
+++ b/third_party/freetype/src/psnames/psmodule.h
@@ -4,7 +4,7 @@
/* */
/* High-level PSNames module interface (specification). */
/* */
-/* Copyright 1996-2001 by */
+/* Copyright 1996-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/third_party/freetype/src/psnames/psnamerr.h b/third_party/freetype/src/psnames/psnamerr.h
index acda7f967e..09cc247b7d 100644
--- a/third_party/freetype/src/psnames/psnamerr.h
+++ b/third_party/freetype/src/psnames/psnamerr.h
@@ -4,7 +4,7 @@
/* */
/* PS names module error codes (specification only). */
/* */
-/* Copyright 2001, 2012 by */
+/* Copyright 2001-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/third_party/freetype/src/psnames/psnames.c b/third_party/freetype/src/psnames/psnames.c
index 1ede225dc9..a4385961e5 100644
--- a/third_party/freetype/src/psnames/psnames.c
+++ b/third_party/freetype/src/psnames/psnames.c
@@ -4,7 +4,7 @@
/* */
/* FreeType PSNames module component (body only). */
/* */
-/* Copyright 1996-2001 by */
+/* Copyright 1996-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/third_party/freetype/src/psnames/pspic.c b/third_party/freetype/src/psnames/pspic.c
index 3820f65a74..1394f977e0 100644
--- a/third_party/freetype/src/psnames/pspic.c
+++ b/third_party/freetype/src/psnames/pspic.c
@@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for psnames module. */
/* */
-/* Copyright 2009, 2010, 2012, 2013 by */
+/* Copyright 2009-2015 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/third_party/freetype/src/psnames/pspic.h b/third_party/freetype/src/psnames/pspic.h
index 6ff002c603..443225af61 100644
--- a/third_party/freetype/src/psnames/pspic.h
+++ b/third_party/freetype/src/psnames/pspic.h
@@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for psnames module. */
/* */
-/* Copyright 2009, 2012 by */
+/* Copyright 2009-2015 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -20,10 +20,9 @@
#define __PSPIC_H__
-FT_BEGIN_HEADER
-
#include FT_INTERNAL_PIC_H
+
#ifndef FT_CONFIG_OPTION_PIC
#define PSCMAPS_SERVICES_GET pscmaps_services
@@ -33,6 +32,9 @@ FT_BEGIN_HEADER
#include FT_SERVICE_POSTSCRIPT_CMAPS_H
+
+FT_BEGIN_HEADER
+
typedef struct PSModulePIC_
{
FT_ServiceDescRec* pscmaps_services;
@@ -54,12 +56,12 @@ FT_BEGIN_HEADER
FT_Error
psnames_module_class_pic_init( FT_Library library );
+FT_END_HEADER
+
#endif /* FT_CONFIG_OPTION_PIC */
/* */
-FT_END_HEADER
-
#endif /* __PSPIC_H__ */
diff --git a/third_party/freetype/src/psnames/pstables.h b/third_party/freetype/src/psnames/pstables.h
index 0a6637f985..3f31c31b18 100644
--- a/third_party/freetype/src/psnames/pstables.h
+++ b/third_party/freetype/src/psnames/pstables.h
@@ -4,7 +4,7 @@
/* */
/* PostScript glyph names. */
/* */
-/* Copyright 2005, 2008, 2011 by */
+/* Copyright 2005-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 01:52:34 +0000