Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,626 Commits 19 Branches 43 Tags
4d733d80f188d18b4db717a125e081caafcab6fc
Commit Graph

1161 Commits

Author SHA1 Message Date
PencilAmazing
4d733d80f1 Merge branch 'master' into PLYcomments#4866 2023-01-23 15:56:04 -05:00
Kim Kulling
f830d7998e Merge branch 'master' into clean-up-ctors-dtors 2023-01-23 21:21:34 +01:00
PencilAmazing
cb8320945d Fix issue #4866 by continuing to resetting read loop after hitting a comment 2023-01-23 14:18:50 -05:00
Kim Kulling
036f2b3771 Merge branch 'master' into remove-stray-semicolon 2023-01-23 20:06:43 +01:00
Kim Kulling
3e20502e0f Merge branch 'master' into fix_gltf2_camera_fov 2023-01-23 19:14:42 +01:00
Kim Kulling
3bd2f788f6 Merge branch 'master' into replace-variables-with-literals 2023-01-23 18:55:20 +01:00
Kim Kulling
f2f967b8ba Merge branch 'master' into remove-useless-virtual 2023-01-22 20:25:45 +01:00
Kim Kulling
f8bc8293ce Update FBXMeshGeometry.h 2023-01-22 16:48:45 +01:00
Kim Kulling
303c30668f Merge branch 'master' into trim-whitespace 2023-01-22 16:37:43 +01:00
shimaowo
20acfeaf97 Merge branch 'master' into fix_gltf2_camera_fov 2023-01-17 14:39:54 -08:00
shimaowo
b298b79a46 add missing parens 2023-01-17 10:53:41 -08:00
Martin Mory
7f6e96747b Merge branch 'master' into f-FixWhitespaceBetweenTagAndNum 2023-01-17 13:32:39 +01:00
Krishty
36305cf987 Tidy Up Constructors and Destructors 
This commit does not add or remove c’tors or d’tors, so it is *not* ABI-breaking.

If a c’tor/d’tor does nothing else than the default behavior, this commit replaces it with “= default”.

If an initializer list entry does nothing else than the default behavior, this commit removes it. First and foremost, remove default c’tor calls of base classes (always called by the compiler if no other base c’tor is explicitly called) and c’tor calls of members with complex types (e.g. “std::vector”).

In a few instances, user-defined copy c’tors / move c’tors / assignment operators / move assignment operators were replaced with “= default”, too. I only did this if I had a clear understanding of what’s going on.
 2023-01-16 21:47:11 +01:00
Krishty
43a062a5d7 Remove Stray Semicolon 2023-01-16 20:45:00 +01:00
shimaowo
39cbef1e21 Fix: fix incorrect math for calculating the horizontal FOV of a perspective camera in GLTF2 import #4435 2023-01-16 11:39:13 -08:00
Krishty
3d3e856925 Trim Trailing Whitespace 2023-01-16 09:12:35 +01:00
Krishty
5cbc00a595 Fix Build With M3D Import Only 
`M3DWrapper.h` is designed to omit the definition of `class M3DWrapper` if neither M3D import nor M3D export are compiled.
608bccd9cf touched the corresponding preprocessor checks and introduced a bug:
```
#ifndef ASSIMP_BUILD_NO_M3D_IMPORTER
#if !(ASSIMP_BUILD_NO_EXPORT || ASSIMP_BUILD_NO_M3D_EXPORTER)
class M3DWrapper {
```
When compiling
- with M3D import enabled,
- but with either export generally disabled or M3D export disabled specifically,
These checks evaluate to the wrong result and skip the definition, leading to a build failure in dependent code.
```
#if 1 // import enabled
#if !(1 || 1) // export disabled and M3D export disabled
```
This commit fixes the check to compile the definition if neither import is disabled.
 2023-01-16 08:29:49 +01:00
Krishty
bad76fd0f1 Replace Variables With Literals 2023-01-16 08:18:36 +01:00
Krishty
e5c02e8d45 Remove Useless “virtual” 
These functions are already marked “override”, and their neighbors had “virtual” removed as well.
 2023-01-16 08:12:24 +01:00
Martin Mory
43c0f8bb3d Remove whitespace between a <v> tag and the first number, otherwise first call to strtoul10() returns 0 and the indices are broken, leading to possible out-of-bound access and memory corruption/crash 2023-01-15 23:03:41 +01:00
Kim Kulling
2d37f49f51 Remove deprecated comment 
- closes https://github.com/assimp/assimp/issues/4869
 2023-01-15 19:12:24 +01:00
Kim Kulling
b393132b58 Merge branch 'master' into spelling 2023-01-08 17:43:55 +01:00
Kim Kulling
96b071bdb1 Fix: Fix possible division by zero 
- closes https://github.com/assimp/assimp/issues/4860
 2023-01-04 09:19:37 +01:00
Andy Maloney
e893248e7c Fix several spelling mistakes & a comment 2023-01-01 13:31:48 -05:00
Kim Kulling
376f66a06d Merge branch 'master' into master 2022-12-16 10:11:56 +01:00
Kim Kulling
c3d15a3f51 Fix minor review findings. 2022-12-16 09:03:40 +01:00
Kim Kulling
c92b84e38d Merge branch 'master' into patch-10 2022-12-16 09:00:41 +01:00
Kim Kulling
db8ff41679 Update MD5Parser.cpp 2022-12-15 14:06:57 +01:00
Kim Kulling
2612950b7b Merge branch 'master' into patch-9 2022-12-15 14:05:35 +01:00
sashashura
917352dd8b Fixes Heap-buffer-overflow READ 1 in Assimp::ObjFileParser::getFace 
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49274
 2022-12-11 01:54:57 +01:00
Alex
90769ef3e6 Fixes Heap-buffer-overflow READ 1 in Assimp::MD5::MD5Parser::ParseHeader 
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49422
When it reaches the `SkipSpacesAndLineEnd`, `in` already points past `bufferEnd` and it leads to out of bounds memory read.
 2022-12-11 00:02:09 +00:00
Alex
d5294be00b Fixes Heap-buffer-overflow READ 4 in Assimp::ScenePreprocessor::ProcessMesh 
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=49797
 2022-12-10 01:22:00 +00:00
Umesh Rajesh Ramchandani
2d372b302f Fixed bug when exporting binary FBX 
Fixed vector subscript out of range bug when NULL_RECORD is passed to PutString and is actually null
 2022-12-08 14:59:25 +01:00
Kim Kulling
9d57ac9cc5 Fix:Add missing semicolon. 2022-12-05 13:15:42 +01:00
Kim Kulling
81f85a6f93 Avoid undefined-shift in Assimp::ASE::Parser::ParseLV4MeshFace. 2022-12-05 13:07:52 +01:00
Kim Kulling
62486c6e7c FIX: Fix possible division by zero 
- closes https://github.com/assimp/assimp/issues/4819
 2022-12-02 09:24:51 +01:00
Kim Kulling
f578b15759 Merge branch 'master' into explspec 2022-11-30 14:03:09 +01:00
Thomas Köppe
7d06d798af [BlenderDNA.h] Declare explicit specializations 
It is an ODR violation to use a template specialization for which an
explicit specialization is defined somewhere whose declaration is not
visible at the point of use.

Found via clang's -Wundefined-func-template warning.
 2022-11-29 18:38:33 +00:00
Kim Kulling
8fb7ba3444 Merge branch 'master' into modernize-smartptrs-literals 2022-11-29 09:58:17 +01:00
Kim Kulling
5689ac7869 Add overfolow check for invalid data. 
- closes https://github.com/assimp/assimp/issues/3422
 2022-11-22 10:50:52 +01:00
Kim Kulling
1d1cd93371 Merge branch 'master' into KHR_materials_emissive_strength 2022-11-21 20:55:13 +01:00
Jan Krassnigg
08f2f0f82f Don't hide out-of-memory during FBX import 2022-11-18 13:50:33 +01:00
Adam Beili
95d98ec98b fixed indentation error 2022-11-08 20:55:20 +02:00
Adam Beili
49bc22ddb5 Merge branch 'master' into KHR_materials_emissive_strength 2022-11-08 20:51:20 +02:00
Aaron Gokaslan
3730b7414f Use make_shared in IFCBoolean 2022-11-08 11:30:53 -05:00
Aaron Gokaslan
d635bc6914 Fix some indentation 2022-11-08 11:19:12 -05:00
Aaron Gokaslan
ccfb175460 Apply various clang-tidy checks for smartprs and modern C++ types 2022-11-08 11:03:55 -05:00
Aaron Gokaslan
97cb1c6b15 Fix perfect fowards 2022-11-07 11:01:16 -05:00
Aaron Gokaslan
5a0df03d2b Fix another missing move in glTFCommon.h 2022-11-07 09:34:00 -05:00
Adam Beili
945d93b46a fixed indentation 2022-11-04 09:37:28 -07:00