TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

multifile: Return vector_uchar from readSubfile

Browse Source 
- Return vector_uchar from readSubfile instead of
        string. This will correct problems with Python 3 unicode
        strings and will return bytes instead.

Signed-off-by: deflected <deflected@users.noreply.github.com>

Closes #290
This commit is contained in:
deflected 2018-03-22 12:35:09 +02:00 committed by rdb
parent cfd70ebead
commit 09a9a8ff22
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/express/multifile.I
View File

@ -278,12 +278,12 @@ remove_subfile(const string &subfile_name) {
} }
/** /**
* Returns a string that contains the entire contents of the indicated * Returns a vector_uchar that contains the entire contents of the indicated
* subfile. * subfile.
*/ */
INLINE string Multifile:: INLINE vector_uchar Multifile::
read_subfile(int index) { read_subfile(int index) {
string result; vector_uchar result;
read_subfile(index, result); read_subfile(index, result);
return result; return result;
} }

3
panda/src/express/multifile.h
View File

@ -24,6 +24,7 @@
#include "indirectLess.h" #include "indirectLess.h"
#include "referenceCount.h" #include "referenceCount.h"
#include "pvector.h" #include "pvector.h"
#include "vector_uchar.h"
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
typedef struct x509_st X509; typedef struct x509_st X509;
@ -125,7 +126,7 @@ PUBLISHED:
streampos get_subfile_internal_start(int index) const; streampos get_subfile_internal_start(int index) const;
size_t get_subfile_internal_length(int index) const; size_t get_subfile_internal_length(int index) const;
BLOCKING INLINE string read_subfile(int index); BLOCKING INLINE vector_uchar read_subfile(int index);
BLOCKING istream *open_read_subfile(int index); BLOCKING istream *open_read_subfile(int index);
BLOCKING static void close_read_subfile(istream *stream); BLOCKING static void close_read_subfile(istream *stream);
BLOCKING bool extract_subfile(int index, const Filename &filename); BLOCKING bool extract_subfile(int index, const Filename &filename);