From f4bb8ea64a1656b8cc8a714c1498ff45ac90b2fb Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Mon, 6 Oct 2014 15:30:58 +0400
Subject: [PATCH] Take into account merge of branch 'asl/hydro_porting_741' in
 GUI module.

---
 src/GEOMGUI/GEOM_Displayer.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 );
 
-- 
2.39.2