48fa3153c6
Merge pull request #455 from turol/master
...
Fix some infinite loops
2015-02-01 12:54:15 +01:00
b93bd167ed
Fix infinite loop in STL loader error path
...
It appears that this was never tested since hitting it caused an infinite loop.
Fixes testcase hangs/c2eb1fa3e74c6ffe0cebcb1672b03140
2015-02-01 00:35:00 +02:00
fe89773c6f
Fix infinite loop in PLY parser
...
Fixes testcase hangs/9ab979ab256c70aaec9b651f32f051e9
2015-02-01 00:22:32 +02:00
6b9f9afd7a
Fix infinite loop in STL loader
...
If next character was not part of valid token and not whitespace we
would end up spinning in the loop indefinitely. Fix by using do..while
loop which always skips at least one character.
Fixes testcase hangs/73b42cd3b6d05e2ddb5c0fe5888459bc
2015-02-01 00:09:32 +02:00
e9dcad4181
openddl-parser: latest greatest.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 21:23:50 +01:00
c7785014e4
Merge branch 'master' of github.com:assimp/assimp
2015-01-31 20:53:38 +01:00
455d190fd0
CMakeLists: backwards compatibility with CMake < 3.0.
2015-01-31 20:51:36 +01:00
08ad6ae8fe
Merge pull request #450 from turol/afl-fixes
...
Fix some bugs found with afl
2015-01-31 20:51:07 +01:00
792da49933
Fix out-of-bounds write when STL file node name is too long
2015-01-31 21:36:13 +02:00
f971b66c47
Fix out-of-bounds read in invalid compressed X file
2015-01-31 21:36:08 +02:00
0e579bfb06
openddl-parser: latest greatest.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 12:01:18 +01:00
e1c6a16b85
support of openddlparser lib without x++11.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 11:46:13 +01:00
8e87613bb3
add mmissing header.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 11:31:39 +01:00
063b2733fc
Merge branch 'master' into opengex_support
2015-01-31 11:09:20 +01:00
1ee4c06e4b
add openddl-parser to contrib.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 11:07:48 +01:00
95ad827277
Remove bogus delete[] on error path
...
mBuffer is a pointer inside a std::vector so don't try to delete[] it.
2015-01-29 23:22:56 +02:00
0108d5b1f9
Fix read past end of buffer on malformed LWOB files
2015-01-29 23:22:56 +02:00
16f9ca35d2
Fix out-of-bounds read when OFF file contains no vertices
2015-01-29 23:22:56 +02:00
af09e68654
Fix memory corruption when LWO file contains bad-sized points chunk
2015-01-29 23:22:41 +02:00
2f0675ac53
Fix memory corruption when 3DS file has more smoothing groups than faces
2015-01-29 23:18:19 +02:00
b700cd917f
Merge pull request #452 from ricortiz/FixExportedLibraryNameVariable
...
Fix exported library name variable
2015-01-29 17:24:30 +01:00
80a2c9a9ab
Merge pull request #446 from yeonseok-yi/master
...
Fixed error of aiQuaterniont::Rotate()
2015-01-29 11:37:03 +01:00
c5d048a98a
Fix crash when 3DS file contains faces but no vertices
2015-01-28 18:37:36 +02:00
f167fe1d4a
Ignore unix editor backup files
2015-01-28 18:36:23 +02:00
7d887204ac
Merge pull request #449 from mikedh/master
...
default postprocessing options
2015-01-28 09:07:15 +01:00
25012f7b8a
added list of supported formats, pulled from webpage and test/models
2015-01-27 22:53:31 -05:00
704e57db4e
changed default postprocessing option to triangulate quad meshes
2015-01-27 22:47:05 -05:00
a482bc59f4
Merge pull request #448 from assimp/revert-447-master
...
Revert "Fix warnings under Visual Studio 12"
2015-01-26 19:54:18 +01:00
8b55d276e9
Revert "Fix warnings under Visual Studio 12"
2015-01-26 19:54:02 +01:00
dee3a2c6d9
Merge pull request #447 from expipiplus1/master
...
Fix warnings under Visual Studio 12
2015-01-26 19:41:57 +01:00
00d561982c
Use size_t instead of int for number of points
...
This squashes warnings under Visual Studio 12
2015-01-26 15:46:58 +00:00
1cf81227c4
Simplify behavior of SweepContext::InitEdges
2015-01-26 15:46:55 +00:00
1bdb31f8aa
Fixed error of aiQuaterniont::Rotate()
...
The function rotates a point to opposite direction.
Conjugate() should be applied to inverse of the quaternion.
2015-01-26 21:09:54 +09:00
a444bf48a1
Merge pull request #445 from turol/master
...
Avoid division by zero in assimp_cmd info when scene loading succeeds bu...
2015-01-25 21:46:26 +01:00
b97c26b1d2
Avoid division by zero in assimp_cmd info when scene loading succeeds but contains no meshes
2015-01-25 22:30:10 +02:00
cc346d3e12
Merge pull request #437 from CasperTech/master
...
Add support for component controlled matrix transforms, i.e transform(0)...
2015-01-25 19:44:27 +01:00
f62d03bd03
Merge pull request #439 from expipiplus1/master
...
Fix incorrect abs usage
2015-01-25 19:41:46 +01:00
707c65283d
Merge pull request #444 from Einarin/master
...
Check that zlib initialized correctly in FBX parser
2015-01-24 12:36:19 -08:00
380021e7c4
Check that zlib initialized correctly in FBX parser
...
Check the return code of inflateInit() indicates success to avoid
crashing later when zstream contains invalid data.
2015-01-24 00:00:35 -05:00
a94e668486
Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX
...
to have a consistent library name accross platforms.
2015-01-23 14:19:29 -05:00
e2a33e726d
Add quotes to build type variable.
2015-01-23 10:10:51 -05:00
1c60211a15
Merge pull request #436 from ricortiz/FixExportedLibraryNameVariable
...
Set ASSIMP_LIBRARIES to the proper library name
2015-01-22 23:12:40 -08:00
5f646f2097
Merge pull request #440 from expipiplus1/correct_include
...
Use correct header for INT_MAX
2015-01-22 18:53:53 -08:00
50dbb867ec
Include stdint.h for uint64_t
2015-01-22 21:27:43 +00:00
7494cb6e4b
Use correct include file for INT_MAX
...
INT_MAX is defined in limits.h, not stdint.h
2015-01-22 20:19:34 +00:00
e8d4479344
Squash incorrect abs usage
...
Replace calls to abs with a float to calls to std::abs. Before int abs(int)
was being called.
2015-01-22 20:03:13 +00:00
a09de30d83
Add support for component controlled matrix transforms, i.e transform(0)(0) etc.
2015-01-21 01:45:35 +00:00
27f3771582
Set ASSIMP_LIBRARIES to the proper library name
...
in assimp-config.cmake so that other programs can find it.
2015-01-20 13:23:45 -05:00
62225f61e4
Merge branch 'master' into opengex_support
...
Conflicts:
.gitignore
2015-01-13 20:21:17 +01:00
af48644e56
fix build.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-03 01:09:33 +01:00
Alexander Gessler
Turo Lamminen
Kim Kulling
Alexander Gessler
Kim Kulling
Michael Dawson-Haggerty
Joe Hermaszewski
yeonseok-yi
Johnny Dickinson
Ricardo Ortiz
Tom Mettam