// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Standard_Stream.hxx>
#include <TopoDS_Shape.hxx>
-#include <Standard_ConstructionError.hxx>
+#include <Standard_Failure.hxx>
#include <StdFail_NotDone.hxx>
#ifdef WNT
#define UnLoadLib( handle ) dlclose( handle );
#endif
-typedef TopoDS_Shape (*funcPoint)(const TCollection_AsciiString&, TCollection_AsciiString&);
+typedef TopoDS_Shape (*funcPoint)(const TCollection_AsciiString&,
+ const TCollection_AsciiString&,
+ TCollection_AsciiString&);
//=======================================================================
//function : GetID
//Standard_Integer aType = aFunction->GetType();
// retrieve the file and plugin library names
- TCollection_AsciiString aFileName = aCI.GetFileName();
- TCollection_AsciiString aLibName = aCI.GetPluginName();
- if (aFileName.IsEmpty() || aLibName.IsEmpty())
+ TCollection_AsciiString aFileName = aCI.GetFileName();
+ TCollection_AsciiString aFormatName = aCI.GetFormatName();
+ TCollection_AsciiString aLibName = aCI.GetPluginName();
+ if (aFileName.IsEmpty() || aFormatName.IsEmpty() || aLibName.IsEmpty())
return 0;
// load plugin library
- LibHandle anImportLib = LoadLib( aLibName.ToCString() );
+ LibHandle anImportLib = LoadLib( aLibName.ToCString() ); //This is workaround of BUG OCC13051
funcPoint fp = 0;
if ( anImportLib )
fp = (funcPoint)GetProc( anImportLib, "Import" );
- if ( !fp )
- return 0;
+ if ( !fp ) {
+ TCollection_AsciiString aMsg = aFormatName;
+ aMsg += " plugin was not installed";
+ Standard_Failure::Raise(aMsg.ToCString());
+ }
// perform the import
TCollection_AsciiString anError;
- TopoDS_Shape aShape = fp( aFileName, anError );
+ TopoDS_Shape aShape = fp( aFileName, aFormatName, anError );
// unload plugin library
- UnLoadLib( anImportLib );
+ // commented by enk:
+ // the bug was occured: using ACIS Import/Export plugin
+ //UnLoadLib( anImportLib ); //This is workaround of BUG OCC13051
if ( aShape.IsNull() ) {
StdFail_NotDone::Raise(anError.ToCString());