closes https://github.com/assimp/assimp/issues/1621: add file check for dxf file without extensions.
parent
7ca8407ef2
commit
183224f045
|
@ -119,9 +119,14 @@ DXFImporter::~DXFImporter()
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Returns whether the class can handle the format of the given file.
|
// Returns whether the class can handle the format of the given file.
|
||||||
bool DXFImporter::CanRead( const std::string& pFile, IOSystem* /*pIOHandler*/, bool /*checkSig*/) const
|
bool DXFImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig ) const
|
||||||
{
|
{
|
||||||
return SimpleExtensionCheck(pFile,"dxf");
|
if ( checkSig ) {
|
||||||
|
return SimpleExtensionCheck(pFile,"dxf");
|
||||||
|
} else {
|
||||||
|
static const char *pTokens[] = { "SECTION", "HEADER", "ENDSEC", "BLOCKS" };
|
||||||
|
return BaseImporter::SearchFileHeaderForToken(pIOHandler, pFile, pTokens, 4 );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
|
48
doc/dox.h
48
doc/dox.h
|
@ -206,56 +206,16 @@ the library files. Alternatively you can simply add the assimp project to your p
|
||||||
your solution.
|
your solution.
|
||||||
|
|
||||||
|
|
||||||
@section use_noboost Building without boost.
|
|
||||||
|
|
||||||
The Boost-Workaround consists of dummy replacements for some boost utility templates. Currently there are replacements for
|
|
||||||
|
|
||||||
- boost.scoped_ptr
|
|
||||||
- boost.scoped_array
|
|
||||||
- boost.format
|
|
||||||
- boost.random
|
|
||||||
- boost.common_factor
|
|
||||||
- boost.foreach
|
|
||||||
- boost.tuple
|
|
||||||
- boost.make_shared
|
|
||||||
|
|
||||||
These implementations are very limited and are not intended for use outside assimp. A compiler
|
|
||||||
with full support for partial template specializations is required. To enable the workaround, put the following in
|
|
||||||
your compiler's list of predefined macros:
|
|
||||||
@code
|
|
||||||
#define ASSIMP_BUILD_BOOST_WORKAROUND
|
|
||||||
@endcode
|
|
||||||
<br>
|
|
||||||
If you're working with the provided solutions for Visual Studio use the <i>-noboost</i> build configs. <br>
|
|
||||||
|
|
||||||
<b>assimp_BUILD_BOOST_WORKAROUND</b> implies <b>assimp_BUILD_SINGLETHREADED</b>. <br>
|
|
||||||
See the @ref assimp_st section
|
|
||||||
for more details.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@section assimp_dll Windows DLL Build
|
@section assimp_dll Windows DLL Build
|
||||||
|
|
||||||
assimp can be built as DLL. You just need to select a -dll config from the list of project
|
The Assimp-package can be built as DLL. You just need to run the default cmake run.
|
||||||
configs and you're fine.
|
|
||||||
|
|
||||||
<b>NOTE:</b> Theoretically, assimp-dll can be used with multithreaded (non-dll) runtime libraries,
|
|
||||||
as long as you don't utilize any non-public stuff from the code folder. However, if you happen
|
|
||||||
to encounter *very* strange problems, try changing the runtime to <i>Multithreaded (Debug) DLL</i>.
|
|
||||||
|
|
||||||
@section assimp_stlport Building against STLport
|
@section assimp static lib
|
||||||
|
|
||||||
STLport is a free, fast and secure STL replacement that works with
|
The Assimp-package can be build as a static library as well. Do do so just set the configuration variable <b>BUILD_SHARED_LIBS</b>
|
||||||
all major compilers and platforms. To get it, download the latest release from
|
to off during the cmake run.
|
||||||
<a href="http://www.stlport.org"/><stlport.org></a>.
|
|
||||||
Usually you'll just need to run 'configure' + a makefile (see their README for more details).
|
|
||||||
Don't miss to add <stlport_root>/stlport to your compiler's default include paths - <b>prior</b>
|
|
||||||
to the directory where your compiler vendor's headers lie. Do the same for <stlport_root>/lib and
|
|
||||||
recompile assimp. To ensure you're really building against STLport see aiGetCompileFlags().
|
|
||||||
<br>
|
|
||||||
In our testing, STLport builds tend to be a bit faster than builds against Microsoft's
|
|
||||||
C++ Standard Library.
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue