Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-06-08 11:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing bmp and gif mimetypes

Browse Source
This commit is contained in:
Omar C. F
2018-02-10 09:09:41 +02:00
committed by GitHub
parent 0d9a495fd1
commit f8a8d9caa0
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tiny_gltf.h
View File

@@ -449,7 +449,7 @@ struct Image {
int component;
std::vector<unsigned char> image;
int bufferView; // (required if no uri)
std::string mimeType; // (required if no uri) ["image/jpeg", "image/png"]
std::string mimeType; // (required if no uri) ["image/jpeg", "image/png", "image/bmp", "image/gif"]
std::string uri; // (reqiored if no mimeType)
Value extras;
@@ -1224,13 +1224,23 @@ static bool IsDataURI(const std::string &in) {
return true;
}
header = "data:image/jpeg;base64,";
if (in.find(header) == 0) {
return true;
}
header = "data:image/png;base64,";
if (in.find(header) == 0) {
return true;
}
header = "data:image/bmp;base64,";
if(in.find(header) == 0) {
return true;
}
header = "data:image/jpeg;base64,";
if (in.find(header) == 0) {
header = "data:image/gif;base64,";
if(in.find(header) == 0) {
return true;
}
@@ -1264,6 +1274,20 @@ static bool DecodeDataURI(std::vector<unsigned char> *out,
data = base64_decode(in.substr(header.size())); // cut mime string.
}
}
if (data.empty()) {
header = "data:image/bmp;base64,";
if (in.find(header) == 0) {
data = base64_decode(in.substr(header.size())); // cut mime string.
}
}
if (data.empty()) {
header = "data:image/gif;base64,";
if (in.find(header) == 0) {
data = base64_decode(in.substr(header.size())); // cut mime string.
}
}
if (data.empty()) {
header = "data:text/plain;base64,";