Skip to content

Commit de76f06

Browse files
Jiří Vaněkgnu-andrew
authored andcommitted
8348596: Update FreeType to 2.13.3
8285686: Update FreeType to 2.12.0 8290334: Update FreeType to 2.12.1 8298974: Add ftcolor.c to imported freetype sources 8293672: Update freetype md file 8316028: Update FreeType to 2.13.2 8306881: Update FreeType to 2.13.0 Reviewed-by: andrew Backport-of: 428c2a292a8670f44bdb617014caaed0de591907
1 parent 6a3f7bb commit de76f06

File tree

299 files changed

+15869
-11265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+15869
-11265
lines changed

THIRD_PARTY_README

Lines changed: 80 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,12 +1028,12 @@ That's all there is to it!
10281028

10291029
-------------------------------------------------------------------------------
10301030

1031-
%% This notice is provided with respect to Freetype v2.9 which may be
1031+
%% This notice is provided with respect to Freetype v2.13.3 which may be
10321032
included with JRE 8, JDK 8, and OpenJDK 8.
10331033

10341034
--- begin of LICENSE ---
10351035

1036-
## The FreeType Project: Freetype v2.10.4
1036+
## The FreeType Project: Freetype v2.13.3
10371037

10381038

10391039
### FreeType Notice
@@ -1055,7 +1055,27 @@ which fits your needs best.
10551055

10561056
### FreeType License
10571057
```
1058-
The FreeType Project LICENSE
1058+
1059+
Copyright (C) 1996-2024 by David Turner, Robert Wilhelm, and Werner Lemberg.
1060+
Copyright (C) 2007-2024 by Dereg Clegg and Michael Toftdal.
1061+
Copyright (C) 1996-2024 by Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.
1062+
Copyright (C) 2022-2024 by David Turner, Robert Wilhelm, Werner Lemberg, George Williams, and
1063+
Copyright (C) 2004-2024 by Masatake YAMATO and Redhat K.K.
1064+
Copyright (C) 2007-2024 by Derek Clegg and Michael Toftdal.
1065+
Copyright (C) 2003-2024 by Masatake YAMATO, Red Hat K.K.,
1066+
Copyright (C) 1996-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and Dominik Röttsches.
1067+
Copyright (C) 2007-2024 by David Turner.
1068+
Copyright (C) 2022-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
1069+
Copyright (C) 2007-2024 by Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.
1070+
Copyright (C) 2008-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya.
1071+
Copyright (C) 2013-2024 by Google, Inc.
1072+
Copyright (C) 2019-2024 by Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
1073+
Copyright (C) 2009-2024 by Oran Agra and Mickey Gabel.
1074+
Copyright (C) 2018-2024 by David Turner, Robert Wilhelm, Dominik Röttsches, and Werner Lemberg.
1075+
Copyright (C) 2004-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and George Williams.
1076+
1077+
1078+
The FreeType Project LICENSE
10591079
----------------------------
10601080

10611081
2006-Jan-27
@@ -1220,7 +1240,7 @@ Legal Terms
12201240

12211241
Our home page can be found at
12221242

1223-
http://www.freetype.org
1243+
https://www.freetype.org
12241244

12251245
```
12261246

@@ -1568,45 +1588,36 @@ consider it more useful to permit linking proprietary applications with the
15681588
library. If this is what you want to do, use the GNU Library General
15691589
Public License instead of this License.
15701590

1571-
#########################################################################
1591+
```
15721592

1573-
--- fthash.c and fthash.h are covered by the following notices ---
1593+
### Additional Freetype Attributions
1594+
```
15741595

1575-
/*
1576-
* Copyright 2000 Computing Research Labs, New Mexico State University
1577-
* Copyright 2001-2015
1578-
* Francesco Zappa Nardelli
1579-
*
1580-
* Permission is hereby granted, free of charge, to any person obtaining a
1581-
* copy of this software and associated documentation files (the "Software"),
1582-
* to deal in the Software without restriction, including without limitation
1583-
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
1584-
* and/or sell copies of the Software, and to permit persons to whom the
1585-
* Software is furnished to do so, subject to the following conditions:
1586-
*
1587-
* The above copyright notice and this permission notice shall be included in
1588-
* all copies or substantial portions of the Software.
1589-
*
1590-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1591-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1592-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
1593-
* THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
1594-
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
1595-
* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
1596-
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1597-
*/
1598-
1599-
/**************************************************************************
1600-
*
1601-
* This file is based on code from bdf.c,v 1.22 2000/03/16 20:08:50
1602-
*
1603-
* taken from Mark Leisher's xmbdfed package
1604-
*
1605-
*/
1606-
1607-
--- FreeType 2 PSaux module is covered by the following notices ---
1608-
1609-
Copyright 2006-2014 Adobe Systems Incorporated.
1596+
---------------------------------
1597+
The below applies to the following file(s):
1598+
libfreetype/src/psaux/psarrst.c
1599+
libfreetype/src/psaux/psarrst.h
1600+
libfreetype/src/psaux/psblues.c
1601+
libfreetype/src/psaux/psblues.h
1602+
libfreetype/src/psaux/pserror.c
1603+
libfreetype/src/psaux/pserror.h
1604+
libfreetype/src/psaux/psfixed.h
1605+
libfreetype/src/psaux/psfont.c
1606+
libfreetype/src/psaux/psfont.h
1607+
libfreetype/src/psaux/psft.c
1608+
libfreetype/src/psaux/psft.h
1609+
libfreetype/src/psaux/psglue.h
1610+
libfreetype/src/psaux/pshints.c
1611+
libfreetype/src/psaux/pshints.h
1612+
libfreetype/src/psaux/psintrp.c
1613+
libfreetype/src/psaux/psintrp.h
1614+
libfreetype/src/psaux/psread.c
1615+
libfreetype/src/psaux/psread.h
1616+
libfreetype/src/psaux/psstack.c
1617+
libfreetype/src/psaux/psstack.h
1618+
libfreetype/src/psaux/pstypes.h
1619+
1620+
Copyright (C) 2006-2014 Adobe Systems Incorporated.
16101621

16111622
This software, and all works of authorship, whether in source or
16121623
object code form as indicated by the copyright notice(s) included
@@ -1635,41 +1646,40 @@ have read and understood the terms and conditions of the
16351646
FreeType Project License as well as those provided in this section,
16361647
and you accept them fully.
16371648

1638-
#########################################################################
16391649

1650+
```
16401651

1641-
--- FreeType 2 PSaux module is covered by the following notices ---
1652+
### MIT License
1653+
```
16421654

1643-
Copyright 2006-2014 Adobe Systems Incorporated.
1655+
---------------------------------
1656+
The below applies to the following file(s):
1657+
libfreetype/include/freetype/internal/fthash.h
1658+
libfreetype/src/base/fthash.c
16441659

1645-
This software, and all works of authorship, whether in source or
1646-
object code form as indicated by the copyright notice(s) included
1647-
herein (collectively, the "Work") is made available, and may only be
1648-
used, modified, and distributed under the FreeType Project License,
1649-
LICENSE.TXT. Additionally, subject to the terms and conditions of the
1650-
FreeType Project License, each contributor to the Work hereby grants
1651-
to any individual or legal entity exercising permissions granted by
1652-
the FreeType Project License and this section (hereafter, "You" or
1653-
"Your") a perpetual, worldwide, non-exclusive, no-charge,
1654-
royalty-free, irrevocable (except as stated in this section) patent
1655-
license to make, have made, use, offer to sell, sell, import, and
1656-
otherwise transfer the Work, where such license applies only to those
1657-
patent claims licensable by such contributor that are necessarily
1658-
infringed by their contribution(s) alone or by combination of their
1659-
contribution(s) with the Work to which such contribution(s) was
1660-
submitted. If You institute patent litigation against any entity
1661-
(including a cross-claim or counterclaim in a lawsuit) alleging that
1662-
the Work or a contribution incorporated within the Work constitutes
1663-
direct or contributory patent infringement, then any patent licenses
1664-
granted to You under this License for that Work shall terminate as of
1665-
the date such litigation is filed.
1660+
Copyright (C) 2000 Computing Research Labs, New Mexico State University
1661+
Copyright (C) 2001-2015
16661662

1667-
By using, modifying, or distributing the Work you indicate that you
1668-
have read and understood the terms and conditions of the
1669-
FreeType Project License as well as those provided in this section,
1670-
and you accept them fully.
1663+
Francesco Zappa Nardelli
1664+
1665+
Permission is hereby granted, free of charge, to any person obtaining a
1666+
copy of this software and associated documentation files (the "Software"),
1667+
to deal in the Software without restriction, including without limitation
1668+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
1669+
and/or sell copies of the Software, and to permit persons to whom the
1670+
Software is furnished to do so, subject to the following conditions:
1671+
1672+
The above copyright notice and this permission notice shall be included in
1673+
all copies or substantial portions of the Software.
1674+
1675+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1676+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1677+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
1678+
THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
1679+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
1680+
OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
1681+
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
16711682

1672-
#########################################################################
16731683

16741684
```
16751685

jdk/src/share/native/sun/awt/libfreetype/UPDATING.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ src/java.desktop/share/legal/freetype.md
3030

3131
When updating specify --with-freetype=bundled to test builds to
3232
expose build issues.
33-
This is important because presently on Linux and Solaris the build
33+
This is important because presently on Linux the build
3434
defaults to linking against the system library and does not attempt
3535
to compile the sources.

jdk/src/share/native/sun/awt/libfreetype/include/freetype/config/ftconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* ANSI-specific configuration file (specification only).
66
*
7-
* Copyright (C) 1996-2020 by
7+
* Copyright (C) 1996-2024 by
88
* David Turner, Robert Wilhelm, and Werner Lemberg.
99
*
1010
* This file is part of the FreeType project, and may only be used,

jdk/src/share/native/sun/awt/libfreetype/include/freetype/config/ftheader.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Build macros of the FreeType 2 library.
66
*
7-
* Copyright (C) 1996-2020 by
7+
* Copyright (C) 1996-2024 by
88
* David Turner, Robert Wilhelm, and Werner Lemberg.
99
*
1010
* This file is part of the FreeType project, and may only be used,
@@ -777,6 +777,18 @@
777777
#define FT_COLOR_H <freetype/ftcolor.h>
778778

779779

780+
/**************************************************************************
781+
*
782+
* @macro:
783+
* FT_OTSVG_H
784+
*
785+
* @description:
786+
* A macro used in `#include` statements to name the file containing the
787+
* FreeType~2 API which handles the OpenType 'SVG~' glyphs.
788+
*/
789+
#define FT_OTSVG_H <freetype/otsvg.h>
790+
791+
780792
/* */
781793

782794
/* These header files don't need to be included by the user. */

jdk/src/share/native/sun/awt/libfreetype/include/freetype/config/ftmodule.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@ FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
1919
// FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
2020
// FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
2121
// FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
22+
// FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
2223
FT_USE_MODULE( FT_Module_Class, psaux_module_class )
2324
FT_USE_MODULE( FT_Module_Class, psnames_module_class )
2425
FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
25-
FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
2626
FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
2727
FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
28-
// FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
28+
FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
29+
// FT_USE_MODULE( FT_Renderer_Class, ft_sdf_renderer_class )
30+
// FT_USE_MODULE( FT_Renderer_Class, ft_bitmap_sdf_renderer_class )
31+
// FT_USE_MODULE( FT_Renderer_Class, ft_svg_renderer_class )
2932

3033
/* EOF */

0 commit comments

Comments
 (0)