Commit Graph

3263 Commits (99f00834ec79cfa73f2ee8265e99ab1f475c05b2)

Author SHA1 Message Date
Kim Kulling 42c1f9d3ba Closes https://github.com/assimp/assimp/issues/630: fix mis-merge. 2016-01-12 20:22:37 +01:00
Kim Kulling d3ddabbd3e Merge branch 'master' of https://github.com/assimp/assimp 2016-01-11 21:16:17 +01:00
Kim Kulling 36668aa31a ASEParser: fix invalid size of buffer for log writing. 2016-01-11 21:15:30 +01:00
Kim Kulling 48eed0d2c6 Merge pull request #749 from andrewparlane/master
ObjImporter: Added better progress reporting during file import.
2016-01-11 20:39:09 +01:00
Andrew Parlane 1632f1fbb9 ObjImporter: Added better progress reporting during file import.
There are two stages to this:
1) Processing '\'s - this accounts for 1/3rd of the file import progress.
2) Parsing the file data - this accounts for the other 2/3rds.
2016-01-11 12:21:24 -04:00
Kim Kulling bd268bd864 coverity scan: add missing initialization. 2016-01-10 20:25:01 +01:00
Kim Kulling ec32da512b coverity scan: fix not initialized member in copy constructor. 2016-01-10 20:21:32 +01:00
Kim Kulling 3033d8c847 ColladaLoader: add missing .f 2016-01-09 18:09:52 +01:00
Kim Kulling d18f978178 ColladaLoader: add missing members to initializer list. 2016-01-09 18:09:10 +01:00
Kim Kulling 1f356e87a8 appveyor: enable x86 build as well. 2016-01-09 12:13:39 +01:00
Kim Kulling 3d2140afee coverity finding: get latest openddlparser to get fix against possible nullptr access. 2016-01-08 16:55:31 +01:00
Kim Kulling 114d76765e OpenDDLParser: latest greatest to get fix for coverity finding ( dereferenfing possible null ptr ). 2016-01-08 16:46:13 +01:00
Kim Kulling 430b614a69 coverity scan: make place of false positive more understandable. 2016-01-08 16:18:32 +01:00
Kim Kulling 7ef579674d GenVertexNormalsProcess: use initalizer list instead of setting the earch angle in the constructor. 2016-01-07 15:03:10 +01:00
Kim Kulling 346bf9375b ai_assert: add missing license info. 2016-01-07 15:02:41 +01:00
Kim Kulling 54ac680400 fix merge conflict. 2016-01-06 22:19:07 +01:00
Kim Kulling 56a77b2429 snprintf-replacement: fix invalid preprocessor defines for compiler
detection on windows for older vs-versions
2016-01-06 19:55:04 +01:00
Kim Kulling d43a083dc1 snprintf replacement: fix usage of ai_snprintf when snprintf is available. 2016-01-06 19:25:35 +01:00
Kim Kulling 6bfdeb6a12 sprintf replacement: introduce au_snprintf to support snprintf for v2013
and earier ( closes https://github.com/assimp/assimp/issues/743 )
2016-01-06 15:35:25 +01:00
Kim Kulling 67c258e75d snprintf: change next couple of sprintf to snprintf. 2016-01-05 11:38:06 +01:00
Kim Kulling c3d4be1dce sprintf: replace more sprintf by snprintf. 2016-01-04 22:24:25 +01:00
Kim Kulling c9d00beab8 sprintf: replace sprintf by snprintf. 2016-01-04 20:24:51 +01:00
Kim Kulling f4d3d15bbb UnrealLoader: replace sprintf by snprintf. 2016-01-04 20:22:46 +01:00
Kim Kulling 847644ca75 DefaultLogger: fix missing sprintf calls. 2016-01-03 23:29:37 +01:00
Kim Kulling d26187714d Merge branch 'master' of https://github.com/assimp/assimp 2016-01-03 20:00:28 +01:00
Kim Kulling 540c9f3e9f Fix assimp/assimp/issues/737: use snprintf instead of sprintf. 2016-01-02 21:29:46 +01:00
Kim Kulling 51bdc6c9bf Merge pull request #739 from dankex/fix_mac
Fix compilation error for Mac OS X and 64-bit architecture
2016-01-02 11:35:27 +01:00
Danke Xie b2760abeb2 Fix compilation error for Mac OS X and 64-bit architecture
For a 64-bit architecture, unsigned long and size_t are the same.
This causes a compilation error due to duplicate constructors in document.h.
2016-01-02 01:29:47 -08:00
Kim Kulling b6673c3fca Update license info in public headers 2016-01-01 21:08:28 +01:00
Kim Kulling 1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Kim Kulling 189340a99f License file: update to 2016 2016-01-01 20:24:10 +01:00
Kim Kulling 912cf63b71 Merge branch 'master' of https://github.com/assimp/assimp 2015-12-31 19:49:37 +01:00
Kim Kulling 4e9ee4e406 coverity findings: add missing initialization. 2015-12-31 16:00:19 +01:00
Stepan Hrbek 39ab716e11 Collada exporter: Fix unicode filenames.
Although existing code uses "C" locale partially, both calls to isalnum() clearly did not use it.
So for example character "ä" was written to .dae as is, rather than converted to %e4, generated .dae was unreadable to many parsers.
2015-12-31 03:22:25 +01:00
Stepan Hrbek 15d84825d9 Collada exporter: Fix isalnum(negative number) assert.
isalnum(negative number) asserts in MSVC.
It was first visible problem when exporting unicode filenames.
2015-12-31 03:18:11 +01:00
Kim Kulling 217ec76dfb coverity findings: fix possible derefencing of null pointer. 2015-12-30 21:56:24 +01:00
Kim Kulling e02a7cdb3c Merge pull request #732 from StepanHrbek/collada-export
Collada exporter: bind uv channel numbers with <bind_vertex_input>.
2015-12-30 21:31:29 +01:00
Kim Kulling 68b12ac0c4 Merge pull request #735 from JLouis-B/master
Fix a crash issue in XFileExporter
2015-12-30 21:26:34 +01:00
Kim Kulling 043fef6d21 coverity findings: fix resource leak in MakeVerboseFormat. 2015-12-30 20:39:58 +01:00
Kim Kulling 56e9a9168c coverity findings: add missing initializations. 2015-12-30 20:04:16 +01:00
Kim Kulling 1ea1f6dcfa coverity findings: add missind intialization in STEPFile. 2015-12-30 20:02:35 +01:00
Kim Kulling e1818d8ab6 coverity findings: initialize lookup table for materials. 2015-12-30 19:43:57 +01:00
JLouis-B a02cc6c98e Fix a crash issue in XFileExporter 2015-12-30 19:01:04 +01:00
Kim Kulling 0f1874d954 coverity findings: initialize index counter in line splitter. 2015-12-30 16:33:54 +01:00
Kim Kulling 7c3475c002 Coverity findings: fix resource leak in PlyLoader.cpp. 2015-12-30 15:38:30 +01:00
Kim Kulling 0c1b5355f4 Coverity finding: remove not used function. 2015-12-30 15:35:26 +01:00
Kim Kulling 8d07e34336 travis config: remove coverity config from master branch. 2015-12-29 20:46:41 +01:00
Kim Kulling da21306f85 travis config: still fighting with tabs. 2015-12-29 20:17:20 +01:00
Kim Kulling 288b81ff7b travis config: fix more invalid tabs and one typo. 2015-12-29 20:09:26 +01:00
Kim Kulling 0cc5e50443 travis config: remove erroreous tab intention. 2015-12-29 20:06:33 +01:00