Synchronize adm files

[modules/geom.git] / src / EntityGUI / EntityGUI_PictureImportDlg.cxx

diff --git a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
old mode 100644 (file)
new mode 100755 (executable)
index 3e521df..5a7fe60
--- a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
+++ b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -193,7 +193,8 @@ bool EntityGUI_PictureImportDlg::execute( ObjectList& objects )
   
   GEOM::GEOM_Object_var aFace = aBlocksOperations->MakeQuad4Vertices(P1,P2,P3,P4);
   getDisplayer()->SetDisplayMode(3);
-  getDisplayer()->SetTexture(theImgFileName.toStdString());
+  const QByteArray asc = theImgFileName.toUtf8();
+  getDisplayer()->SetTexture( std::string( asc.constData(), asc.length() ) );
   
   if ( !aFace->_is_nil() )
   {