Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-08-27 05:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow opting out of STB_IMAGE dependency

Browse Source 
Signed-off-by: Squareys <squareys@googlemail.com>
This commit is contained in:
Squareys
2018-03-13 22:40:53 +01:00
parent ff644d82c9
commit 2d3594de22
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tiny_gltf.h
View File

@@ -730,10 +730,12 @@ enum SectionCheck {
///
typedef bool (*LoadImageDataFunction)(Image *, std::string *, int, int, const unsigned char *, int, void *);
#ifndef TINYGLTF_NO_STB_IMAGE
// Declaration of default image loader callback
static bool LoadImageData(Image *image, std::string *err, int req_width,
int req_height, const unsigned char *bytes,
int size, void*);
#endif
class TinyGLTF {
public:
@@ -869,7 +871,11 @@ class TinyGLTF {
#endif
#include "./json.hpp"
#ifndef TINYGLTF_NO_STB_IMAGE
#include "./stb_image.h"
#endif
#ifdef __clang__
#pragma clang diagnostic pop
#endif
@@ -1186,6 +1192,7 @@ void TinyGLTF::SetImageLoader(LoadImageDataFunction func, void *user_data) {
load_image_user_data_ = user_data;
}
#ifndef TINYGLTF_NO_STB_IMAGE
static bool LoadImageData(Image *image, std::string *err, int req_width,
int req_height, const unsigned char *bytes,
int size, void*) {
@@ -1242,6 +1249,7 @@ static bool LoadImageData(Image *image, std::string *err, int req_width,
return true;
}
#endif
static bool IsDataURI(const std::string &in) {
std::string header = "data:application/octet-stream;base64,";