summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch')
-rw-r--r--recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
deleted file mode 100644
index 68b0f332..00000000
--- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From d6e714f9c2b1e5ed238084e254268d70d2093ae1 Mon Sep 17 00:00:00 2001
2From: Kim Kulling <kim.kulling@googlemail.com>
3Date: Mon, 7 Nov 2016 17:19:49 +0100
4Subject: [PATCH] Fix BlenderDNA for clang cross compiler.
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/3rdparty/assimp/code/BlenderDNA.cpp | 16 ++++++++--------
9 1 file changed, 8 insertions(+), 8 deletions(-)
10
11diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp
12index 18ec9f2..5b0b209 100644
13--- a/src/3rdparty/assimp/code/BlenderDNA.cpp
14+++ b/src/3rdparty/assimp/code/BlenderDNA.cpp
15@@ -55,10 +55,10 @@ using namespace Assimp::Formatter;
16
17 bool match4(StreamReaderAny& stream, const char* string) {
18 char tmp[] = {
19- (stream).GetI1(),
20- (stream).GetI1(),
21- (stream).GetI1(),
22- (stream).GetI1()
23+ (const char)(stream).GetI1(),
24+ (const char)(stream).GetI1(),
25+ (const char)(stream).GetI1(),
26+ (const char)(stream).GetI1()
27 };
28 return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]);
29 }
30@@ -345,10 +345,10 @@ void SectionParser :: Next()
31 stream.SetCurrentPos(current.start + current.size);
32
33 const char tmp[] = {
34- stream.GetI1(),
35- stream.GetI1(),
36- stream.GetI1(),
37- stream.GetI1()
38+ (const char)stream.GetI1(),
39+ (const char)stream.GetI1(),
40+ (const char)stream.GetI1(),
41+ (const char)stream.GetI1()
42 };
43 current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1);
44