head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.2 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.4.0.98 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.96 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.94 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.92 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.90 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.88 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.86 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.84 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.82 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.80 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.78 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.76 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.74 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.72 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.70 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.68 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.66 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.64 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.62 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.60 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.58 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.56 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.52 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.32 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.54 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.50 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.48 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.46 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.44 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.42 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.40 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.38 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.36 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.34 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.30 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.28 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.26 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.24 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.22 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.20 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.18 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.16 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.14 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.12 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.10 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.8 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.6 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.4 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.2 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.3.0.52 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.50 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.48 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.46 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.44 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.42 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.40 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.38 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.36 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.34 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.32 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.30 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.28 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.26 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.24 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.22 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.20 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.18 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.16 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.14 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.12 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.10 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.8 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.6 pkgsrc-2008Q1:1.3.0.4 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.2 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.2.0.28 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.26 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.24 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.22 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.20 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.18 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.16 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.14 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2026.01.01.23.59.16; author dholland; state Exp; branches; next 1.4; commitid 42Kb1a8sKXYXtKoG; 1.4 date 2013.12.11.23.49.52; author markd; state Exp; branches; next 1.3; commitid I0LJ5X0RH2Db0Mgx; 1.3 date 2007.11.15.06.36.45; author rillig; state Exp; branches; next 1.2; 1.2 date 2004.04.03.11.31.02; author recht; state Exp; branches; next 1.1; 1.1 date 2004.03.29.22.04.09; author recht; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.03.29.22.04.09; author recht; state Exp; branches; next ; desc @@ 1.5 log @fonts/ttmkfdir2: avoid undefined behavior The function that produced the font foundry name was returning a pointer to its own automatic storage for cases where it was generating "misc" for an unknown foundry. This is just as invalid in C++ as it is in C, and dressing it up in C++ goop just made it harder to see that it was wrong. XXX: There's half a dozen entries in the foundry table here that are XXX: unmatchable because they're lower-case and it does toupper() XXX: before matching. @ text @$NetBSD: patch-ab,v 1.4 2013/12/11 23:49:52 markd Exp $ - include freetype headers properly - work around some sunpro C++ dialect issue - fix wrong return type in FontFamilyName() - avoid UB in FoundryName() (was returning a pointer to automatic storage, make it return the object instead) - some other C++ workaround involving implicit conversions and booleans --- ttf.cpp.orig 2002-11-07 05:30:04.000000000 +0000 +++ ttf.cpp @@@@ -3,7 +3,8 @@@@ #include #include -#include "freetype/tttables.h" +#include +#include FT_TRUETYPE_TABLES_H #include "ttmkfdir.h" #include "ttf.h" #include "ttos2val.h" @@@@ -137,7 +138,12 @@@@ Face::Face (const std::string &filename) /* * find all the encodings that are based on this cmap. */ +#if defined(__SUNPRO_CC) + /* Error: Cannot use ... ::iterator ... to initialize ... ::const_iterator ... */ + typedef Encodings_t::iterator MI; +#else typedef Encodings_t::const_iterator MI; +#endif std::pair bounds = Encodings::instance()->equal_range (key); /* @@@@ -226,7 +232,7 @@@@ Face::FontFamilyName (void) const for (i = 0; i < n; i++) { if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) { std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl; - return; + return "unknown"; }; platform = NamePtr.platform_id; encoding = NamePtr.encoding_id; @@@@ -249,7 +255,7 @@@@ Face::FontFamilyName (void) const return "unknown"; } -const char * +std::string Face::FoundryName (void) const { @@@@ -455,7 +461,7 @@@@ Face::FoundryName (void) const code[4] = 0; if (code[0] == 0) { - return std::string (cmdline::instance()->option ("default-foundry")).c_str (); + return std::string (cmdline::instance()->option ("default-foundry")); } for (p = known_foundries; p->xlfd; p++) { @@@@ -464,7 +470,7 @@@@ Face::FoundryName (void) const } } - return std::string (cmdline::instance()->option ("default-foundry")).c_str (); + return std::string (cmdline::instance()->option ("default-foundry")); } const char * @@@@ -522,7 +528,7 @@@@ Face::Weight (void) const { const char *result; - if (cmdline::instance()->option ("panose") && ((result = PanoseWeight ()) != 0)) { + if (bool(cmdline::instance()->option ("panose")) && ((result = PanoseWeight ()) != 0)) { return result; } else if ((result = OS2Weight ()) != 0) { return result; @@@@ -603,7 +609,7 @@@@ Face::Width (void) const { const char *result; - if (cmdline::instance()->option ("panose") && ((result = PanoseWidth ()) != 0)) { + if (bool(cmdline::instance()->option ("panose")) && ((result = PanoseWidth ()) != 0)) { return result; } else if ((result = OS2Width ()) != 0) { return result; @ 1.4 log @One final fixup for freetype2. Fixes build with freetype 2.5.x. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2007/11/15 06:36:45 rillig Exp $ d3 10 a12 2 --- ttf.cpp.orig 2002-11-07 06:30:04.000000000 +0100 +++ ttf.cpp 2007-11-15 07:05:27.304109000 +0100 d45 27 @ 1.3 log @Sunpro needs some more patches. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2004/04/03 11:31:02 recht Exp $ d5 11 a15 1 @@@@ -137,7 +137,12 @@@@ Face::Face (const std::string &filename) d28 1 a28 1 @@@@ -226,7 +231,7 @@@@ Face::FontFamilyName (void) const d37 1 a37 1 @@@@ -522,7 +527,7 @@@@ Face::Weight (void) const d46 1 a46 1 @@@@ -603,7 +608,7 @@@@ Face::Width (void) const @ 1.2 log @Set FREETYPE_CONFIG in MAKE_ENV and use it instead of just freetype-config. @ text @d1 1 a1 1 $NetBSD$ d4 15 a18 2 +++ ttf.cpp @@@@ -226,7 +226,7 @@@@ Face::FontFamilyName (void) const d27 18 @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- ttf.cpp.orig 2004-03-29 12:46:48.000000000 +0200 @ 1.1.1.1 log @initial import of ttmkfdir2-20021109 (Yu Shao's ttmkfdir) adresses PR 24934 by Martin Husemann patch-a[ac] are adapted from FreeBSD port's @ text @@