Pārlūkot izejas kodu

texturev: Fixed recognizing file extension on files with extensions with multiple period separators.

Бранимир Караџић 6 gadi atpakaļ
vecāks
revīzija
b323a8950c
1 mainītis faili ar 5 papildinājumiem un 3 dzēšanām
  1. 5 3
      tools/texturev/texturev.cpp

+ 5 - 3
tools/texturev/texturev.cpp

@@ -317,7 +317,7 @@ private:
 	const bx::StringView& m_str;
 	const bx::StringView& m_str;
 	bx::StringView m_token;
 	bx::StringView m_token;
 	char m_ch;
 	char m_ch;
-}; 
+};
 
 
 bool openFileSelectionDialog(
 bool openFileSelectionDialog(
 	  bx::FilePath& _inOutFilePath
 	  bx::FilePath& _inOutFilePath
@@ -424,7 +424,7 @@ bool openFileSelectionDialog(
 			bx::write(&writer, line, &err);
 			bx::write(&writer, line, &err);
 			bx::write(&writer, '\0', &err);
 			bx::write(&writer, '\0', &err);
 			bx::write(&writer, '\0', &err);
 			bx::write(&writer, '\0', &err);
-		}	
+		}
 	}
 	}
 
 
 	bx::write(&writer, '\0', &err);
 	bx::write(&writer, '\0', &err);
@@ -925,7 +925,9 @@ struct View
 					bool supported = false;
 					bool supported = false;
 					for (uint32_t ii = 0; ii < BX_COUNTOF(s_supportedExt); ++ii)
 					for (uint32_t ii = 0; ii < BX_COUNTOF(s_supportedExt); ++ii)
 					{
 					{
-						if (0 == bx::strCmpI(ext, s_supportedExt[ii]) )
+						const bx::StringView supportedExt(s_supportedExt[ii]);
+
+						if (0 == bx::strCmpI(bx::max(ext.getPtr(), ext.getTerm() - supportedExt.getLength() ), supportedExt) )
 						{
 						{
 							supported = true;
 							supported = true;
 							break;
 							break;