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

Merge pull request #105 from rapidimages/bugfix/write_image_to_disk

Browse Source 
Fixed a reference error which cause an error when writing images to disk
This commit is contained in:
Syoyo Fujita 2018-11-07 00:56:34 +09:00 committed by GitHub
commit cf60322e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tiny_gltf.h
View File

@ -4130,7 +4130,7 @@ static void SerializeExtensionMap(ExtensionMap &extensions, json &o) {
extMap[extIt->first] = ret; extMap[extIt->first] = ret;
} }
if(ret.is_null()) { if(ret.is_null()) {
if (!(extIt->first.empty())) { // name should not be empty, but for sure if (!(extIt->first.empty())) { // name should not be empty, but for sure
// create empty object so that an extension name is still included in json. // create empty object so that an extension name is still included in json.
extMap[extIt->first] = json({}); extMap[extIt->first] = json({});
} }
@ -4597,7 +4597,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
} else { } else {
std::string binSavePath; std::string binSavePath;
std::string binUri; std::string binUri;
if (!model->buffers[i].uri.empty() if (!model->buffers[i].uri.empty()
&& !IsDataURI(model->buffers[i].uri)) { && !IsDataURI(model->buffers[i].uri)) {
binUri = model->buffers[i].uri; binUri = model->buffers[i].uri;
} }
@ -4654,7 +4654,7 @@ bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
json image; json image;
UpdateImageObject(model->images[i], baseDir, int(i), embedImages, UpdateImageObject(model->images[i], baseDir, int(i), embedImages,
&this->WriteImageData, &this->write_image_user_data_); &this->WriteImageData, this->write_image_user_data_);
SerializeGltfImage(model->images[i], image); SerializeGltfImage(model->images[i], image);
images.push_back(image); images.push_back(image);
} }