From: APN <>
Date: Fri, 20 Jan 2012 12:19:05 +0000 (+0000)
Subject: 0015697: External Contribution on OCC DE Improvement
X-Git-Tag: V6_5_3_beta1~126
X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=1332f04790854485b57629ac9e35e9cc4c8a7fc9

0015697: External Contribution on OCC DE Improvement
---

diff --git a/src/IGESCAFControl/IGESCAFControl_Reader.cxx b/src/IGESCAFControl/IGESCAFControl_Reader.cxx
index a48f4a8d58..e2576dc714 100755
--- a/src/IGESCAFControl/IGESCAFControl_Reader.cxx
+++ b/src/IGESCAFControl/IGESCAFControl_Reader.cxx
@@ -58,6 +58,11 @@ IGESCAFControl_Reader::IGESCAFControl_Reader (const Handle(XSControl_WorkSession
 //function : Transfer
 //purpose  : basic working method
 //=======================================================================
+static void checkColorRange (Standard_Real& theCol)
+{
+  if ( theCol < 0. ) theCol = 0.;
+  if ( theCol > 100. ) theCol = 100.;
+}
 
 Standard_Boolean IGESCAFControl_Reader::Transfer (Handle(TDocStd_Document) &doc)
 {
@@ -126,6 +131,9 @@ Standard_Boolean IGESCAFControl_Reader::Transfer (Handle(TDocStd_Document) &doc)
           else {
             Standard_Real r, g, b;
             color->RGBIntensity ( r, g, b );
+            checkColorRange ( r );
+            checkColorRange ( g );
+            checkColorRange ( b );
             col.SetValues ( 0.01*r, 0.01*g, 0.01*b, Quantity_TOC_RGB );
           }
         }
diff --git a/src/IGESFile/igesread.c b/src/IGESFile/igesread.c
index 7a12f2c90f..8de456e1a0 100755
--- a/src/IGESFile/igesread.c
+++ b/src/IGESFile/igesread.c
@@ -104,8 +104,8 @@ char* nomfic; int lesect[6]; int modefnes;
 
   /* Sending of message : No Terminal Section */
   if (lesect[5] == 0) {
-    IGESFile_Check3 (0,"XSTEP_20");
-    return -1;
+    IGESFile_Check3 (1, "XSTEP_20");
+    //return -1;
   }
   
 
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateShell.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateShell.cxx
index d4444f1119..dbcd1d5682 100755
--- a/src/StepToTopoDS/StepToTopoDS_TranslateShell.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateShell.cxx
@@ -48,7 +48,10 @@ StepToTopoDS_TranslateShell::StepToTopoDS_TranslateShell
 void StepToTopoDS_TranslateShell::Init
 (const Handle(StepShape_ConnectedFaceSet)& CFS, StepToTopoDS_Tool& aTool, StepToTopoDS_NMTool& NMTool)
 {
-
+  //bug15697
+  if(CFS.IsNull())
+    return;
+  
   if (!aTool.IsBound(CFS)) {
 
     BRep_Builder B;
@@ -120,3 +123,4 @@ StepToTopoDS_TranslateShellError StepToTopoDS_TranslateShell::Error() const
 {
   return myError;
 }
+