Sync changes from upstream repository

Co-authored-by: Andrew Le Bihan <andy@mcneel.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Jussi <jussi@mcneel.com>
Co-authored-by: Lowell <lowell@mcneel.com>
Co-authored-by: Rajaa Issa <rajaa@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: alain <alain@mcneel.com>
Co-authored-by: chuck <chuck@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
This commit is contained in:
Bozo The Builder
2021-05-13 04:27:38 -07:00
parent c20e599d1f
commit 53fe7bc7ef
81 changed files with 13793 additions and 2603 deletions

View File

@@ -71,8 +71,6 @@ public:
// sorts nulls to end of lists
static int CompareFontPointer(ON_Font const* const* lhs, ON_Font const* const* rhs);
static int CompareFontCharacteristicsHash(ON_Font const* const* lhs, ON_Font const* const* rhs);
/*
Returns:
0: failure
@@ -102,9 +100,19 @@ public:
);
private:
ON_ManagedFonts();
// The purpose of this nondefault constructor is to create ON_ManagedFonts::List
// in opennurbs_statics.cpp in a way that Apple's CLang will actually compile.
// The only instance of ON_ManagedFonts is ON_ManagedFonts::List.
ON_ManagedFonts(ON__UINT_PTR zero);
~ON_ManagedFonts();
private:
ON_ManagedFonts() = delete;
ON_ManagedFonts(const ON_ManagedFonts&) = delete;
ON_ManagedFonts& operator=(const ON_ManagedFonts&) = delete;
private:
/*
Parameters:
managed_font_metrics_in_font_design_units - [in]