Commit Graph

12537 Commits (5c7acc968bb02baf51e0e9f6a6232301abd6d21d)

Author SHA1 Message Date
Kim Kulling ee3aaf7446
Merge branch 'master' into patch-1 2022-07-08 11:14:22 +02:00
Kim Kulling ab4223f671
Merge pull request #4629 from assimp/kimkulling/fix_leak_in_D3MFOpcPackage_issue-4628
Fix memory leak in D3MFOpcPackage
2022-07-08 11:13:41 +02:00
tanolino c23146bb20
Use size_t for the file size in cpp file
This pointer juggling in combination with STL files >4GB caused some nasty illegal memory access bugs here. So let's fix it.
2022-07-08 10:26:03 +02:00
Kim Kulling c5dfcac08a
Update D3MFOpcPackage.cpp 2022-07-08 10:25:40 +02:00
tanolino 24d110199a
Use size_t for file size instead of unsigned int
This is one step to help us open files with more then 4 GB size.
2022-07-08 10:19:50 +02:00
Kim Kulling e254f80a3a
Fix memory leak in D3MFOpcPackage
- closes https://github.com/assimp/assimp/issues/4628
2022-07-08 10:17:11 +02:00
Kim Kulling a1f9a299e9
Merge pull request #4627 from assimp/kimkulling/remove_assert_from_parser_issue-4626
Remove assertion test
2022-07-08 10:11:44 +02:00
Kim Kulling e59b8fb448
Fix typo 2022-07-08 09:50:04 +02:00
Kim Kulling 70b2db19a8
Remove assertion test
- Code cleanup
- closes https://github.com/assimp/assimp/issues/4626
2022-07-08 09:47:33 +02:00
Hector Piteau e77ab52dba
Merge branch 'master' into patch-1 2022-07-08 14:56:21 +09:00
Kim Kulling 7e4a20f843
Merge pull request #4541 from blackhorse-reddog/master
I ran into an error while processing coloured binary stl. Just a type but better be fixed
2022-07-07 14:37:24 +02:00
Kim Kulling e9b08f35b2
Merge branch 'master' into master 2022-07-07 13:21:08 +02:00
Kim Kulling bac3432733
Merge pull request #4611 from assimp/dependabot/github_actions/actions/checkout-3
Bump actions/checkout from 2 to 3
2022-07-07 11:10:49 +02:00
Hector Piteau 579bd6b13e
Fix typo in installation instructions for ubuntu. 2022-07-07 17:11:58 +09:00
Kim Kulling e3c94c6412
Merge branch 'master' into dependabot/github_actions/actions/checkout-3 2022-07-07 09:26:05 +02:00
Kim Kulling 3ae1a37a41
Merge pull request #4610 from assimp/dependabot/github_actions/actions/upload-artifact-3
Bump actions/upload-artifact from 2 to 3
2022-07-07 09:25:51 +02:00
Kim Kulling 8d5ed5dfe5
Merge branch 'master' into dependabot/github_actions/actions/upload-artifact-3 2022-07-07 09:09:51 +02:00
Kim Kulling 395b9f535e
Merge pull request #4619 from assimp/kimkulling/fix_texture_loading_3mp_issue-4568
Kimkulling/fix texture loading 3MF, reladed issue-4568
2022-07-06 21:21:55 +02:00
Kim Kulling 77a2cdee76 Fix texture fetch for embedded textures in 3mf-files. 2022-07-06 20:59:42 +02:00
Kim Kulling 0db8b3daae Use default destructor. 2022-07-06 20:59:17 +02:00
dependabot[bot] 9a3bde0e6d
Bump actions/upload-artifact from 2 to 3
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-06 11:41:23 +00:00
Kim Kulling 422ed5279a
Merge branch 'master' into dependabot/github_actions/actions/checkout-3 2022-07-06 13:40:51 +02:00
Kim Kulling 44fad544e6
Merge pull request #4612 from assimp/dependabot/github_actions/actions/cache-3
Bump actions/cache from 2 to 3
2022-07-06 13:40:40 +02:00
dependabot[bot] 15030fb7b1
Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-06 07:37:31 +00:00
Kim Kulling 744ed2256b
Merge branch 'master' into dependabot/github_actions/actions/cache-3 2022-07-06 09:37:07 +02:00
Kim Kulling ec2db278e3
Merge pull request #4613 from assimp/dependabot/github_actions/JesseTG/rm-1.0.3
Bump JesseTG/rm from 1.0.2 to 1.0.3
2022-07-06 09:36:49 +02:00
Kim Kulling 2ee7727d86
Merge branch 'master' into dependabot/github_actions/JesseTG/rm-1.0.3 2022-07-06 08:59:58 +02:00
Kim Kulling 13bee0d5e6
Merge pull request #4614 from assimp/kimkulling/fix_bad_alloc_issue-3417
Fix possible bad_alloc exception for invalid file
2022-07-06 00:10:02 +02:00
Kim Kulling eeae6eac26
Update Q3DLoader.cpp 2022-07-05 23:01:18 +02:00
Kim Kulling 2d994e1a28
Fix possible bad_alloc exception for invalid file
- Fuzzer finding
- closes https://github.com/assimp/assimp/issues/3417
2022-07-05 22:50:54 +02:00
dependabot[bot] b05ff26569
Bump JesseTG/rm from 1.0.2 to 1.0.3
Bumps [JesseTG/rm](https://github.com/JesseTG/rm) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/JesseTG/rm/releases)
- [Commits](https://github.com/JesseTG/rm/compare/v1.0.2...v1.0.3)

---
updated-dependencies:
- dependency-name: JesseTG/rm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-05 20:00:56 +00:00
dependabot[bot] 200e43b99d
Bump actions/cache from 2 to 3
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-05 20:00:53 +00:00
Kim Kulling c1012b4af0
Merge pull request #4569 from turrisxyz/Dependabot-GitHub-Actions
chore: Included githubactions in the dependabot config
2022-07-05 22:00:22 +02:00
Kim Kulling 4a5ad50828
Merge branch 'master' into Dependabot-GitHub-Actions 2022-07-05 20:50:28 +02:00
Kim Kulling f4c8b55b33
Merge pull request #4597 from luca-della-vedova/fix/collada_empty_animation_name
Fix nested animation name being lost in Collada
2022-07-05 20:50:03 +02:00
Kim Kulling 90b75cd6e7
Merge branch 'master' into fix/collada_empty_animation_name 2022-07-05 20:39:19 +02:00
Kim Kulling 50638f98f5
Merge pull request #4609 from assimp/kimkulling/fix-issue-4238
Try to fix issue 4238
2022-07-05 20:36:57 +02:00
Kim Kulling 5bce9e8ce5
Update MDLMaterialLoader.cpp 2022-07-05 20:09:16 +02:00
Kim Kulling a6b1a35748
Try to fix issue 4238
- Fix possible nullptr dereferencing.
- closes https://github.com/assimp/assimp/issues/4238
2022-07-05 20:05:10 +02:00
Kim Kulling 6d26e91fc1
Merge branch 'master' into fix/collada_empty_animation_name 2022-07-05 09:28:39 +02:00
Kim Kulling 245cd66d11
Merge pull request #4605 from assimp/kimkulling/fix_memleak_in_xmlparser
Fix a memory leak
2022-07-03 08:33:27 +02:00
Kim Kulling 636d8bffe5
Merge branch 'master' into kimkulling/fix_memleak_in_xmlparser 2022-07-02 21:32:24 +02:00
Kim Kulling 9063216893 Fix a memory leak 2022-07-02 21:21:31 +02:00
Kim Kulling 43f060663f
Merge pull request #4601 from assimp/kimkulling/fix_mingw_compilation_issue4586
Use mingw.include
2022-06-30 21:46:55 +02:00
Kim Kulling 55625d1af5 Use mingw.include 2022-06-30 20:58:34 +02:00
Kim Kulling be700a0480
Merge pull request #4598 from assimp/kimkulling/fix-win32-build-with-no-dxsdk9-issue4593
Disable build for tools per default
2022-06-29 15:20:41 +02:00
Kim Kulling eee6269cd1
Diable build for tools per default
- closes https://github.com/assimp/assimp/issues/4593
2022-06-29 11:15:29 +02:00
Luca Della Vedova 0924c4710b
Fix nested animation name being lost in Collada
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-06-29 11:09:54 +08:00
Kim Kulling e1e8477732
Merge pull request #4596 from assimp/kimkulling/fix_invalid_opengex_token_match
Kimkulling/fix invalid opengex token match
2022-06-28 20:59:37 +02:00
Kim Kulling 96ccaa03a0
Merge branch 'master' into kimkulling/fix_invalid_opengex_token_match 2022-06-28 20:39:54 +02:00