Merge pull request #164 from KhronosGroup/fix-mime-types

Fix png detection and strip period from extension for mime types
KhronosGroup · Apr 4, 2018 · 18bb9cf · 18bb9cf
2 parents 7e8a7da + 5558e24
commit 18bb9cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,11 +1,14 @@
 Change Log
 ==========
 
-### Next Release
+### v2.1.1 - 2018-04-04
 
 ##### Additions :tada:
 * Add support for exporting double sided materials [#133](https://github.com/KhronosGroup/COLLADA2GLTF/pull/133)
 
+##### Fixes :wrench:
+* Fixed issue where incorrect mime types were being generated [#162](https://github.com/KhronosGroup/COLLADA2GLTF/pull/164)
+
 ### v2.1.0 - 2018-03-15
 
 ##### Additions :tada:

diff --git a/GLTF/src/GLTFImage.cpp b/GLTF/src/GLTFImage.cpp
@@ -14,8 +14,8 @@ GLTF::Image::Image(std::string uri, std::string cacheKey) : uri(uri), cacheKey(c
 GLTF::Image::Image(std::string uri) : Image(uri, "") {}
 
 GLTF::Image::Image(std::string uri, std::string cacheKey, unsigned char* data, size_t byteLength, std::string fileExtension) : uri(uri), data(data), byteLength(byteLength), cacheKey(cacheKey) {
-	std::string dataSubstring((char*)data, 9);
-	if (dataSubstring.substr(1, 8) == "PNG\r\n\x1a\n") {
+	std::string dataSubstring((char*)data, 8);
+	if (dataSubstring.substr(1, 7) == "PNG\r\n\x1a\n") {
 		mimeType = "image/png";
 	}
 	else if (data[0] == 255 && data[1] == 216) {
@@ -41,6 +41,7 @@ GLTF::Image* GLTF::Image::load(path imagePath) {
 		return imageCacheIt->second;
 	}
 	std::string fileExtension = imagePath.extension().string();
+	fileExtension.erase(0, 1);
 	GLTF::Image* image = NULL;
 	FILE* file = fopen(fileString.c_str(), "rb");
 	if (file == NULL) {