Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ShapeImage.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ShapeImage.cxx b/src/HYDROGUI/HYDROGUI_ShapeImage.cxx
index e9ecc0c524115cb06509c116f3638deb36f9e8ca..4f832399d26895271f03bb09d14b9c3469372d0e 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ShapeImage.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeImage.cxx
@@ -48,12 +48,15 @@ void HYDROGUI_ShapeImage::update( bool theIsUpdateViewer, bool isDeactivateSelec
 
 Handle(AIS_InteractiveObject) HYDROGUI_ShapeImage::createShape() const
 {
-    Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( getObject() );
-    if ( anImageObj.IsNull() )
-        return Handle_AIS_InteractiveObject();
+  Handle(HYDROGUI_ImagePrs) aPrs;
 
-    Handle(HYDROGUI_ImagePrs) aPrs = new HYDROGUI_ImagePrs( imagePixMap( anImageObj ), imageContour( anImageObj ) );
-    return aPrs;
+  Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( getObject() );
+  if ( !anImageObj.IsNull() )
+  {
+    aPrs = new HYDROGUI_ImagePrs( imagePixMap( anImageObj ), imageContour( anImageObj ) );
+  }
+
+  return aPrs;
 }
 
 Handle(Image_PixMap) HYDROGUI_ShapeImage::imagePixMap( const Handle(HYDROData_Image)& theImageObj ) const
@@ -81,7 +84,7 @@ Handle(Image_PixMap) HYDROGUI_ShapeImage::imagePixMap( const Handle(HYDROData_Im
     return aPix;
 }
 
-QPolygonF HYDROGUI_ShapeImage::imageContour( const Handle_HYDROData_Image& theImageObj ) const
+QPolygonF HYDROGUI_ShapeImage::imageContour( const Handle(HYDROData_Image)& theImageObj ) const
 {
     QPolygonF aContour;
     if ( !theImageObj.IsNull() )