Fixed some more unhandled signed/unsigned char errors.

parent cfa2f1e0
......@@ -5,13 +5,14 @@ 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(-)
src/osgDB/ConvertBase64.cpp | 2 +-
src/osgPlugins/osgjs/Base64.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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
Index: openscenegraph-3.4/src/osgDB/ConvertBase64.cpp
===================================================================
--- openscenegraph-3.4.orig/src/osgDB/ConvertBase64.cpp
+++ openscenegraph-3.4/src/osgDB/ConvertBase64.cpp
@@ -28,7 +28,7 @@ namespace osgDB
int base64_decode_value(char value_in)
......@@ -21,3 +22,37 @@ index 50befdf..57c8a7d 100644
static const char decoding_size = sizeof(decoding);
value_in -= 43;
if (value_in < 0 || value_in > decoding_size) return -1;
Index: openscenegraph-3.4/src/osgPlugins/osgjs/Base64.cpp
===================================================================
--- openscenegraph-3.4.orig/src/osgPlugins/osgjs/Base64.cpp
+++ openscenegraph-3.4/src/osgPlugins/osgjs/Base64.cpp
@@ -18,7 +18,7 @@ namespace base64
const char* to_table_end =
_to_table + sizeof(_to_table);
- const char _from_table[128] =
+ const signed char _from_table[128] =
{
-1, -1, -1, -1, -1, -1, -1, -1, // 0
-1, -1, -1, -1, -1, -1, -1, -1, // 8
@@ -37,6 +37,6 @@ namespace base64
41, 42, 43, 44, 45, 46, 47, 48, // 112
49, 50, 51, -1, -1, -1, -1, -1 // 120
};
- const char* from_table = _from_table;
+ const signed char* from_table = _from_table;
}
Index: openscenegraph-3.4/src/osgPlugins/osgjs/Base64
===================================================================
--- openscenegraph-3.4.orig/src/osgPlugins/osgjs/Base64
+++ openscenegraph-3.4/src/osgPlugins/osgjs/Base64
@@ -61,7 +61,7 @@ namespace base64
extern const char* to_table;
extern const char* to_table_end;
- extern const char* from_table;
+ extern const signed char* from_table;
template <class InputIterator, class OutputIterator>
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