Browse Source

MagnumFont[Converter]: adapted to Magnum changes.

Forgot to call `delete` here too.
pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
d43db99e86
  1. 6
      src/Plugins/MagnumFont/MagnumFont.cpp
  2. 3
      src/Plugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp

6
src/Plugins/MagnumFont/MagnumFont.cpp

@ -102,14 +102,13 @@ void MagnumFont::doOpenData(const std::vector<std::pair<std::string, Containers:
Error() << "Text::MagnumFont::openData(): cannot open image file";
return;
}
Trade::ImageData2D* image = importer.image2D(0);
std::optional<Trade::ImageData2D> image = importer.image2D(0);
if(!image) {
Error() << "Text::MagnumFont::openData(): cannot load image file";
return;
}
openInternal(std::move(conf), std::move(*image));
delete image;
}
void MagnumFont::doOpenFile(const std::string& filename, Float) {
@ -134,14 +133,13 @@ void MagnumFont::doOpenFile(const std::string& filename, Float) {
Error() << "Text::MagnumFont::openFile(): cannot open image file" << imageFilename;
return;
}
Trade::ImageData2D* image = importer.image2D(0);
std::optional<Trade::ImageData2D> image = importer.image2D(0);
if(!image) {
Error() << "Text::MagnumFont::openFile(): cannot load image file";
return;
}
openInternal(std::move(conf), std::move(*image));
delete image;
}
void MagnumFont::openInternal(Utility::Configuration&& conf, Trade::ImageData2D&& image) {

3
src/Plugins/MagnumFontConverter/Test/MagnumFontConverterTest.cpp

@ -88,7 +88,8 @@ void MagnumFontConverterTest::exportFont() {
/* Verify font image, no need to test image contents, as the image is garbage anyway */
Trade::TgaImporter importer;
CORRADE_VERIFY(importer.openFile(Utility::Directory::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.tga")));
Trade::ImageData2D* image = importer.image2D(0);
std::optional<Trade::ImageData2D> image = importer.image2D(0);
CORRADE_VERIFY(image);
CORRADE_COMPARE(image->size(), Vector2i(256));
CORRADE_COMPARE(image->format(), ImageFormat::Red);
CORRADE_COMPARE(image->type(), ImageType::UnsignedByte);

Loading…
Cancel
Save