platform/upstream/assimp.git
6 years agoAttempting to get tests to run.
Jared Mulconry [Sun, 8 Oct 2017 01:32:14 +0000 (12:32 +1100)]
Attempting to get tests to run.

6 years agoAttempting to address issues with cloning the repo. shallow_copy seems to fail at...
Jared Mulconry [Sun, 8 Oct 2017 00:55:54 +0000 (11:55 +1100)]
Attempting to address issues with cloning the repo. shallow_copy seems to fail at times. I'll let it continue to clone the whole history.

6 years agoAttempting to get the tests detected and run.
Jared Mulconry [Sat, 7 Oct 2017 15:22:37 +0000 (02:22 +1100)]
Attempting to get the tests detected and run.

6 years agoPaths aren't what I expected for the test directory. Trying something else, with...
Jared Mulconry [Sat, 7 Oct 2017 15:03:00 +0000 (02:03 +1100)]
Paths aren't what I expected for the test directory. Trying something else, with a testing call to dir to help track it down.

6 years agox86 isn't a valid VS platform. Win32 it is, then.
Jared Mulconry [Sat, 7 Oct 2017 14:55:10 +0000 (01:55 +1100)]
x86 isn't a valid VS platform. Win32 it is, then.

6 years agoReplaced the worker image name, which doesn't work as generator name, with a manually...
Jared Mulconry [Sat, 7 Oct 2017 14:47:08 +0000 (01:47 +1100)]
Replaced the worker image name, which doesn't work as generator name, with a manually created generator name.

6 years agoMerge branch 'master' into appveyor
Jared Mulconry [Sat, 7 Oct 2017 14:34:02 +0000 (00:34 +1000)]
Merge branch 'master' into appveyor

6 years agoApparently @ escaping batch commands doesn't work in this context.
Jared Mulconry [Sat, 7 Oct 2017 14:33:48 +0000 (01:33 +1100)]
Apparently @ escaping batch commands doesn't work in this context.

6 years agoCleaned up appveyor setup, added VS 2017 to the build matrix and attempted to add...
Jared Mulconry [Sat, 7 Oct 2017 14:27:21 +0000 (01:27 +1100)]
Cleaned up appveyor setup, added VS 2017 to the build matrix and attempted to add running of tests.

6 years agoMerge pull request #1478 from turol/travis
turol [Sat, 7 Oct 2017 13:29:59 +0000 (16:29 +0300)]
Merge pull request #1478 from turol/travis

Travis refactoring

6 years agoTravis: Remove old attempt at disabling default configurations
Turo Lamminen [Sat, 7 Oct 2017 12:41:16 +0000 (15:41 +0300)]
Travis: Remove old attempt at disabling default configurations

This didn't actually work and now the default configurations are important.

6 years agoTravis: Remove redundant config
Turo Lamminen [Sat, 7 Oct 2017 12:39:54 +0000 (15:39 +0300)]
Travis: Remove redundant config

6 years agoTravis: Rename TRAVIS_NO_EXPORT to DISABLE_EXPORTERS so its meaning is more obvious
Turo Lamminen [Sat, 7 Oct 2017 12:37:45 +0000 (15:37 +0300)]
Travis: Rename TRAVIS_NO_EXPORT to DISABLE_EXPORTERS so its meaning is more obvious

6 years agoTravis: TRAVIS_NO_EXPORT is now implicitly off, disable explicit off
Turo Lamminen [Sat, 7 Oct 2017 12:36:54 +0000 (15:36 +0300)]
Travis: TRAVIS_NO_EXPORT is now implicitly off, disable explicit off

6 years agoTravis: Disable GCC AddressSanitizer build, Clang AddressSanitizer is strictly better
Turo Lamminen [Sat, 7 Oct 2017 12:08:41 +0000 (15:08 +0300)]
Travis: Disable GCC AddressSanitizer build, Clang AddressSanitizer is strictly better

6 years agoTravis: ENABLE_COVERALLS is now implicitly off, disable explicit off
Turo Lamminen [Sat, 7 Oct 2017 12:08:02 +0000 (15:08 +0300)]
Travis: ENABLE_COVERALLS is now implicitly off, disable explicit off

6 years agoTravis: ASAN is now implicitly off, disable explicit off
Turo Lamminen [Sat, 7 Oct 2017 12:06:46 +0000 (15:06 +0300)]
Travis: ASAN is now implicitly off, disable explicit off

6 years agoCMake: Be more verbose about enabled options
Turo Lamminen [Sat, 7 Oct 2017 11:59:12 +0000 (14:59 +0300)]
CMake: Be more verbose about enabled options

6 years agoTravis: Refactor how we build CMake options
Turo Lamminen [Sat, 7 Oct 2017 11:47:52 +0000 (14:47 +0300)]
Travis: Refactor how we build CMake options

6 years agoTravis: Remove unused LINUX env variable
Turo Lamminen [Sat, 7 Oct 2017 11:33:34 +0000 (14:33 +0300)]
Travis: Remove unused LINUX env variable

6 years agoMerge pull request #1477 from turol/clang
turol [Fri, 6 Oct 2017 16:19:56 +0000 (19:19 +0300)]
Merge pull request #1477 from turol/clang

Enable Travis clang build

6 years agoFixed warnings on MSVC caused by implicit conversions from double to float.
Jared Mulconry [Fri, 6 Oct 2017 09:32:33 +0000 (20:32 +1100)]
Fixed warnings on MSVC caused by implicit conversions from double to float.

6 years agoOpenGEXImporter: Copy materials to scene
Turo Lamminen [Thu, 5 Oct 2017 09:51:08 +0000 (12:51 +0300)]
OpenGEXImporter: Copy materials to scene

6 years agoOpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
Turo Lamminen [Thu, 5 Oct 2017 09:43:49 +0000 (12:43 +0300)]
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up

6 years agoOpenGEXImporter: Fix IOStream leak
Turo Lamminen [Thu, 5 Oct 2017 09:38:44 +0000 (12:38 +0300)]
OpenGEXImporter: Fix IOStream leak

6 years agoOpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
Turo Lamminen [Thu, 5 Oct 2017 09:35:17 +0000 (12:35 +0300)]
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up

6 years agoAMFImporter: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 09:09:26 +0000 (12:09 +0300)]
AMFImporter: Fix memory leak

6 years agoUnrealLoader: Fix IOStream leak
Turo Lamminen [Thu, 5 Oct 2017 08:56:13 +0000 (11:56 +0300)]
UnrealLoader: Fix IOStream leak

6 years agoutRemoveVCProcess: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 08:55:58 +0000 (11:55 +0300)]
utRemoveVCProcess: Fix memory leak

6 years agoutMetadata: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 08:33:27 +0000 (11:33 +0300)]
utMetadata: Fix memory leak

6 years agoUpgrade RapidJSON to get rid of a clang warning
Turo Lamminen [Thu, 5 Oct 2017 08:10:22 +0000 (11:10 +0300)]
Upgrade RapidJSON to get rid of a clang warning

6 years agoFix warning about non-constant array size
Turo Lamminen [Thu, 5 Oct 2017 07:45:25 +0000 (10:45 +0300)]
Fix warning about non-constant array size

6 years agoCMake: Remove OpenMP stuff, it's unused and breaks Travis clang build
Turo Lamminen [Wed, 4 Oct 2017 18:21:36 +0000 (21:21 +0300)]
CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build

6 years agoTravis: Treat warnings as errors, without typos this time
Turo Lamminen [Wed, 4 Oct 2017 18:10:49 +0000 (21:10 +0300)]
Travis: Treat warnings as errors, without typos this time

6 years agoTravis: Build with clang too
Turo Lamminen [Wed, 4 Oct 2017 17:50:16 +0000 (20:50 +0300)]
Travis: Build with clang too

6 years agoMerge pull request #1476 from assimp/revert-1471-clang
turol [Fri, 6 Oct 2017 15:19:54 +0000 (18:19 +0300)]
Merge pull request #1476 from assimp/revert-1471-clang

Revert "WIP: Enable Travis clang build"

6 years agoRevert "WIP: Enable Travis clang build"
Kim Kulling [Fri, 6 Oct 2017 13:42:05 +0000 (15:42 +0200)]
Revert "WIP: Enable Travis clang build"

6 years agoMerge pull request #1474 from jaredmulconry/issue_1470
Kim Kulling [Fri, 6 Oct 2017 13:40:36 +0000 (15:40 +0200)]
Merge pull request #1474 from jaredmulconry/issue_1470

Update zlib contribution

6 years agoMerge pull request #1475 from jaredmulconry/master
Kim Kulling [Fri, 6 Oct 2017 13:37:33 +0000 (15:37 +0200)]
Merge pull request #1475 from jaredmulconry/master

Fixed warning on clang 3.9 caused by static data member in class template

6 years agoMerge pull request #1471 from turol/clang
Kim Kulling [Fri, 6 Oct 2017 13:36:53 +0000 (15:36 +0200)]
Merge pull request #1471 from turol/clang

WIP: Enable Travis clang build

6 years agoFixed warnings on MSVC caused by implicit conversions from double to float.
Jared Mulconry [Fri, 6 Oct 2017 09:32:33 +0000 (20:32 +1100)]
Fixed warnings on MSVC caused by implicit conversions from double to float.

6 years agoAddress warnings on Clang 3.9 caused by having a static data member in a class template.
Jared Mulconry [Thu, 5 Oct 2017 12:55:10 +0000 (23:55 +1100)]
Address warnings on Clang 3.9 caused by having a static data member in a class template.

6 years agoOpenGEXImporter: Copy materials to scene
Turo Lamminen [Thu, 5 Oct 2017 09:51:08 +0000 (12:51 +0300)]
OpenGEXImporter: Copy materials to scene

6 years agoOpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
Turo Lamminen [Thu, 5 Oct 2017 09:43:49 +0000 (12:43 +0300)]
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up

6 years agoOpenGEXImporter: Fix IOStream leak
Turo Lamminen [Thu, 5 Oct 2017 09:38:44 +0000 (12:38 +0300)]
OpenGEXImporter: Fix IOStream leak

6 years agoOpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
Turo Lamminen [Thu, 5 Oct 2017 09:35:17 +0000 (12:35 +0300)]
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up

6 years agoAMFImporter: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 09:09:26 +0000 (12:09 +0300)]
AMFImporter: Fix memory leak

6 years agoUnrealLoader: Fix IOStream leak
Turo Lamminen [Thu, 5 Oct 2017 08:56:13 +0000 (11:56 +0300)]
UnrealLoader: Fix IOStream leak

6 years agoutRemoveVCProcess: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 08:55:58 +0000 (11:55 +0300)]
utRemoveVCProcess: Fix memory leak

6 years agoutMetadata: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 08:33:27 +0000 (11:33 +0300)]
utMetadata: Fix memory leak

6 years agoUpgrade RapidJSON to get rid of a clang warning
Turo Lamminen [Thu, 5 Oct 2017 08:10:22 +0000 (11:10 +0300)]
Upgrade RapidJSON to get rid of a clang warning

6 years agoFBXImporter: Add explicit instantiation of log_prefix so other FBX source files can...
Turo Lamminen [Thu, 5 Oct 2017 08:05:27 +0000 (11:05 +0300)]
FBXImporter: Add explicit instantiation of log_prefix so other FBX source files can see it

6 years agoIFCImporter: Add explicit instantiation of log_prefix so IFCMaterial.cpp can see it
Turo Lamminen [Thu, 5 Oct 2017 07:51:48 +0000 (10:51 +0300)]
IFCImporter: Add explicit instantiation of log_prefix so IFCMaterial.cpp can see it

6 years agoRemoved unnecessary files from zlib contribution
Jared Mulconry [Thu, 5 Oct 2017 09:11:18 +0000 (20:11 +1100)]
Removed unnecessary files from zlib contribution

6 years agoMerge branch 'master' of github.com:assimp/assimp into issue_1470
Jared Mulconry [Thu, 5 Oct 2017 08:34:37 +0000 (19:34 +1100)]
Merge branch 'master' of github.com:assimp/assimp into issue_1470

6 years agoFix warning about non-constant array size
Turo Lamminen [Thu, 5 Oct 2017 07:45:25 +0000 (10:45 +0300)]
Fix warning about non-constant array size

6 years agoCMake: Remove OpenMP stuff, it's unused and breaks Travis clang build
Turo Lamminen [Wed, 4 Oct 2017 18:21:36 +0000 (21:21 +0300)]
CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build

6 years agoTravis: Treat warnings as errors, without typos this time
Turo Lamminen [Wed, 4 Oct 2017 18:10:49 +0000 (21:10 +0300)]
Travis: Treat warnings as errors, without typos this time

6 years agoTravis: Build with clang too
Turo Lamminen [Wed, 4 Oct 2017 17:50:16 +0000 (20:50 +0300)]
Travis: Build with clang too

6 years agoMerge pull request #1432 from turol/asan
Kim Kulling [Wed, 4 Oct 2017 14:12:44 +0000 (16:12 +0200)]
Merge pull request #1432 from turol/asan

Asan

6 years agoMerge pull request #1469 from turol/warnings
Kim Kulling [Wed, 4 Oct 2017 11:26:12 +0000 (13:26 +0200)]
Merge pull request #1469 from turol/warnings

Treat warnings as errors on Appveyor

6 years agoUpgraded zlib to 1.2.11.1 from the develop branch.
Jared Mulconry [Wed, 4 Oct 2017 09:33:59 +0000 (20:33 +1100)]
Upgraded zlib to 1.2.11.1 from the develop branch.

6 years agoMerge pull request #1468 from assimp/issue_1467
Kim Kulling [Tue, 3 Oct 2017 07:58:56 +0000 (09:58 +0200)]
Merge pull request #1468 from assimp/issue_1467

closes https://github.com/assimp/assimp/issues/1467.

6 years agoDisable warning 4351 on MSVC 2013
Turo Lamminen [Mon, 2 Oct 2017 10:08:20 +0000 (13:08 +0300)]
Disable warning 4351 on MSVC 2013

6 years agoappveyor: Treat warnings as errors
Turo Lamminen [Mon, 2 Oct 2017 08:43:29 +0000 (11:43 +0300)]
appveyor: Treat warnings as errors

6 years agoFix warnings-as-errors flag on MSVC
Turo Lamminen [Mon, 2 Oct 2017 08:40:57 +0000 (11:40 +0300)]
Fix warnings-as-errors flag on MSVC

6 years agoAddressed some mismatched news/deletes caused by the new glTF2 sources.
Jared Mulconry [Sun, 1 Oct 2017 06:51:13 +0000 (17:51 +1100)]
Addressed some mismatched news/deletes caused by the new glTF2 sources.

6 years agoAddressed a number of memory leaks identified in unit tests by asan
Jared Mulconry [Sun, 1 Oct 2017 12:16:21 +0000 (23:16 +1100)]
Addressed a number of memory leaks identified in unit tests by asan

6 years agoAddressed asan failures caused by misuse of APIs within unit tests.
Jared Mulconry [Sun, 1 Oct 2017 08:25:43 +0000 (19:25 +1100)]
Addressed asan failures caused by misuse of APIs within unit tests.

6 years agoFix delete / delete[] mismatches in glTF2 importer
Turo Lamminen [Thu, 14 Sep 2017 07:34:16 +0000 (10:34 +0300)]
Fix delete / delete[] mismatches in glTF2 importer

6 years agoFix delete / delete[] mismatches in MakeVerboseFormat
Turo Lamminen [Thu, 14 Sep 2017 07:33:49 +0000 (10:33 +0300)]
Fix delete / delete[] mismatches in MakeVerboseFormat

6 years agoFix out-of-bounds read in MaterialSystem unit test
Turo Lamminen [Thu, 14 Sep 2017 06:38:07 +0000 (09:38 +0300)]
Fix out-of-bounds read in MaterialSystem unit test

6 years agoFix delete / delete[] mismatch in glTFAsset
Turo Lamminen [Tue, 12 Sep 2017 16:00:44 +0000 (19:00 +0300)]
Fix delete / delete[] mismatch in glTFAsset

6 years agoEnable AddressSanitizer for Linux clang build
Turo Lamminen [Tue, 12 Sep 2017 16:09:22 +0000 (19:09 +0300)]
Enable AddressSanitizer for Linux clang build

6 years agoAdd AddressSanitizer option to CMake
Turo Lamminen [Tue, 12 Sep 2017 15:57:44 +0000 (18:57 +0300)]
Add AddressSanitizer option to CMake

6 years agoOpenGEX: improve logging to be able to detect error-prone situations.
Kim Kulling [Mon, 2 Oct 2017 07:41:01 +0000 (09:41 +0200)]
OpenGEX: improve logging to be able to detect error-prone situations.

6 years agocloses https://github.com/assimp/assimp/issues/1467.
Kim Kulling [Mon, 2 Oct 2017 07:33:51 +0000 (09:33 +0200)]
closes https://github.com/assimp/assimp/issues/1467.

6 years agoMerge pull request #1466 from jaredmulconry/issue_1330
Kim Kulling [Sun, 1 Oct 2017 18:03:30 +0000 (20:03 +0200)]
Merge pull request #1466 from jaredmulconry/issue_1330

Eliminated warnings when building the project with clang

6 years agoMerge pull request #1465 from turol/warnings
Kim Kulling [Sun, 1 Oct 2017 18:01:24 +0000 (20:01 +0200)]
Merge pull request #1465 from turol/warnings

Make Travis treat warnings as errors

6 years agotravis: Treat warnings as errors
Turo Lamminen [Sat, 30 Sep 2017 13:35:41 +0000 (16:35 +0300)]
travis: Treat warnings as errors

6 years agoFix CMAKE option name
Turo Lamminen [Sat, 30 Sep 2017 13:35:11 +0000 (16:35 +0300)]
Fix CMAKE option name

6 years agoOpen3DGC: Fix some uninitialized variable warnings
Turo Lamminen [Tue, 26 Sep 2017 15:33:00 +0000 (18:33 +0300)]
Open3DGC: Fix some uninitialized variable warnings

6 years agoEliminated all warnings under clang with default settings. One remains in the include...
Jared Mulconry [Sat, 30 Sep 2017 13:29:56 +0000 (23:29 +1000)]
Eliminated all warnings under clang with default settings. One remains in the included zlib contrib project.

6 years agoAdded -fPIC flag to C compilers for GCC and clang. Removed -pedantic flag from some...
Jared Mulconry [Sat, 30 Sep 2017 13:28:02 +0000 (23:28 +1000)]
Added -fPIC flag to C compilers for GCC and clang. Removed -pedantic flag from some compilers.

6 years agoadd some asserts.
Kim Kulling [Sat, 30 Sep 2017 08:47:23 +0000 (10:47 +0200)]
add some asserts.

6 years agocloses https://github.com/assimp/assimp/issues/1450: use correct name of exporter...
Kim Kulling [Sat, 30 Sep 2017 07:38:13 +0000 (09:38 +0200)]
closes https://github.com/assimp/assimp/issues/1450: use correct name of exporter to gltf2

6 years agoObj: rename attribute from exporter.
Kim Kulling [Sat, 30 Sep 2017 07:37:34 +0000 (09:37 +0200)]
Obj: rename attribute from exporter.

6 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 29 Sep 2017 19:59:11 +0000 (21:59 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

6 years agocloses https://github.com/assimp/assimp/issues/1459: fix out-of-boundary access error
Kim Kulling [Fri, 29 Sep 2017 19:58:58 +0000 (21:58 +0200)]
closes https://github.com/assimp/assimp/issues/1459: fix out-of-boundary access error

6 years agoMerge pull request #1462 from jaredmulconry/issue_1330
Kim Kulling [Fri, 29 Sep 2017 14:48:30 +0000 (16:48 +0200)]
Merge pull request #1462 from jaredmulconry/issue_1330

Fully addressed identifiable build warnings on gcc

6 years agoMerge branch 'master' of github.com:assimp/assimp into issue_1330
Jared Mulconry [Fri, 29 Sep 2017 04:15:53 +0000 (14:15 +1000)]
Merge branch 'master' of github.com:assimp/assimp into issue_1330

6 years agoMerge pull request #1461 from jfaust/master
Kim Kulling [Thu, 28 Sep 2017 19:21:56 +0000 (21:21 +0200)]
Merge pull request #1461 from jfaust/master

Fix possible infinite loop when exporting to gltf2

6 years agoChanged a couple more function interfaces to correct the input type.
Jared Mulconry [Thu, 28 Sep 2017 15:40:05 +0000 (01:40 +1000)]
Changed a couple more function interfaces to correct the input type.

6 years agoReplaced unsigned long for the crc table to z_crc_t, to match what is returned by...
Jared Mulconry [Thu, 28 Sep 2017 15:29:11 +0000 (01:29 +1000)]
Replaced unsigned long for the crc table to z_crc_t, to match what is returned by get-crc_table

6 years agoFix glTF2::Asset::FindUniqueID() when the input string is >= 256 chars
Josh Faust [Thu, 28 Sep 2017 01:41:35 +0000 (18:41 -0700)]
Fix glTF2::Asset::FindUniqueID() when the input string is >= 256 chars

6 years agoImproved the naming of temporary file generator function. Replaced use of tmpnam...
Jared Mulconry [Tue, 26 Sep 2017 12:41:20 +0000 (22:41 +1000)]
Improved the naming of temporary file generator function. Replaced use of tmpnam in utIOStreamBuffer with this facility to addresssafety warning.

6 years agoAdded a header to hold the file generation code for unit testing purposes.
Jared Mulconry [Tue, 26 Sep 2017 12:08:52 +0000 (22:08 +1000)]
Added a header to hold the file generation code for unit testing purposes.

6 years agoMerge branch 'master' of github.com:assimp/assimp into issue_1330
Jared Mulconry [Tue, 26 Sep 2017 11:35:53 +0000 (21:35 +1000)]
Merge branch 'master' of github.com:assimp/assimp into issue_1330

6 years agoChanged the method by which temporary files are created for unit the FileSizeTest...
Jared Mulconry [Tue, 26 Sep 2017 11:32:11 +0000 (21:32 +1000)]
Changed the method by which temporary files are created for unit the FileSizeTest. Will apply to other tests next.

6 years agoMerge pull request #1457 from jaredmulconry/issue_1330
Kim Kulling [Tue, 26 Sep 2017 06:24:07 +0000 (08:24 +0200)]
Merge pull request #1457 from jaredmulconry/issue_1330

Partially address issue #1330