ndotl
7c8e8e04fa
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-09 16:00:46 +02:00
Haik Lorenz
7353d25c13
Prevent failing stringstream to crash the export process
...
Text exporters are using string streams to hold the file content first and then write them to the file in a single pass. If for whatever reason the stream has the fail bit set, tellp() will return pos_type(-1), which in turn makes the subsequent write crash - at least on Windows systems. One reason for the stream being in fail state is when its size exceeds 2^31 bytes, even on 64-bit systems (i.e., when very large scenes get exported).
The fix is checking the fail() before even opening the file.
2017-10-09 15:47:17 +02:00
Kim Kulling
21add21ab1
Merge pull request #1484 from jaredmulconry/msvc2013_tempfile_fix
...
Fixed File Size reported as 0 in tests that use temporary files
2017-10-09 00:06:57 +02:00
Kim Kulling
b2716a9c3f
Merge branch 'master' into msvc2013_tempfile_fix
2017-10-08 19:53:53 +02:00
Kim Kulling
55cfe298b0
Merge pull request #1483 from turol/warnings
...
Fix some warnings
2017-10-08 19:45:59 +02:00
Jared Mulconry
4a915653f5
Fixed IOStream reporting a file size of 0 for files that have been written, but not yet been flushed to disk.
2017-10-08 23:42:28 +11:00
Turo Lamminen
f90d874978
Open3DGC: Remove redundant const qualifiers from return types
2017-10-08 12:48:45 +03:00
Turo Lamminen
cd64eae590
GenericProperty: Remove useless const qualifier from return value
2017-10-08 12:45:48 +03:00
Turo Lamminen
7e033c6cef
FBX: Remove useless const qualifier from return value
...
const qualifier on primitive return type does nothing.
2017-10-08 12:45:02 +03:00
turol
8e8ed97750
Merge pull request #1478 from turol/travis
...
Travis refactoring
2017-10-07 16:29:59 +03:00
Turo Lamminen
10b49dfd25
Travis: Remove old attempt at disabling default configurations
...
This didn't actually work and now the default configurations are important.
2017-10-07 15:41:16 +03:00
Turo Lamminen
684cb88e83
Travis: Remove redundant config
2017-10-07 15:40:06 +03:00
Turo Lamminen
bd65811329
Travis: Rename TRAVIS_NO_EXPORT to DISABLE_EXPORTERS so its meaning is more obvious
2017-10-07 15:39:36 +03:00
Turo Lamminen
69b8c1f60d
Travis: TRAVIS_NO_EXPORT is now implicitly off, disable explicit off
2017-10-07 15:36:54 +03:00
Turo Lamminen
f2cf8bf075
Travis: Disable GCC AddressSanitizer build, Clang AddressSanitizer is strictly better
2017-10-07 15:08:41 +03:00
Turo Lamminen
ea58801a2d
Travis: ENABLE_COVERALLS is now implicitly off, disable explicit off
2017-10-07 15:08:02 +03:00
Turo Lamminen
7037fdfe2c
Travis: ASAN is now implicitly off, disable explicit off
2017-10-07 15:06:46 +03:00
Turo Lamminen
42142105fa
CMake: Be more verbose about enabled options
2017-10-07 14:59:12 +03:00
Turo Lamminen
54d14e6e3b
Travis: Refactor how we build CMake options
2017-10-07 14:47:52 +03:00
Turo Lamminen
5301768256
Travis: Remove unused LINUX env variable
2017-10-07 14:33:34 +03:00
turol
cc562b2b1c
Merge pull request #1477 from turol/clang
...
Enable Travis clang build
2017-10-06 19:19:56 +03:00
Jared Mulconry
326158633b
Fixed warnings on MSVC caused by implicit conversions from double to float.
2017-10-06 18:23:28 +03:00
Turo Lamminen
50b43f76e1
OpenGEXImporter: Copy materials to scene
2017-10-06 18:23:28 +03:00
Turo Lamminen
b841ed194b
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
2017-10-06 18:23:28 +03:00
Turo Lamminen
775f984d99
OpenGEXImporter: Fix IOStream leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
22b55d01a2
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
2017-10-06 18:23:28 +03:00
Turo Lamminen
61278aa408
AMFImporter: Fix memory leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
1f16ed9fd0
UnrealLoader: Fix IOStream leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
1bee5b0025
utRemoveVCProcess: Fix memory leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
9eef4c16a8
utMetadata: Fix memory leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
9f5b58e706
Upgrade RapidJSON to get rid of a clang warning
2017-10-06 18:23:28 +03:00
Turo Lamminen
ae8a4c0c62
Fix warning about non-constant array size
2017-10-06 18:22:58 +03:00
Turo Lamminen
d28e88feb7
CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build
2017-10-06 18:22:58 +03:00
Turo Lamminen
5cc316b874
Travis: Treat warnings as errors, without typos this time
2017-10-06 18:22:58 +03:00
Turo Lamminen
a3053eb358
Travis: Build with clang too
2017-10-06 18:22:58 +03:00
turol
8ef219b985
Merge pull request #1476 from assimp/revert-1471-clang
...
Revert "WIP: Enable Travis clang build"
2017-10-06 18:19:54 +03:00
Kim Kulling
c1f93a69ae
Revert "WIP: Enable Travis clang build"
2017-10-06 15:42:05 +02:00
Kim Kulling
4a9ab98240
Merge pull request #1474 from jaredmulconry/issue_1470
...
Update zlib contribution
2017-10-06 15:40:36 +02:00
Kim Kulling
c9b9dab1ff
Merge pull request #1475 from jaredmulconry/master
...
Fixed warning on clang 3.9 caused by static data member in class template
2017-10-06 15:37:33 +02:00
Kim Kulling
b360838ef6
Merge pull request #1471 from turol/clang
...
WIP: Enable Travis clang build
2017-10-06 15:36:53 +02:00
Jared Mulconry
3803a5181c
Fixed warnings on MSVC caused by implicit conversions from double to float.
2017-10-06 20:32:33 +11:00
Jared Mulconry
341222697a
Address warnings on Clang 3.9 caused by having a static data member in a class template.
2017-10-05 23:55:10 +11:00
Turo Lamminen
3f0bb9c634
OpenGEXImporter: Copy materials to scene
2017-10-05 12:51:08 +03:00
Turo Lamminen
568003a0d3
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
2017-10-05 12:43:49 +03:00
Turo Lamminen
e7ff7b167f
OpenGEXImporter: Fix IOStream leak
2017-10-05 12:38:44 +03:00
Turo Lamminen
b6d2b91799
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
2017-10-05 12:35:17 +03:00
Turo Lamminen
316046f748
AMFImporter: Fix memory leak
2017-10-05 12:15:28 +03:00
Turo Lamminen
34acf47acd
UnrealLoader: Fix IOStream leak
2017-10-05 12:15:28 +03:00
Turo Lamminen
674fb5a46c
utRemoveVCProcess: Fix memory leak
2017-10-05 12:15:28 +03:00
Turo Lamminen
9bcfce63dc
utMetadata: Fix memory leak
2017-10-05 12:15:28 +03:00