From b0a7c134739580275404e8a9d8092215efd42327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Mon, 2 Apr 2018 06:02:55 -0700 Subject: [PATCH] texturev: Fixed crash when selected image is invalid. --- tools/texturev/texturev.cpp | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tools/texturev/texturev.cpp b/tools/texturev/texturev.cpp index dd363f0c6..8ddb8ff1e 100644 --- a/tools/texturev/texturev.cpp +++ b/tools/texturev/texturev.cpp @@ -1670,19 +1670,24 @@ int _main_(int _argc, char** _argv) , &orientation ); - view.m_inLinear = bimg::isFloat(bimg::TextureFormat::Enum(view.m_textureInfo.format) ); + bimg::TextureFormat::Enum format = bimg::TextureFormat::Enum(view.m_textureInfo.format); - switch (orientation) + if (format < bimg::TextureFormat::Count) { - default: - case bimg::Orientation::R0: cmdExec("view orientation\nview orientation z 0"); break; - case bimg::Orientation::R90: cmdExec("view orientation\nview orientation z -90"); break; - case bimg::Orientation::R180: cmdExec("view orientation\nview orientation z -180"); break; - case bimg::Orientation::R270: cmdExec("view orientation\nview orientation z -270"); break; - case bimg::Orientation::HFlip: cmdExec("view orientation\nview orientation x -180"); break; - case bimg::Orientation::HFlipR90: cmdExec("view orientation\nview orientation z -90\nview orientation x -180"); break; - case bimg::Orientation::HFlipR270: cmdExec("view orientation\nview orientation z -270\nview orientation x -180"); break; - case bimg::Orientation::VFlip: cmdExec("view orientation\nview orientation y -180"); break; + view.m_inLinear = bimg::isFloat(format); + + switch (orientation) + { + default: + case bimg::Orientation::R0: cmdExec("view orientation\nview orientation z 0"); break; + case bimg::Orientation::R90: cmdExec("view orientation\nview orientation z -90"); break; + case bimg::Orientation::R180: cmdExec("view orientation\nview orientation z -180"); break; + case bimg::Orientation::R270: cmdExec("view orientation\nview orientation z -270"); break; + case bimg::Orientation::HFlip: cmdExec("view orientation\nview orientation x -180"); break; + case bimg::Orientation::HFlipR90: cmdExec("view orientation\nview orientation z -90\nview orientation x -180"); break; + case bimg::Orientation::HFlipR270: cmdExec("view orientation\nview orientation z -270\nview orientation x -180"); break; + case bimg::Orientation::VFlip: cmdExec("view orientation\nview orientation y -180"); break; + } } std::string title;