From: abd <abd@opencascade.com>
Date: Wed, 22 Nov 2006 11:52:07 +0000 (+0000)
Subject: Crash on copy operation
X-Git-Tag: Before_merging_with_V3_2_4~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=db15bd06ce565cf62765c4912aab17ec876d1164;p=modules%2Fvisu.git

Crash on copy operation
---

diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index a278a3a1..04a9ca15 100644
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -86,7 +86,6 @@
 #include <strstream>
 
 #include "Utils_ExceptHandlers.hxx"
-#include "CASCatch.hxx"
 
 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
 #define NO_CAS_CATCH
@@ -252,23 +251,40 @@ namespace VISU
 		    const char* theFieldName, 
 		    CORBA::Double theIteration)
   {
-    CASCatch_TRY{       
 #ifndef _DEXCEPT_
+# ifdef NO_CAS_CATCH
+    try{
+      OCC_CATCH_SIGNALS;
+# else
+    CASCatch_TRY{
       try{
+# endif
+
 #endif
-	    if(theColoredPrs3d->Create(theMeshName,theEntity,theFieldName,int(theIteration)))
-	      return true;
+	if(theColoredPrs3d->Create(theMeshName,theEntity,theFieldName,int(theIteration)))
+	  return true;
 #ifndef _DEXCEPT_
-	  }catch(std::exception& exc){
-	    INFOS("Follow exception was occured :\n"<<exc.what());
-	  }catch(...){
-	    INFOS("Unknown exception was occured!");
-	  }
-#endif
-      }CASCatch_CATCH(Standard_Failure){
-	Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
+# ifdef NO_CAS_CATCH
+      }catch(Standard_Failure) {
+	Handle(Standard_Failure) aFail = Standard_Failure::Caught();
 	INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
+      }catch(std::exception& exc){
+	INFOS("Follow exception was occured :\n"<<exc.what());
+      }catch(...){
+	INFOS("Unknown exception was occured!");
       }
+# else
+      }catch(std::exception& exc){
+	INFOS("Follow exception was occured :\n"<<exc.what());
+      }catch(...){
+	INFOS("Unknown exception was occured!");
+      }
+    }CASCatch_CATCH(Standard_Failure){
+      Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
+      INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
+    }
+# endif
+#endif
     return false;
   }  
 
@@ -1088,7 +1104,7 @@ namespace VISU
       aFileName += aFileInfo.fileName().latin1();
       static QString aCommand;
       string aFullFileName =  aTmpDir + aFileName;
-      aCommand.sprintf(" %s %s",aFileInfo.filePath(), aFullFileName.c_str() );
+      aCommand.sprintf(" %s %s",aFileInfo.filePath().latin1(), aFullFileName.c_str() );
       aCommand = QDir::convertSeparators( aCommand );
       aCommand.prepend( COPY_COMMAND );