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 b8551a6910b7958369fed45ae17e26ccc605bb22..c6815497053b078a0f285e15bb55a08473fe0c7b 100644 (file)
--- 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 );