89b5011759
Update unzip.c
...
- Fix compiler warning.
2022-12-23 13:50:16 +01:00
e7cea5a283
Use correct flags for openddl for static libs
2022-10-16 18:30:45 +02:00
38ccb7e6c9
Used sizeof for buffer sizes instead of hardcoding values
2022-09-30 22:03:59 -04:00
e2e45f7a14
Fixed issue with clang complaining about sprintf being depreciated
2022-09-30 00:34:33 -04:00
128922a798
FIX: Update unity build include file for gtest
2022-09-18 13:17:35 +02:00
2324e1ea51
Add missing file from gtest
2022-09-18 10:08:14 +02:00
09fe87b6d4
Googletest: Update to 1.12.1
2022-09-18 09:58:12 +02:00
90d1464405
Remove set but unused variables
2022-08-17 11:42:32 +03:00
7c75a4c59b
Merge branch 'master' into master
2022-07-24 12:31:36 -07:00
bc6acedb33
Fix uninitialized variable.
2022-07-16 13:57:51 +02:00
3890b5dff5
Add missing = operator
...
implicit assignment operator is depricated, these classes were missing
explicit definitions of this operator.
It is causing warnings, specifically -Werror=deprecated-copy
2022-07-08 18:16:02 +02:00
d018c3b555
Added back pragma warnings and changed to be MSVC-specific
2022-06-07 11:42:09 -04:00
c5b6b26b8b
Revert "Removed pragma warnings"
...
This reverts commit 4961241c09
2022-06-07 11:27:12 -04:00
4961241c09
Removed pragma warnings
2022-06-06 14:53:03 -04:00
e0696486b2
Update gtest
2022-05-21 11:09:46 +02:00
7bda8b7a77
Updated pugixml to version 1.12.1
2022-05-06 13:39:05 +07:00
778ac976b2
Fix draco building error when import assimp with cmake add_subdirectory #3663
2022-04-11 15:08:20 +08:00
9c4255b486
Assimp Android LTS NDK 23 Fix
2022-01-09 18:19:33 +11:00
81fc50f612
CMake: Replace CMAKE_COMPILER_IS_MINGW by MINGW
...
See https://discourse.cmake.org/t/cmake-compiler-is-mingw-removed/4539 and https://cmake.org/cmake/help/latest/variable/MINGW.html
2021-12-28 15:58:37 +01:00
e8732341f4
Delete irrXML_note.txt
...
- Remove deprecated notes from irrxml
2021-11-15 08:23:56 +01:00
6a3ac623b9
Fix out-of-bounds reads in OpenDDLParser
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=31795
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24463
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=36594
2021-10-28 23:13:29 -04:00
e7b9118b96
Delete fast_atof.h
2021-10-17 21:04:18 +02:00
b95df54225
Remove unused code
2021-08-11 19:33:10 -04:00
16c3f82222
closes https://github.com/assimp/assimp/issues/3975 : Use latest version of OpenDDL-Parser
2021-07-26 11:24:18 +02:00
1b37b74f9e
Hunter fixes for stb_image
2021-07-07 17:01:19 -04:00
0a5e49252d
Merge remote-tracking branch 'origin/master' into HEAD
2021-07-07 16:35:29 -04:00
6dd9ab062c
the expression does not throw an exception.
...
maybe you just forgot this word.
2021-06-11 10:56:45 +03:00
fc4ebefaa4
Merge branch 'master' into update_draco
2021-06-08 23:30:01 +02:00
b0e7271449
Merge branch 'master' into stb-image-updated
2021-06-03 23:46:43 +02:00
bf0f8d4c1b
Update pugiconfig.hpp
2021-06-03 23:29:53 +02:00
cc912f09f7
update pugi_xml to 1.11
2021-06-03 23:16:20 +02:00
e0d1a36523
Merge branch 'master' into stb-image-updated
2021-06-03 23:07:38 +02:00
53790e8273
Update Draco to upstream e4103dc
...
Fixes some MSVC and mingw compiler issues
Sets VERSION and SO_VERSION
e4103dc39f
2021-05-21 12:25:36 +01:00
ab43f3fefd
Merge branch 'stb-image-updated' of https://github.com/krishty/assimp into stb-image-updated
2021-05-10 20:44:55 +02:00
d75f8bd5b0
silence warnings in stb_image.h
...
Re-applies 09c5564d5b
2021-05-10 20:44:43 +02:00
433620350e
Merge branch 'master' into stb-image-updated
2021-05-10 11:30:45 +02:00
b30cbcf117
Merge branch 'master' into jc3-spam-killa
2021-05-09 21:47:17 +02:00
816da9b677
merge and update all copies of stb_image.h
2021-05-05 23:15:41 +02:00
558457e5bf
[openddlparser] Remove default log handler and unsolicited output.
...
This addresses part of #3862 .
- Remove default log handler.
- Log callback can now be set to nullptr, which just makes logging a no-op.
- Initial log callback is nullptr.
- Also tweaked format of token error log message and removed newline.
Assimp code that uses this may regain logging output by installing a callback and directing the output through appropriate logging facilities.
2021-05-04 21:54:14 -04:00
7dd7a053a9
[gtest] Fixed a rogue std::isalnum
...
Use IsAlNum instead (gtest-port.h), which deals with char signedness correctly. This was the only spot in gtest where a cctype function was called instead of its gtest-port.h equivalent.
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:46 -04:00
1ec8d4b6cf
[draco] Make sure ctype calls use unsigned char.
...
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:46 -04:00
55fd820ed7
use const chars
2021-05-04 10:57:30 +02:00
feeb89a1dd
closes https://github.com/assimp/assimp/issues/3831 : update zip
2021-04-30 16:49:15 +02:00
e5417ea41f
Merge branch 'master' into change_file_encoding
2021-03-13 18:45:58 +01:00
e53335e58c
change file encoding
2021-03-09 18:31:15 +09:00
dffaeade94
Update crypt.c
2021-03-08 09:04:22 +01:00
888415246e
Merge branch 'master' into issue_2195_draco
2021-02-08 11:52:54 +01:00
710f1d17d4
RapidJSon: Upgrade to latest greatest
2021-02-05 21:45:37 +01:00
5fbbba2fac
Merge branch 'master' into issue_2195_draco
2021-01-31 16:02:57 +01:00
79eb9ecc86
Update all minimum cmake req to 3.10
2021-01-29 21:05:46 +01:00
c917e6513f
Merge branch 'master' into issue_2195_draco
2021-01-26 16:43:46 +00:00
deac3a9f6c
Add Draco 1.4.1 sources
...
Upstream: https://github.com/google/draco
2021-01-20 10:14:20 +00:00
9334e07619
Update CMakeLists.txt
2021-01-16 16:14:49 +01:00
8ad2661e0c
Update CMakeLists.txt
2021-01-16 12:00:42 +01:00
6db343386b
remove install of zlibstatic
2021-01-15 16:46:15 +01:00
d898ecc80c
Fix another typo.
2021-01-06 18:59:13 +01:00
2ad4218d25
Merge branch 'master' into master
2021-01-06 18:54:57 +01:00
5222ab989f
Fix a typo
2021-01-06 18:51:59 +01:00
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
e1052f421b
Update OpenDDLParser.cpp
2021-01-06 16:52:28 +03:00
177304bb7c
Update o3dgcArithmeticCodec.cpp
2021-01-06 16:50:07 +03:00
bfe35fc06b
contrib/zlib/CMakeLists.txt: don't install zlib
...
Don't install zlib static library to avoid potential conflicts with a
system-wide zlib package
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-12-27 15:27:41 +01:00
c464d01778
Fix fopen64, ftello64, fseeko64 declarations on all platforms
2020-12-24 03:18:09 +01:00
54be7ac582
Update unzip contrib
2020-12-24 01:53:40 +01:00
c65f2cb3fb
Remove extra semicolon while GCC being pedantic.
2020-12-13 00:12:44 +05:30
8d8ba521e2
Check _MSC_VER for MSVC specific pragma directives.
...
This fixes build issues when compiled with compiles like Clang or GCC.
2020-12-02 02:05:14 +05:30
3fd95aff4e
Merge branch 'master' into fix/3365
2020-10-27 17:43:28 +01:00
22ad7028f0
Delete CMakeLists.txt
2020-10-27 09:42:46 +01:00
4bba338d92
Update CMakeLists.txt
2020-10-27 09:23:20 +01:00
7e1a8f09c5
more openddl-fixes
2020-10-26 21:35:44 +01:00
57e691e28e
openddl: latest greatest.
2020-10-25 10:34:43 +01:00
3b5212067c
Fix CMake config generation
...
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
23f144a7b7
pugixml: use pugixml in headeronly mode.
2020-10-05 18:44:59 +02:00
9303fb31f6
Enable export only for windows
2020-10-02 11:30:37 +02:00
9d296f3943
export pugixml symbold in assimp
2020-10-01 22:02:03 +02:00
b6dde74155
adaptions to support hunter
2020-10-01 16:35:34 +02:00
c740f61f97
hunter integration: pugixml
2020-10-01 10:29:52 +02:00
484d305987
pugi: enable static linkage explicitely.
2020-09-29 20:33:39 +02:00
8f0888f7fc
diable hunter fr pugi.
2020-09-28 20:03:51 +02:00
a6b90c354b
fix pugi warnings
2020-09-27 20:38:09 +02:00
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
995ab805ff
Update utf8cpp to fix use of C++17 deprecated feature
2020-08-17 17:54:48 +10:00
c7a9ef30cc
Merge branch 'master' into fix-mingw-priumax
2020-07-24 11:14:15 +02:00
51e592123a
Fix two deletions.
2020-07-20 18:42:57 +02:00
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
77cf6e3433
Ensure that zip.h warning disable is pushed
2020-07-14 22:07:24 -05:00
700d8e6614
Fix MinGW builds (issues related to pragmas and format strings)
2020-07-14 21:19:07 -05:00
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
fb20e15163
start to migrate colladat and amf
2020-06-27 15:57:06 +02:00
f0f6612b81
disable warning for radjson.
2020-06-15 20:52:11 +02:00
d4ca91f408
Evaluated the following expressions to either values.
2020-05-28 19:20:54 -04:00
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
ea26cba420
Merge branch 'master' into ps-devel-fix-contrib-zlib-static-compile-001
2020-05-09 11:10:33 +02:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
4488e3e745
build on Linux with gcc and clang; warning as error only for 'assimp' target
2020-04-27 23:38:33 -07:00
74c8d09bd8
contrib/zlib: disable dynamic library building
...
Fixes compile failure for static only toolchains (and assimp
links against the static one).
2020-04-13 14:55:57 +02:00
d2499ac197
Update CMakeLists.txt
...
Linke irrXml static for apple
2020-04-10 12:52:54 +02:00
96c7c567e6
Merge branch 'master' into kimkulling_dev
2020-03-26 11:56:45 +01:00
046f50880f
{cmake} Prefix assimp options with "ASSIMP_" to avoid pollution when included as a submodule
...
When libraries are included as submodules in large projects, having an option with a generic name like "BUILD_DOCS" is not very helpful. (e.g. one project I work on includes many libraries as submodules)
It can also clash with options from other libraries which can break things.
2020-03-23 12:35:32 -04:00
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
Kim Kulling
Kim Kulling
slinky55
Turo Lamminen
Engin Manap
ethaninfinity
ALittleStardust
Guangmo Lin
Dan Rosser
Jérôme Leclercq
Alex Rebert
Robert Ubiñas
Rahul Sheth
ihsinme
RichardTea
Krishty
Jason C
Jason C
kkulling
jaefunk
Paul Engelhardt
ihsinme
Fabrice Fontaine
Jean-Louis
Biswapriyo Nath
Silvio Traversaro
Arthur (fuj1n) Uzulin
MeyerFabian
awr1
Hanif Bin Ariffin
luca
Peter Seiderer
Andy Maloney