mirror of
https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git
synced 2025-08-15 08:35:54 +08:00
Merge pull request #380 from AlvaroBarua/master
Fixes compiler warning on VS (Unreachable code detected)
This commit is contained in:
commit
c7e911cf11
@ -3873,7 +3873,7 @@ static bool ParseImage(Image *image, const int image_idx, std::string *err,
|
|||||||
image->uri = uri;
|
image->uri = uri;
|
||||||
#ifdef TINYGLTF_NO_EXTERNAL_IMAGE
|
#ifdef TINYGLTF_NO_EXTERNAL_IMAGE
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#else
|
||||||
std::string decoded_uri = dlib::urldecode(uri);
|
std::string decoded_uri = dlib::urldecode(uri);
|
||||||
if (!LoadExternalFile(&img, err, warn, decoded_uri, basedir,
|
if (!LoadExternalFile(&img, err, warn, decoded_uri, basedir,
|
||||||
/* required */ false, /* required bytes */ 0,
|
/* required */ false, /* required bytes */ 0,
|
||||||
@ -3895,6 +3895,7 @@ static bool ParseImage(Image *image, const int image_idx, std::string *err,
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if (*LoadImageData == nullptr) {
|
if (*LoadImageData == nullptr) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user