diff options
| author | George Marques <george@gmarqu.es> | 2019-03-03 16:50:41 -0300 |
|---|---|---|
| committer | George Marques <george@gmarqu.es> | 2019-03-03 16:51:53 -0300 |
| commit | 4f0590338f0506b74a3a154112598fadb442e13d (patch) | |
| tree | fc14447e0bd91f41d418e46e57fcd006eee5b33e | |
| parent | af6217e1b127df341668b9f03f1f76f4c8c562e5 (diff) | |
Add function to get String from FileAccess
| -rw-r--r-- | core/os/file_access.cpp | 17 | ||||
| -rw-r--r-- | core/os/file_access.h | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index d1f8236898..39d9f45bd7 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -409,6 +409,23 @@ int FileAccess::get_buffer(uint8_t *p_dst, int p_length) const { return i; } +String FileAccess::get_as_utf8_string() const { + PoolVector<uint8_t> sourcef; + int len = get_len(); + sourcef.resize(len + 1); + + PoolVector<uint8_t>::Write w = sourcef.write(); + int r = get_buffer(w.ptr(), len); + ERR_FAIL_COND_V(r != len, String()); + w[len] = 0; + + String s; + if (s.parse_utf8((const char *)w.ptr())) { + return String(); + } + return s; +} + void FileAccess::store_16(uint16_t p_dest) { uint8_t a, b; diff --git a/core/os/file_access.h b/core/os/file_access.h index 7bfbf6e7f0..c65b75369c 100644 --- a/core/os/file_access.h +++ b/core/os/file_access.h @@ -113,6 +113,7 @@ public: virtual String get_line() const; virtual String get_token() const; virtual Vector<String> get_csv_line(const String &p_delim = ",") const; + virtual String get_as_utf8_string() const; /**< use this for files WRITTEN in _big_ endian machines (ie, amiga/mac) * It's not about the current CPU type but file formats. |