Sync changes from upstream repository

Co-authored-by: Andrew le Bihan <andy@mcneel.com>
Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dan Rigdon-Bel <dan@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Jussi Aaltonen <jussi@mcneel.com>
Co-authored-by: kike-garbo <kike@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: Will Pearson <will@mcneel.com>
This commit is contained in:
Bozo The Builder
2022-09-06 10:56:15 -07:00
parent 6a4f9810c9
commit 6486c64975
51 changed files with 3785 additions and 1493 deletions

View File

@@ -1238,8 +1238,12 @@ bool ON_EmbeddedBitmap::Internal_ReadV5( ON_BinaryArchive& file )
if (0 == i)
{
// uncompressed
#pragma ON_PRAGMA_WARNING_PUSH
#pragma ON_PRAGMA_WARNING_DISABLE_MSC(4996)
#pragma ON_PRAGMA_WARNING_DISABLE_CLANG("-Wdeprecated-declarations")
if (!file.ReadSize(&m_sizeof_buffer))
break;
#pragma ON_PRAGMA_WARNING_POP
void* buffer = nullptr;
if (m_sizeof_buffer > 0)
{