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

Adds workaround for unsupported images

Browse Source
This commit is contained in:
Aurélien Chatelain 2017-05-24 09:55:14 +00:00
parent d48bbdcd90
commit 5cb4346a32
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tiny_gltf_loader.h
View File

@ -904,12 +904,16 @@ static bool LoadImageData(Image *image, std::string *err, int req_width,
int req_height, const unsigned char *bytes, int req_height, const unsigned char *bytes,
int size) { int size) {
int w, h, comp; int w, h, comp;
// if image cannot be decoded, ignore parsing and keep it by its path
// don't break in this case
//FIXME we should only enter this function if the image is embedded. If image->uri references
// an image file, it should be left as it is. Image loading should not be mandatory (to support other formats)
unsigned char *data = stbi_load_from_memory(bytes, size, &w, &h, &comp, 0); unsigned char *data = stbi_load_from_memory(bytes, size, &w, &h, &comp, 0);
if (!data) { if (!data) {
if (err) { if (err) {
(*err) += "Unknown image format.\n"; (*err) += "Unknown image format.\n";
} }
return false; return true;
} }
if (w < 1 || h < 1) { if (w < 1 || h < 1) {
@ -917,7 +921,7 @@ static bool LoadImageData(Image *image, std::string *err, int req_width,
if (err) { if (err) {
(*err) += "Unknown image format.\n"; (*err) += "Unknown image format.\n";
} }
return false; return true;
} }
if (req_width > 0) { if (req_width > 0) {
@ -1438,11 +1442,16 @@ static bool ParseImage(Image *image, std::string *err,
} }
} else { } else {
// Assume external file // Assume external file
// Keep texture path (for textures that cannot be decoded)
image->uri = uri;
if (!LoadExternalFile(&img, err, uri, basedir, 0, false)) { if (!LoadExternalFile(&img, err, uri, basedir, 0, false)) {
if (err) { if (err) {
(*err) += "Failed to load external 'uri'. for image parameter\n"; (*err) += "Failed to load external 'uri'. for image parameter\n";
} }
return false; // If the image cannot be loaded, keep uri as image->uri.
return true;
} }
if (img.empty()) { if (img.empty()) {
if (err) { if (err) {