From 449cb6d8d5ee4cd9df6b30acb0b2e2d924e3c2e4 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 14 Apr 2014 15:59:10 +0000
Subject: [PATCH] EgtExchange 1.5d3 : - miglioria in funzione riconoscimento
 STL ASCII e binari - ricompilazione per modifiche a GeomKernel.

---
 EgtExchange.rc | Bin 11478 -> 11478 bytes
 ImportStl.cpp  |  16 ++++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/EgtExchange.rc b/EgtExchange.rc
index a49b26fcf16335f0767fd22b3cda1c5d6f973bc5..8453f7f831d22bf5938ddb280765d578014562a1 100644
GIT binary patch
delta 102
zcmcZ>c`b6oH#SD&&4O|VnI<bp<}eyhzR0P&xj<2dadRHG6*E}M5J*9V<rp`s30pvf
NF?C#%!qkz*4FGgE9zy^C

delta 102
zcmcZ>c`b6oH#SD2&4O|VnI<bp<}eyfzR0P&xj<2dadRHG6*E}M5J*9V<rp`s30pvf
NF?C#%!qkz*4FGbV9y<U4

diff --git a/ImportStl.cpp b/ImportStl.cpp
index 6555720..61243a9 100644
--- a/ImportStl.cpp
+++ b/ImportStl.cpp
@@ -55,18 +55,22 @@ ImportStl::StlType( const std::string& sFile)
    if ( InFile.fail())
       return STL_ERROR ;
 
-  // lettura dei primi ottanta byte
-   char cBuff[81] ;
-   InFile.read( cBuff, 80) ;
+  // lettura dei primi 256 byte
+   char cBuff[256] ;
+   InFile.read( cBuff, 255) ;
    cBuff[InFile.gcount()] = '\0' ;
 
   // chiusura del file
    InFile.close() ;
 
-  // verifico se iniziano con "solid"
+  // verifico se iniziano con "solid" e poi "facet" e "normal"
    string sBuff = cBuff ;
-   size_t nPos = sBuff.find( "solid") ;
-   if ( nPos != string::npos  &&  nPos < 10)
+   size_t nPosS = sBuff.find( "solid") ;
+   size_t nPosF = sBuff.find( "facet") ;
+   size_t nPosN = sBuff.find( "normal") ;
+   if ( nPosS != string::npos  &&  nPosS < 10  &&
+        nPosF != string::npos  &&
+        nPosN != string::npos)
       return STL_ASCII ;
    else
       return STL_BINARY ;