Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Porting Salome to OCCT 7.7.0
[modules/gui.git]
/
src
/
OCCViewer
/
OCCViewer_Utilities.cxx
diff --git
a/src/OCCViewer/OCCViewer_Utilities.cxx
b/src/OCCViewer/OCCViewer_Utilities.cxx
index 61cd9aa78e95fac96ef66657a05a669b33a41548..3ca502b5a38ae409d304180d3289ce82176800c1 100644
(file)
--- a/
src/OCCViewer/OCCViewer_Utilities.cxx
+++ b/
src/OCCViewer/OCCViewer_Utilities.cxx
@@
-42,7
+42,12
@@
Handle(Image_PixMap) OCCViewer_Utilities::imageToPixmap( const QImage& anImage )
{
Handle(Image_PixMap) aPixmap = new Image_PixMap();
if ( !anImage.isNull() ) {
{
Handle(Image_PixMap) aPixmap = new Image_PixMap();
if ( !anImage.isNull() ) {
+#if OCC_VERSION_LARGE < 0x07070000
aPixmap->InitTrash( Image_PixMap::ImgBGRA, anImage.width(), anImage.height() );
aPixmap->InitTrash( Image_PixMap::ImgBGRA, anImage.width(), anImage.height() );
+#else
+ aPixmap->InitTrash( Image_Format_BGRA, anImage.width(), anImage.height() );
+#endif
+
#if OCC_VERSION_LARGE < 0x07050000
aPixmap->SetTopDown( Standard_True );
#endif
#if OCC_VERSION_LARGE < 0x07050000
aPixmap->SetTopDown( Standard_True );
#endif