diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2019-05-03 06:39:31 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2019-05-03 06:39:31 +0000 |
commit | 62f6586395e612102f14cfbf245d6b548a742bc2 (patch) | |
tree | d9977834ee380d9fc626694be3acdf0b810065f9 /Build/source/libs/freetype2/freetype-src/builds/mac | |
parent | 8c0da66823797139402fc59a01132e71b54e97e6 (diff) |
freetype-1.10.0
git-svn-id: svn://tug.org/texlive/trunk@50966 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/builds/mac')
3 files changed, 9 insertions, 8 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/builds/mac/README b/Build/source/libs/freetype2/freetype-src/builds/mac/README index f58e47d4ad2..092487a8424 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/mac/README +++ b/Build/source/libs/freetype2/freetype-src/builds/mac/README @@ -46,7 +46,7 @@ environment by Metrowerks. GCC for MPW and Symantec Required files are downloadable from: - http://developer.apple.com/tools/mpw-tools/index.html + http://macintoshgarden.org/apps/macintosh-programmers-workshop Also you can find documents how to update by MPW-PR. @@ -54,7 +54,7 @@ environment by Metrowerks. GCC for MPW and Symantec skeletons. Python bundled to Mac OS X is enough. For classic MacOS, MacPython is available: - http://homepages.cwi.nl/~jack/macpython/ + https://homepages.cwi.nl/~jack/macpython/ MPW requires all files are typed by resource fork. ResEdit bundled to MPW is enough. In Mac OS X, @@ -280,7 +280,7 @@ APPENDIX I migrate to FSRef datatype. The big differences of FSRef against FSSpec are explained in Apple TechNotes 2078. - http://developer.apple.com/technotes/tn2002/tn2078.html + https://developer.apple.com/library/archive/technotes/tn2078/ - filename length: the max length of file name of FSRef is 255 chars (it is limit of HFS+), @@ -314,7 +314,7 @@ APPENDIX I of FontManager emulation without QuickDraw is explained in - http://www.gyve.org/~mpsuzuki/ats_benchmark.html + http://gyvern.ipc.hiroshima-u.ac.jp/~mpsuzuki/ats_benchmark.html A-3. Framework Availabilities ----------------------------- diff --git a/Build/source/libs/freetype2/freetype-src/builds/mac/freetype-Info.plist b/Build/source/libs/freetype2/freetype-src/builds/mac/freetype-Info.plist index b3d114dad8b..4b5d79b815e 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/mac/freetype-Info.plist +++ b/Build/source/libs/freetype2/freetype-src/builds/mac/freetype-Info.plist @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" - "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> + "https://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> diff --git a/Build/source/libs/freetype2/freetype-src/builds/mac/ftmac.c b/Build/source/libs/freetype2/freetype-src/builds/mac/ftmac.c index c45546cee08..6adf800a4f5 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/mac/ftmac.c +++ b/Build/source/libs/freetype2/freetype-src/builds/mac/ftmac.c @@ -5,7 +5,7 @@ /* Mac FOND support. Written by just@letterror.com. */ /* Heavily Fixed by mpsuzuki, George Williams and Sean McBride */ /* */ -/* Copyright 1996-2018 by */ +/* Copyright (C) 1996-2019 by */ /* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -780,9 +780,10 @@ typedef short ResourceIndex; style = (StyleTable*)p; p += sizeof ( StyleTable ); string_count = EndianS16_BtoN( *(short*)(p) ); + string_count = FT_MIN( 64, string_count ); p += sizeof ( short ); - for ( i = 0; i < string_count && i < 64; i++ ) + for ( i = 0; i < string_count; i++ ) { names[i] = p; p += names[i][0]; @@ -799,7 +800,7 @@ typedef short ResourceIndex; ps_name[ps_name_len] = 0; } if ( style->indexes[face_index] > 1 && - style->indexes[face_index] <= FT_MIN( string_count, 64 ) ) + style->indexes[face_index] <= string_count ) { unsigned char* suffixes = names[style->indexes[face_index] - 1]; |