From: vsr <vsr@opencascade.com>
Date: Mon, 6 Oct 2014 11:30:58 +0000 (+0400)
Subject: Take into account merge of branch 'asl/hydro_porting_741' in GUI module.
X-Git-Tag: V7_5_0a1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f4bb8ea64a1656b8cc8a714c1498ff45ac90b2fb;p=modules%2Fgeom.git

Take into account merge of branch 'asl/hydro_porting_741' in GUI module.
---

diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index b8551a691..c68154970 100644
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -164,7 +164,7 @@ namespace
     if ( aPixmap.IsNull() ) {
       QPixmap px(":images/default_texture.png");
       if ( !px.isNull() )
-	aPixmap = imageToPixmap( px.toImage() );
+	aPixmap = OCCViewer_Utilities::imageToPixmap( px.toImage() );
     }
     return aPixmap;
   }
@@ -198,7 +198,7 @@ namespace
     if ( anImage.isNull() )
       return NULL;
 
-    aPixmap = imageToPixmap( anImage );
+    aPixmap = OCCViewer_Utilities::imageToPixmap( anImage );
 
     aPixmapCacheMap.insert( thePath, aPixmap );