Fixed FTBFS on platforms where the default is unsigned char.

parent 354b6859
From: Alberto Luaces <aluaces@udc.es>
Date: Fri, 23 Sep 2016 16:38:15 +0200
Subject: Explicit signed char type for portability (base64).
arm, powerpc and s390 platforms have default unsigned chars, so that
code failed when a literal "-1" was found.
---
src/osgDB/ConvertBase64.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/osgDB/ConvertBase64.cpp b/src/osgDB/ConvertBase64.cpp
index 50befdf..57c8a7d 100644
--- a/src/osgDB/ConvertBase64.cpp
+++ b/src/osgDB/ConvertBase64.cpp
@@ -28,7 +28,7 @@ namespace osgDB
int base64_decode_value(char value_in)
{
- static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
+ static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
static const char decoding_size = sizeof(decoding);
value_in -= 43;
if (value_in < 0 || value_in > decoding_size) return -1;
......@@ -4,3 +4,4 @@ no-xine-malloc-aligned.diff
ffmpeg_2.9.patch
0005-Bas-Couwenberg-s-patches-for-Hurd.patch
0006-Occlusion-Queries-Stuttering-fix-from-upstream.patch
0007-Explicit-signed-char-type-for-portability-base64.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment