Browse Source

TgaImageConverter: update error message.

pull/77/head
Vladimír Vondruš 12 years ago
parent
commit
7726c10388
  1. 4
      src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
  2. 4
      src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp

4
src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp

@ -78,7 +78,7 @@ void TgaImageConverterTest::wrongFormat() {
const auto data = TgaImageConverter().exportToData(image);
CORRADE_VERIFY(!data);
CORRADE_COMPARE(out.str(), "Trade::TgaImageConverter::convertToData(): unsupported image format ColorFormat::RG\n");
CORRADE_COMPARE(out.str(), "Trade::TgaImageConverter::exportToData(): unsupported color format ColorFormat::RG\n");
}
void TgaImageConverterTest::wrongType() {
@ -89,7 +89,7 @@ void TgaImageConverterTest::wrongType() {
const auto data = TgaImageConverter().exportToData(image);
CORRADE_VERIFY(!data);
CORRADE_COMPARE(out.str(), "Trade::TgaImageConverter::convertToData(): unsupported image type ColorType::Float\n");
CORRADE_COMPARE(out.str(), "Trade::TgaImageConverter::exportToData(): unsupported color type ColorType::Float\n");
}
void TgaImageConverterTest::data() {

4
src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp

@ -59,12 +59,12 @@ Containers::Array<unsigned char> TgaImageConverter::doExportToData(const ImageRe
image.format() != ColorFormat::Red)
#endif
{
Error() << "Trade::TgaImageConverter::convertToData(): unsupported image format" << image.format();
Error() << "Trade::TgaImageConverter::exportToData(): unsupported color format" << image.format();
return nullptr;
}
if(image.type() != ColorType::UnsignedByte) {
Error() << "Trade::TgaImageConverter::convertToData(): unsupported image type" << image.type();
Error() << "Trade::TgaImageConverter::exportToData(): unsupported color type" << image.type();
return nullptr;
}

Loading…
Cancel
Save