Commit Graph

224 Commits (d4101bbf06f5d2aed0d57f0b63cf96000a7ea26c)

Author SHA1 Message Date
Kim Kulling 4b9cc1a484
Merge branch 'master' into fix-codacy-issues 2019-09-18 20:32:49 +02:00
escherstair 3b608307c8
prefer prefix ++/-- operators for non-primitive types 2019-09-18 08:00:58 +02:00
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
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