Commit Graph

9572 Commits (0eb9005bc13754ee713bf33da8a29f8de4e7cec3)

Author SHA1 Message Date
Kim Kulling 0eb9005bc1
Merge pull request #3589 from assimp/kimkulling-off_fuzz28288
Fix overflow in aiString
2021-01-18 20:19:01 +01:00
Kim Kulling 11ee9d3673
Update types.h 2021-01-18 19:46:32 +01:00
Kim Kulling 5a764fff04
Fix overflow in aiString 2021-01-18 19:44:10 +01:00
Kim Kulling 3c1d8850a4
Merge pull request #3586 from assimp/kimkulling-ossfuzz_issue29655
Fix Divide-by-zero in vector3
2021-01-17 20:53:45 +01:00
Kim Kulling 658fec3e61
Fix cast 2021-01-17 20:41:44 +01:00
Kim Kulling 0969bf3500
Fix Divide-by-zero in vector3
Fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=29655
2021-01-17 20:39:19 +01:00
Kim Kulling 061ef1f263
Merge pull request #3578 from gkv311/master
aiMaterial::GetTexture() - fix misleading description of path argument.
2021-01-16 17:16:05 +01:00
Kim Kulling aed0b3e53b
Merge branch 'master' into master 2021-01-16 16:37:57 +01:00
Kim Kulling 918c3abb32
Merge pull request #3585 from assimp/kimkulling-fix-zlib-deployment
remove install of zlibstatic
2021-01-16 16:25:29 +01:00
Kim Kulling 9334e07619
Update CMakeLists.txt 2021-01-16 16:14:49 +01:00
Kim Kulling 8ad2661e0c
Update CMakeLists.txt 2021-01-16 12:00:42 +01:00
Kim Kulling 6db343386b
remove install of zlibstatic 2021-01-15 16:46:15 +01:00
Kim Kulling 8125e06f49
Merge branch 'master' into master 2021-01-14 19:03:16 +01:00
Kim Kulling e3d39b9f66
Merge pull request #3583 from assimp/kimkulling-replace_sstrcasecmp
Remove dependency to posix-extension function
2021-01-14 12:06:24 +01:00
Kim Kulling 484ac21ef5
Remove dependency to posix-extension function 2021-01-14 11:53:25 +01:00
Kim Kulling 6d6a6ac11e
Merge pull request #3575 from ms-maxvollmer/gltf2_buffer_fixes
Fixes for GLTF2 buffers
2021-01-14 09:57:39 +01:00
Kim Kulling 87a6305cf0
Merge branch 'master' into gltf2_buffer_fixes 2021-01-12 18:32:17 +01:00
Kim Kulling 20873cb142
Merge pull request #3581 from assimp/build_fixes
Use const instead of constexpr
2021-01-12 18:31:53 +01:00
kkulling 9174bca3f7 closes https://github.com/assimp/assimp/issues/3517: use const instead of constexpr 2021-01-12 10:01:53 +01:00
Kirill Gavrilov 0c2772e8bf aiMaterial::GetTexture() - fix misleading description of path argument.
Mention aiScene::GetEmbeddedTexture() as a proper way to check if returned path
points to a file or to embedded texture.
2021-01-12 01:00:45 +03:00
Max Vollmer d49aed4585 * Check that buffer view has buffer
* Handle integer overflow when calculating byte length
* Minor code cleanup for exception messages
2021-01-11 08:45:47 +00:00
Kim Kulling ec08092dbf
Merge pull request #3571 from JacksonM8/issue_3570
Issue 3570 (CMake Policy violations on MSVC)
2021-01-09 08:41:28 +01:00
Kim Kulling 68be7c77c0
Merge branch 'master' into issue_3570 2021-01-08 15:22:14 +01:00
Kim Kulling 1e81bed4d0
Merge pull request #3561 from ffontaine/master
contrib/zlib/CMakeLists.txt: don't install zlib
2021-01-07 11:05:37 +01:00
Kim Kulling d898ecc80c
Fix another typo. 2021-01-06 18:59:13 +01:00
Kim Kulling 2ad4218d25
Merge branch 'master' into master 2021-01-06 18:54:57 +01:00
Kim Kulling 5222ab989f
Fix a typo 2021-01-06 18:51:59 +01:00
Kim Kulling b23ecb4864
Update CMakeLists.txt
- Update minimum cmake version
- install for win32-platforms to avoid conflicts with targets for win32
2021-01-06 18:51:30 +01:00
JacksonM8 a01ef5374c
Merge branch 'master' into issue_3570 2021-01-07 01:47:06 +10:30
Kim Kulling 53c03fa364
Merge pull request #3569 from ihsinme/master
fix of an unattainable condition.
2021-01-06 16:00:46 +01:00
JacksonM8 3eed6fa006 Remove relative pathing in target_sources() as per CMP0076 2021-01-07 01:23:41 +10:30
JacksonM8 d0e57e2554 Remove quoted variable de-referencing as per CMP0054 2021-01-07 00:40:50 +10:30
ihsinme e1052f421b
Update OpenDDLParser.cpp 2021-01-06 16:52:28 +03:00
ihsinme 177304bb7c
Update o3dgcArithmeticCodec.cpp 2021-01-06 16:50:07 +03:00
Kim Kulling ccc0a50d96
Merge pull request #3558 from JLouis-B/3mf-improvements
3mf improvements
2021-01-02 13:29:58 +01:00
Kim Kulling cf78781fa8
Merge branch 'master' into 3mf-improvements 2021-01-02 13:14:13 +01:00
Kim Kulling 43ea4d679b
Merge pull request #3556 from JLouis-B/update-unzip
Update unzip contrib
2021-01-02 13:13:20 +01:00
Kim Kulling 3298082a96
Merge branch 'master' into update-unzip 2021-01-02 12:06:53 +01:00
Kim Kulling 05da2123e1
Merge pull request #3552 from Danny-Kint/dev/gltf-KHR_materials
[gltf2] Add support for extensions KHR_materials
2021-01-02 12:06:12 +01:00
Kim Kulling 48b138ce13
Merge branch 'master' into dev/gltf-KHR_materials 2021-01-02 10:02:07 +01:00
Kim Kulling 89d4d6b68f
Merge pull request #3546 from wasd845/develop3
add operator* in aiQuaterniont
2021-01-02 00:50:53 +01:00
Kim Kulling fa24e4199c
Merge branch 'master' into develop3 2021-01-02 00:13:47 +01:00
Kim Kulling 18ad1510f7
Merge pull request #3543 from gris-martin/patch-1
Only consider continuation tokens at end of line
2021-01-02 00:12:57 +01:00
Kim Kulling 0a1535647a
Merge branch 'master' into patch-1 2021-01-02 00:01:25 +01:00
Danny-Kint 07aace0fdd
Merge branch 'master' into dev/gltf-KHR_materials 2020-12-31 07:08:31 +01:00
Kim Kulling 465220b26a
Merge branch 'master' into 3mf-improvements 2020-12-30 18:12:26 +01:00
Kim Kulling 88e5f3416e
Merge pull request #3562 from makitsune/fix-gltf-bin-from-memory
Fix glTF from memory loading .bin with a custom IOHandler
2020-12-30 11:50:35 +01:00
Kim Kulling e0803b3ec2
Merge branch 'master' into fix-gltf-bin-from-memory 2020-12-30 11:17:31 +01:00
Danny-Kint b8d947299a
Merge branch 'master' into dev/gltf-KHR_materials 2020-12-29 17:09:15 +01:00
Jean-Louis 37df38f951 [3MF] Improves node naming 2020-12-29 15:46:28 +01:00