Mirrors/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-02-17 20:52:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

StringView cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-10-21 19:20:20 -07:00
parent 68a69749de
commit 99021db1e4
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/texturec/texturec.cpp
View File

@@ -956,13 +956,13 @@ int main(int _argc, const char* _argv[])
return bx::kExitFailure;
}
const char* saveAs = cmdLine.findOption("as");
saveAs = NULL == saveAs ? bx::strFindI(outputFileName, ".ktx") : saveAs;
saveAs = NULL == saveAs ? bx::strFindI(outputFileName, ".dds") : saveAs;
saveAs = NULL == saveAs ? bx::strFindI(outputFileName, ".png") : saveAs;
saveAs = NULL == saveAs ? bx::strFindI(outputFileName, ".exr") : saveAs;
saveAs = NULL == saveAs ? bx::strFindI(outputFileName, ".hdr") : saveAs;
if (NULL == saveAs)
bx::StringView saveAs = cmdLine.findOption("as");
saveAs = saveAs.isEmpty() ? bx::strFindI(outputFileName, ".ktx") : saveAs;
saveAs = saveAs.isEmpty() ? bx::strFindI(outputFileName, ".dds") : saveAs;
saveAs = saveAs.isEmpty() ? bx::strFindI(outputFileName, ".png") : saveAs;
saveAs = saveAs.isEmpty() ? bx::strFindI(outputFileName, ".exr") : saveAs;
saveAs = saveAs.isEmpty() ? bx::strFindI(outputFileName, ".hdr") : saveAs;
if (saveAs.isEmpty() )
{
help("Output file format must be specified.");
return bx::kExitFailure;
@@ -1039,7 +1039,7 @@ int main(int _argc, const char* _argv[])
}
}
if (NULL != bx::strFindI(saveAs, "png") )
if (!bx::strFindI(saveAs, "png").isEmpty() )
{
if (options.format == bimg::TextureFormat::Count)
{
@@ -1051,7 +1051,7 @@ int main(int _argc, const char* _argv[])
return bx::kExitFailure;
}
}
else if (NULL != bx::strFindI(saveAs, "exr") )
else if (!bx::strFindI(saveAs, "exr").isEmpty() )
{
if (options.format == bimg::TextureFormat::Count)
{
@@ -1133,15 +1133,15 @@ int main(int _argc, const char* _argv[])
bx::FileWriter writer;
if (bx::open(&writer, outputFileName, false, &err) )
{
if (NULL != bx::strFindI(saveAs, "ktx") )
if (!bx::strFindI(saveAs, "ktx").isEmpty() )
{
bimg::imageWriteKtx(&writer, *output, output->m_data, output->m_size, &err);
}
else if (NULL != bx::strFindI(saveAs, "dds") )
else if (!bx::strFindI(saveAs, "dds").isEmpty() )
{
bimg::imageWriteDds(&writer, *output, output->m_data, output->m_size, &err);
}
else if (NULL != bx::strFindI(saveAs, "png") )
else if (!bx::strFindI(saveAs, "png").isEmpty() )
{
if (output->m_format != bimg::TextureFormat::RGBA8)
{
@@ -1161,7 +1161,7 @@ int main(int _argc, const char* _argv[])
, &err
);
}
else if (NULL != bx::strFindI(saveAs, "exr") )
else if (!bx::strFindI(saveAs, "exr").isEmpty() )
{
bimg::ImageMip mip;
bimg::imageGetRawData(*output, 0, 0, output->m_data, output->m_size, mip);
@@ -1175,7 +1175,7 @@ int main(int _argc, const char* _argv[])
, &err
);
}
else if (NULL != bx::strFindI(saveAs, "hdr") )
else if (!bx::strFindI(saveAs, "hdr").isEmpty() )
{
bimg::ImageMip mip;
bimg::imageGetRawData(*output, 0, 0, output->m_data, output->m_size, mip);