Merge pull request #380 from AlvaroBarua/master

Fixes compiler warning on VS (Unreachable code detected)
This commit is contained in:
Syoyo Fujita 2022-09-11 17:56:55 +09:00 committed by GitHub
commit c7e911cf11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3873,7 +3873,7 @@ static bool ParseImage(Image *image, const int image_idx, std::string *err,
image->uri = uri;
#ifdef TINYGLTF_NO_EXTERNAL_IMAGE
return true;
#endif
#else
std::string decoded_uri = dlib::urldecode(uri);
if (!LoadExternalFile(&img, err, warn, decoded_uri, basedir,
/* required */ false, /* required bytes */ 0,
@ -3895,6 +3895,7 @@ static bool ParseImage(Image *image, const int image_idx, std::string *err,
}
return false;
}
#endif
}
if (*LoadImageData == nullptr) {