GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-16 05:25:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow empty buffer when serializing glTF buffer data.

Browse Source
This commit is contained in:
Syoyo Fujita 2019-12-19 14:16:48 +09:00
parent 8ced108571
commit a11f6e1939
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tiny_gltf.h
View File

@ -2728,6 +2728,7 @@ bool DecodeDataURI(std::vector<unsigned char> *out, std::string &mime_type,
} }
} }
// TODO(syoyo): Allow empty buffer? #229
if (data.empty()) { if (data.empty()) {
return false; return false;
} }
@ -6278,9 +6279,15 @@ static void SerializeValue(const std::string &key, const Value &value,
static void SerializeGltfBufferData(const std::vector<unsigned char> &data, static void SerializeGltfBufferData(const std::vector<unsigned char> &data,
json &o) { json &o) {
std::string header = "data:application/octet-stream;base64,"; std::string header = "data:application/octet-stream;base64,";
std::string encodedData = if (data.size() > 0) {
base64_encode(&data[0], static_cast<unsigned int>(data.size())); std::string encodedData =
SerializeStringProperty("uri", header + encodedData, o); base64_encode(&data[0], static_cast<unsigned int>(data.size()));
SerializeStringProperty("uri", header + encodedData, o);
} else {
// Issue #229
// size 0 is allowd. Just emit mime header.
SerializeStringProperty("uri", header, o);
}
} }
static bool SerializeGltfBufferData(const std::vector<unsigned char> &data, static bool SerializeGltfBufferData(const std::vector<unsigned char> &data,
@ -6302,8 +6309,14 @@ static bool SerializeGltfBufferData(const std::vector<unsigned char> &data,
std::ofstream output(binFilename.c_str(), std::ofstream::binary); std::ofstream output(binFilename.c_str(), std::ofstream::binary);
if (!output.is_open()) return false; if (!output.is_open()) return false;
#endif #endif
output.write(reinterpret_cast<const char *>(&data[0]), if (data.size() > 0) {
std::streamsize(data.size())); output.write(reinterpret_cast<const char *>(&data[0]),
std::streamsize(data.size()));
} else {
// Issue #229
// size 0 will be still valid buffer data.
// write empty file.
}
return true; return true;
} }