Kim Kulling
2be0eba1ab
put one in comments because the file seems to be corrupt.
2019-09-14 19:32:47 +02:00
escherstair
03514a9237
Merge pull request #4 from assimp/master
...
Sync with upstream repo
2019-09-09 14:20:15 +02:00
escherstair
1503608aaa
prefer prefix ++/-- operators for non-primitive types
2019-09-06 11:31:07 +02:00
escherstair
bbb1f6a1dc
prefer prefix ++/-- operators for non-primitive types
2019-09-03 08:01:05 +02:00
Kim Kulling
db3bb22933
Xml: Prepare replacement of irrXml.
2019-07-21 12:19:19 +02:00
Rémi Verschelde
5fa750fda0
Fix code files encoding to make them all UTF-8
2019-05-22 10:19:32 +02:00
Kim Kulling
dbd0f06d32
Update CMakeLists.txt
...
Make IrrXml dynamic only on BSD
2019-04-08 20:21:20 +02:00
Kim Kulling
98ed6a2e18
Merge branch 'master' into issue_2336
2019-04-08 16:39:54 +02:00
kimkulling
79f62b0174
closes https://github.com/assimp/assimp/issues/2336 : use new cmp_048 policy even for zlib in the assimp build.
2019-04-08 14:24:33 +02:00
Kim Kulling
37357515fa
Update irrXML.h
...
FIx export directive for linux.
2019-04-08 12:49:07 +02:00
Kim Kulling
010afeb1d8
Merge branch 'master' into issue_1650
2019-04-04 12:42:21 +02:00
Kim Kulling
d62724ab4f
Update test.c
...
fix compiler warnings.
2019-03-29 09:05:24 +01:00
Kim Kulling
92ec834fec
Update zip.c
...
Fix compiler warnings.
2019-03-29 08:42:19 +01:00
Kim Kulling
7b4c704e6b
Update README.md
...
Fix format findings.
2019-03-29 08:27:38 +01:00
Charlie Gettys
ab92f50fa8
Add upstreamed change to miniz.h
2019-03-27 11:28:37 -04:00
Charlie Gettys
bb11f90983
Update zip library to current head. Closes assimp/assimp#2388
2019-03-26 22:45:20 -04:00
Kim Kulling
525566b8b8
try to fix shared object issue.
2019-03-16 18:36:26 +01:00
Kim Kulling
a3fdb46f67
fix typo.
2019-03-16 17:02:38 +01:00
Kim Kulling
f4ec02a34b
Fix install folders for cmake - os files.
2019-03-16 16:10:30 +01:00
Kim Kulling
e9b6a4895d
Fix the build.
2019-03-16 15:32:47 +01:00
Kim Kulling
ba6a7383b2
closes https://github.com/assimp/assimp/issues/1650 : build irrXml as shared lib.
2019-03-16 09:45:21 +01:00
kimkulling
3f9a25df5a
Devil: replace this by header-only lib.
2019-02-07 17:09:05 +01:00
Arkeon
b59d931486
Correction on clipper crash on some IFC files when points are empty
2019-01-02 14:56:38 +01:00
Martin Jerabek
6e95601875
OpenDDLParserUtils: replace chartype_table with simple comparison
2018-11-26 12:06:08 +01:00
kimkulling
f75bf6d99c
MAke noexcept compiler-specific.
2018-09-21 16:25:27 +02:00
kimkulling
f818a909e5
Fix static-code-analysis findings.
2018-09-21 16:07:09 +02:00
kimkulling
e13f6876bb
closes https://github.com/assimp/assimp/issues/1340 : Fix handling of empty nodes in openddl-parser.
2018-07-11 10:10:26 +02:00
Marco Di Benedetto
59ea3b6c85
fixed android zlib compile error.
2018-02-09 16:02:27 +01:00
Kim Kulling
280c995191
closes https://github.com/assimp/assimp/issues/905 : add missing contrib source from zlib.
2018-01-31 22:55:05 +01:00
BuildTools
66171de915
Successful lib build, unit testing still WIP
2018-01-05 16:18:33 -08:00
Kim Kulling
cf59c7d153
Update o3dgcTimer.h
...
closes https://github.com/assimp/assimp/issues/1642 : fix build on Hurd
2018-01-03 00:56:32 +01:00
Kim Kulling
fb660823fc
new gtest version: 1.8.0
2018-01-01 19:42:01 +01:00
Kim Kulling
6a9df80f68
closes https://github.com/assimp/assimp/issues/1655 : add typedef for android NDK.
2017-12-28 14:52:41 +01:00
Turo Lamminen
0cc25491a4
irrXML: Remove horrible hack
2017-12-24 15:38:42 +02:00
ilovezfs
f9b599355c
unzip: fix build with older zlib
...
Fixes "unzip.c:150:11: error: unknown type name 'z_crc_t'"
2017-12-12 02:28:03 -08:00
Kim Kulling
36cddcc8b7
Update miniz.h
...
retrigger CI.
2017-12-04 15:20:23 +01:00
Kim Kulling
fe6608175b
Update miniz.h
...
Fix test against null bytes to push back.
2017-12-04 15:19:34 +01:00
Kim Kulling
98cb898463
Merge branch 'master' into kimkulling-miniz-memoryaccessfix
2017-12-04 13:31:00 +01:00
Kim Kulling
b92c3ca161
fix invalid op
2017-12-04 13:19:34 +01:00
Turo Lamminen
45f2f31011
miniz: Remove some dead assignments
2017-12-02 17:59:04 +02:00
Kim Kulling
2897433358
Update miniz.h
...
Add an assertion test and return true to not change the expected behaviour of buggy function.
2017-11-30 10:47:52 +01:00
Kim Kulling
915ee95ad3
Fx nullptr dereference.
2017-11-30 09:12:41 +01:00
Kim Kulling
59dcfefeb2
fix unaligned memory access.
2017-11-29 16:45:09 +01:00
Kim Kulling
fd2da59427
fix unaligned memory access.
2017-11-29 16:23:12 +01:00
Kim Kulling
3dfca3bc84
3MF: add export to a given archive.
2017-11-27 21:48:33 +01:00
Turo Lamminen
53119e74f8
Open3DGC: Fix strict-aliasing warnings
2017-11-18 15:59:30 +02:00
Kim Kulling
07a99e0843
Merge branch 'master' into issue_1513
2017-11-16 17:32:34 +01:00
Kim Kulling
7db10022e9
closes https://github.com/assimp/assimp/issues/1513 : fix assimp for cross compile for android
2017-11-15 21:26:25 +01:00
Turo Lamminen
983e52e308
unzip: Remove dead assignment
2017-11-15 12:45:27 +02:00
Turo Lamminen
76de3e0828
clipper: Add assertion to silence a static analyzer warning
2017-11-15 12:35:06 +02:00
Turo Lamminen
c248ae3797
unzip: Remove dead assignments
2017-11-15 12:33:34 +02:00
Turo Lamminen
9b88715361
unzip: Bail on bad compression method
2017-11-15 12:32:24 +02:00
Turo Lamminen
0bc259fd95
unzip: Fix possibly uninitialized variables
2017-11-15 12:30:55 +02:00
Turo Lamminen
11fdaa31bc
clipper: Add assertion to silence a static analyzer warning
2017-11-15 12:18:39 +02:00
Turo Lamminen
fc59f190ae
OpenDDLExport: Reduce scope of a variable
2017-11-15 12:15:53 +02:00
Turo Lamminen
ef91211231
OpenDDLExport: Remove dead variable
2017-11-15 12:14:56 +02:00
Turo Lamminen
be1d346c28
Open3DGC: Add assertions to silence static analyzer warnings
2017-11-15 12:12:06 +02:00
Turo Lamminen
58d5d04e82
OpenDDLParser: Remove dead assignment
2017-11-15 12:06:30 +02:00
Turo Lamminen
635a515e69
OpenDDLParser: Fix another potential memory leak
2017-11-15 12:06:21 +02:00
Turo Lamminen
eb5f47f5c5
OpenDDLParser: Fix potential memory leak
2017-11-15 11:58:13 +02:00
Kim Kulling
2929a27edc
add unittest for x3d-importer.
2017-11-05 17:41:26 +01:00
Thomas Lemaire
5b76a31485
fix trivial warnings
...
mainly unused parameter and unused function
some parameters are indeed used in a debug built, I used the
(void)(param) trick
warnings reported by clang 4
2017-11-02 11:13:52 +01:00
Turo Lamminen
f90d874978
Open3DGC: Remove redundant const qualifiers from return types
2017-10-08 12:48:45 +03:00
Turo Lamminen
9f5b58e706
Upgrade RapidJSON to get rid of a clang warning
2017-10-06 18:23:28 +03:00
Kim Kulling
c1f93a69ae
Revert "WIP: Enable Travis clang build"
2017-10-06 15:42:05 +02:00
Kim Kulling
4a9ab98240
Merge pull request #1474 from jaredmulconry/issue_1470
...
Update zlib contribution
2017-10-06 15:40:36 +02:00
Turo Lamminen
65547d5760
Upgrade RapidJSON to get rid of a clang warning
2017-10-05 12:15:28 +03:00
Jared Mulconry
e7c112916b
Removed unnecessary files from zlib contribution
2017-10-05 20:11:18 +11:00
Jared Mulconry
bab6ca2085
Upgraded zlib to 1.2.11.1 from the develop branch.
2017-10-04 20:33:59 +11:00
Kim Kulling
c202d43d8f
Merge pull request #1466 from jaredmulconry/issue_1330
...
Eliminated warnings when building the project with clang
2017-10-01 20:03:30 +02:00
Turo Lamminen
45d93701f8
Open3DGC: Fix some uninitialized variable warnings
2017-09-30 16:45:53 +03:00
Jared Mulconry
9088deeb1d
Eliminated all warnings under clang with default settings. One remains in the included zlib contrib project.
2017-09-30 23:29:56 +10:00
Jared Mulconry
4feac1b1f9
Changed a couple more function interfaces to correct the input type.
2017-09-29 01:40:05 +10:00
Jared Mulconry
12b6895f7b
Replaced unsigned long for the crc table to z_crc_t, to match what is returned by get-crc_table
2017-09-29 01:29:11 +10:00
Jared Mulconry
94a6fc78f4
Addressed last remaining warning under MSVC caused by use of 'deprecated' fopen.
2017-09-15 18:27:59 +10:00
Lee Jeffery
d0d45d1d22
Fix linking issue with irrXML
2017-08-20 19:07:09 +01:00
Kim Kulling
c3cd7349d0
unzip: latest greatest.
2017-08-05 18:46:34 +02:00
Kim Kulling
afb2f3036e
OpenDDLParser: latest greatest.
2017-06-25 13:21:36 +02:00
Kim Kulling
51b915c97b
openddlparser: closes https://github.com/assimp/assimp/issues/1271 .
2017-06-19 21:07:18 +02:00
Kim Kulling
d7e13e67c4
Utf8: integrate new lib.
2017-06-17 19:38:47 +02:00
Kim Kulling
6e1034996e
UTF8Encoding: introduce new lib.
2017-06-16 16:43:39 +02:00
Arkeon
f84851e893
PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply import - manage texture coords on faces in ply import - correction on point cloud faces generation
...
IFC :
- update poly2tri to avoid crash on some IFC files
Collada :
- manage missing texture reference in collada import
2017-06-02 13:48:57 +02:00
Helio Chissini de Castro
4a0171bd82
- Apply mechanism to decide use for IrrXML external or internal
...
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.
Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists
Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
2017-04-29 08:10:44 +02:00
Antoine Bolvy
4495162f5f
Fix new lines problem
2017-02-27 18:34:04 -05:00
Tan Li Boon
c3d40810b5
Cleared majority of codepage warnings in Visual Studio 14.
2017-01-09 00:41:10 +08:00
Andy Maloney
3c5f1578c2
Fixes two type warnings and a missing case option
2016-12-07 20:30:45 -05:00
Jared Mulconry
2d563180ac
Fixed build warnings on MSVC14 x64 in sweep context sources.
2016-11-27 13:39:09 +11:00
Jared Mulconry
12aab0f4ef
Fixed build warnings on MSVC14 x64 in the O3DGC sources.
2016-11-20 12:29:01 +11:00
Kim Kulling
c849e0108d
Merge pull request #1055 from assimp/issue_957
...
Fix compiler warnings related to issue 957.
2016-11-03 19:11:56 +01:00
Kim Kulling
02e038bbb6
Fix compiler warnings related to issue 957.
2016-11-03 18:37:02 +01:00
rdb
b5c7c9c3ac
Fix compile error with MSVC 2015
...
This patch fixes compilation with MSVC 2015. WIN32 is not a preprocessor symbol that is defined by MSVC, but _WIN32 is.
2016-11-02 18:42:16 +01:00
smalcom
dad4d0fa99
[F] min/max redefined when including windows.h
2016-09-15 22:25:34 +03:00
Alexandr Arutjunov
24e25324f2
Merge branch 'master' into gltf_o3dgc
2016-09-13 12:08:51 +03:00
Kim Kulling
68e6f2a32c
Unittest: add gtest as part of the contrib to avoid build issues on
...
offline systems.
2016-09-11 16:06:29 +02:00
Alexandr Arutjunov
e0356b09be
Merge branch 'master' into gltf_o3dgc
2016-08-14 16:49:53 +03:00
Kim Kulling
c403565d06
Update rapidjson to v1.0.2
2016-08-14 11:58:12 +02:00
Alexandr Arutjunov
0dcf4dcd16
[F] Typo.
2016-08-11 01:02:32 +03:00
Alexandr Arutjunov
e61fc06c40
[F] Comparison between signed and unsigned integer.
2016-08-08 19:04:37 +03:00
Alexandr Arutjunov
054820e6ff
[+] Added Open3DGC codec from KhronosGroup repository.
2016-08-03 03:34:54 +03:00
TrianglesPCT
e888e72599
Fix warning
...
The call to sprintf was causing a warning in vs2015 because of wrong type.
2016-07-24 02:33:33 -06:00