mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Projucer: Make BinaryData::getNamedResourceOriginalFilename more robust

Browse source
This commit is contained in:
Tom Poole 2022-03-04 10:25:05 +00:00
parent dbbf5cfe6d
commit d5311698e9
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
extras/Build/juce_build_tools/utils/juce_BinaryResourceFile.cpp
View file

@ -135,7 +135,9 @@ namespace build_tools
cpp << "/* ==================================== " << resourceFileIdentifierString << " ====================================";
writeComment (cpp);
cpp << "namespace " << className << newLine
cpp << "#include <cstring>" << newLine
<< newLine
<< "namespace " << className << newLine
<< "{" << newLine;
while (i < files.size())
@ -221,10 +223,8 @@ namespace build_tools
<< "const char* getNamedResourceOriginalFilename (const char* resourceNameUTF8)" << newLine
<< "{" << newLine
<< " for (unsigned int i = 0; i < (sizeof (namedResourceList) / sizeof (namedResourceList[0])); ++i)" << newLine
<< " {" << newLine
<< " if (namedResourceList[i] == resourceNameUTF8)" << newLine
<< " if (strcmp (namedResourceList[i], resourceNameUTF8) == 0)" << newLine
<< " return originalFilenames[i];" << newLine
<< " }" << newLine
<< newLine
<< " return nullptr;" << newLine
<< "}" << newLine

4
extras/Projucer/JuceLibraryCode/BinaryData.cpp
View file

@ -4,6 +4,8 @@
*/
#include <string>
namespace BinaryData
{
@ -8442,7 +8444,7 @@ const char* getNamedResourceOriginalFilename (const char* resourceNameUTF8)
{
for (unsigned int i = 0; i < (sizeof (namedResourceList) / sizeof (namedResourceList[0])); ++i)
{
if (namedResourceList[i] == resourceNameUTF8)
if (std::string (namedResourceList[i]) == std::string (resourceNameUTF8))
return originalFilenames[i];
}