From 23e1384e199b2c99b0b663ba44add8f2f53c1428 Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Sun, 1 Aug 2021 10:51:34 +0200
Subject: [PATCH] EgtGraphics 2.3h1 : - versione x64 compilata con clang-cl -
 correzioni e migliorie suggerite dal nuovo compilatore.

---
 EgtGraphics.rc      | Bin 11604 -> 11604 bytes
 EgtGraphics.vcxproj |   6 ++++--
 ImageMgr.cpp        |   2 +-
 ObjOldGraphics.h    |   2 +-
 SceneImage.cpp      |   6 ++++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/EgtGraphics.rc b/EgtGraphics.rc
index 12dc199aa3c7bfc269a71d80c153e7c420cf6e63..5bf65110bda19c9b2d2707a86b89dd70f13cc109 100644
GIT binary patch
delta 105
zcmcZ-btP)UH#SC#&GmA^%*+`KhLaCU>u&xd>BG3WjoXYFEOD4=a)V$FTvA4;fd!lR
PAIT<&IJ!Z6%5Gc$c;X^)

delta 105
zcmcZ-btP)UH#SD|&GmA^%*^QwhLaCU>u&xd>BG3WjoXYFEOD4=a)V$FTvA4;fd!lR
PAIT<&IJ!Z6%5Gc$cO)Wd

diff --git a/EgtGraphics.vcxproj b/EgtGraphics.vcxproj
index 052266a..a2fe2fb 100644
--- a/EgtGraphics.vcxproj
+++ b/EgtGraphics.vcxproj
@@ -35,7 +35,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>ClangCL</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -49,7 +49,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>ClangCL</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -134,6 +134,7 @@ copy $(TargetPath) \EgtProg\DllD32</Command>
       <OpenMPSupport>true</OpenMPSupport>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -205,6 +206,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <CompileAs>CompileAsCpp</CompileAs>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/ImageMgr.cpp b/ImageMgr.cpp
index fb9e691..eee8785 100644
--- a/ImageMgr.cpp
+++ b/ImageMgr.cpp
@@ -30,7 +30,7 @@ CreateEgrImageMgr( void)
 {
   // verifico la chiave e le opzioni
    if ( ! TestKeyForEGr( GetEGrKey(), 0, GetEGrLogger()))
-      return false ;
+      return nullptr ;
   // creo l'oggetto
    return static_cast<IEgrImageMgr*> ( new(nothrow) ImageMgr) ;
 }
diff --git a/ObjOldGraphics.h b/ObjOldGraphics.h
index 63de58f..e071391 100644
--- a/ObjOldGraphics.h
+++ b/ObjOldGraphics.h
@@ -86,7 +86,7 @@ class ObjOldGraphics : public ObjEGrGraphics
               { b3Loc = m_b3Loc ; return ! m_b3Loc.IsEmpty() ; }
 
    public :
-      ObjOldGraphics( void) : m_pScene( nullptr), m_nCurrMode( GL_NONE), m_bValid( false) {}
+      ObjOldGraphics( void) : m_pScene( nullptr), m_bValid( false), m_nCurrMode( GL_NONE) {}
 
    private :
       bool AddOgAtom( const OgAtom& oga)
diff --git a/SceneImage.cpp b/SceneImage.cpp
index 4f4ed5f..569772f 100644
--- a/SceneImage.cpp
+++ b/SceneImage.cpp
@@ -95,8 +95,10 @@ Scene::GetImage( int nShowMode, Color colBackTop, Color colBackBottom,
          m_dHalfWidth = dWs ;
          m_dHalfHeight = dHs ;
         // Eseguo disegno sul back buffer
-         if ( ! MyDraw( false))
+         if ( ! MyDraw( false)) {
+            delete [] pBuffer ;         
             return false ;
+         }
         // Leggo l'immagine nel buffer
          glReadBuffer( GL_BACK) ;
          glReadPixels( 0, 0, nWidth, nHeight, GL_BGRA, GL_UNSIGNED_BYTE, pBuffer) ;
@@ -152,7 +154,7 @@ Scene::GetImage( int nShowMode, Color colBackTop, Color colBackBottom,
 
   // Libero le risorse
    FreeImage_Unload( pDib) ;
-   delete pBuffer ;
+   delete [] pBuffer ;
 
    return bOk ;
 }