View | Details | Raw Unified | Return to bug 216815 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 lines)
Lines 13-22 Link Here
13
LICENSE=	BSD3CLAUSE
13
LICENSE=	BSD3CLAUSE
14
LICENSE_FILE=	${WRKSRC}/LICENSE
14
LICENSE_FILE=	${WRKSRC}/LICENSE
15
15
16
BROKEN_aarch64=		Does not compile: error: non-constant-expression cannot be narrowed from type int8_t to char
17
BROKEN_armv6=		Does not compile: error: non-constant-expression cannot be narrowed from type int8_t to char
18
BROKEN_powerpc64=	Does not build
16
BROKEN_powerpc64=	Does not build
19
BROKEN_armv6=		Does not compile: error: ByteSwap has not been declared
20
17
21
USES=		cmake compiler:c++11-lib pkgconfig
18
USES=		cmake compiler:c++11-lib pkgconfig
22
USE_GITHUB=		yes
19
USE_GITHUB=		yes
(-)files/patch-code_BlenderDNA.cpp (+32 lines)
Line 0 Link Here
1
--- code/BlenderDNA.cpp.orig	2017-02-05 09:22:26 UTC
2
+++ code/BlenderDNA.cpp
3
@@ -55,10 +55,10 @@ using namespace Assimp::Formatter;
4
 
5
 bool match4(StreamReaderAny& stream, const char* string) {
6
     char tmp[] = {
7
-        (stream).GetI1(),
8
-        (stream).GetI1(),
9
-        (stream).GetI1(),
10
-        (stream).GetI1()
11
+        static_cast<char>((stream).GetI1()),
12
+        static_cast<char>((stream).GetI1()),
13
+        static_cast<char>((stream).GetI1()),
14
+        static_cast<char>((stream).GetI1())
15
     };
16
     return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]);
17
 }
18
@@ -345,10 +345,10 @@ void SectionParser :: Next()
19
     stream.SetCurrentPos(current.start + current.size);
20
 
21
     const char tmp[] = {
22
-        stream.GetI1(),
23
-        stream.GetI1(),
24
-        stream.GetI1(),
25
-        stream.GetI1()
26
+        static_cast<char>(stream.GetI1()),
27
+        static_cast<char>(stream.GetI1()),
28
+        static_cast<char>(stream.GetI1()),
29
+        static_cast<char>(stream.GetI1())
30
     };
31
     current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1);
32
 

Return to bug 216815