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

Fixed wrong metadata in case 16bit image wasn't actually loaded

Browse Source 
The fallback to 8 bit would have been broken.
This commit is contained in:
Arthur Brainville (Ybalrid) 2019-03-02 22:03:34 +01:00
parent f2addc0e44
commit 5a4c898912
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tiny_gltf.h
View File

@ -1635,14 +1635,14 @@ void TinyGLTF::SetImageLoader(LoadImageDataFunction func, void *user_data) {
} }
#ifndef TINYGLTF_NO_STB_IMAGE #ifndef TINYGLTF_NO_STB_IMAGE
bool LoadImageData(Image *image, const int image_idx, std::string *err, std::string *warn, bool LoadImageData(Image *image, const int image_idx, std::string *err,
int req_width, int req_height, const unsigned char *bytes, std::string *warn, int req_width, int req_height,
int size, void *user_data) { const unsigned char *bytes, int size, void *user_data) {
(void)warn; (void)warn;
int w, h, comp, req_comp; int w, h, comp, req_comp;
unsigned char* data = nullptr; unsigned char *data = nullptr;
// force 32-bit textures for common Vulkan compatibility. It appears that // force 32-bit textures for common Vulkan compatibility. It appears that
// some GPU drivers do not support 24-bit images for Vulkan // some GPU drivers do not support 24-bit images for Vulkan
@ -1650,18 +1650,19 @@ bool LoadImageData(Image *image, const int image_idx, std::string *err, std::str
int bits = 8; int bits = 8;
int pixel_type = TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE; int pixel_type = TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE;
// It is possible that the image we want to load is a 16bit per channel image // It is possible that the image we want to load is a 16bit per channel image
// We are going to attempt to load it as 16bit per channel, and if it worked, // We are going to attempt to load it as 16bit per channel, and if it worked,
// set the image data accodingly. We are casting the returned pointer into // set the image data accodingly. We are casting the returned pointer into
// unsigned char, because we are representing "bytes". But we are updating // unsigned char, because we are representing "bytes". But we are updating
// the Image metadata to signal that this image uses 2 bytes (16bits) per // the Image metadata to signal that this image uses 2 bytes (16bits) per
// channel: // channel:
if(stbi_is_16_bit_from_memory(bytes, size)) if (stbi_is_16_bit_from_memory(bytes, size)) {
{ data = (unsigned char *)stbi_load_16_from_memory(bytes, size, &w, &h, &comp,
data = (unsigned char*)stbi_load_16_from_memory(bytes, size, &w, &h, &comp, req_comp); req_comp);
bits = 16; if (data) {
pixel_type = TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT; bits = 16;
pixel_type = TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT;
}
} }
// at this point, if data is still NULL, it means that the image wasn't // at this point, if data is still NULL, it means that the image wasn't
@ -1673,12 +1674,13 @@ bool LoadImageData(Image *image, const int image_idx, std::string *err, std::str
// image->uri references // image->uri references
// an image file, it should be left as it is. Image loading should not be // an image file, it should be left as it is. Image loading should not be
// mandatory (to support other formats) // mandatory (to support other formats)
if(!data) data = if (!data) data = stbi_load_from_memory(bytes, size, &w, &h, &comp, req_comp);
stbi_load_from_memory(bytes, size, &w, &h, &comp, req_comp);
if (!data) { if (!data) {
// NOTE: you can use `warn` instead of `err` // NOTE: you can use `warn` instead of `err`
if (err) { if (err) {
(*err) += "Unknown image format. STB cannot decode image data for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\".\n"; (*err) +=
"Unknown image format. STB cannot decode image data for image[" +
std::to_string(image_idx) + "] name = \"" + image->name + "\".\n";
} }
return false; return false;
} }
@ -1686,16 +1688,19 @@ bool LoadImageData(Image *image, const int image_idx, std::string *err, std::str
if (w < 1 || h < 1) { if (w < 1 || h < 1) {
stbi_image_free(data); stbi_image_free(data);
if (err) { if (err) {
(*err) += "Invalid image data for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\"\n"; (*err) += "Invalid image data for image[" + std::to_string(image_idx) +
"] name = \"" + image->name + "\"\n";
} }
return false; return false;
} }
if (req_width > 0) { if (req_width > 0) {
if (req_width != w) { if (req_width != w) {
stbi_image_free(data); stbi_image_free(data);
if (err) { if (err) {
(*err) += "Image width mismatch for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\"\n"; (*err) += "Image width mismatch for image[" +
std::to_string(image_idx) + "] name = \"" + image->name +
"\"\n";
} }
return false; return false;
} }
@ -1703,9 +1708,11 @@ bool LoadImageData(Image *image, const int image_idx, std::string *err, std::str
if (req_height > 0) { if (req_height > 0) {
if (req_height != h) { if (req_height != h) {
stbi_image_free(data); stbi_image_free(data);
if (err) { if (err) {
(*err) += "Image height mismatch. for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\"\n"; (*err) += "Image height mismatch. for image[" +
std::to_string(image_idx) + "] name = \"" + image->name +
"\"\n";
} }
return false; return false;
} }
@ -1716,8 +1723,8 @@ bool LoadImageData(Image *image, const int image_idx, std::string *err, std::str
image->component = req_comp; image->component = req_comp;
image->bits = bits; image->bits = bits;
image->pixel_type = pixel_type; image->pixel_type = pixel_type;
image->image.resize(static_cast<size_t>(w * h * req_comp) * (bits/8)); image->image.resize(static_cast<size_t>(w * h * req_comp) * (bits / 8));
std::copy(data, data + w * h * req_comp * (bits/8), image->image.begin()); std::copy(data, data + w * h * req_comp * (bits / 8), image->image.begin());
stbi_image_free(data); stbi_image_free(data);
return true; return true;