ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-27 15:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
vsr 2014-10-06 15:30:58 +04:00
parent 852ccfccc5
commit f4bb8ea64a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -164,7 +164,7 @@ namespace
if ( aPixmap.IsNull() ) { if ( aPixmap.IsNull() ) {
QPixmap px(":images/default_texture.png"); QPixmap px(":images/default_texture.png");
if ( !px.isNull() ) if ( !px.isNull() )
aPixmap = imageToPixmap( px.toImage() ); aPixmap = OCCViewer_Utilities::imageToPixmap( px.toImage() );
} }
return aPixmap; return aPixmap;
} }
@ -198,7 +198,7 @@ namespace
if ( anImage.isNull() ) if ( anImage.isNull() )
return NULL; return NULL;
aPixmap = imageToPixmap( anImage ); aPixmap = OCCViewer_Utilities::imageToPixmap( anImage );
aPixmapCacheMap.insert( thePath, aPixmap ); aPixmapCacheMap.insert( thePath, aPixmap );