From 6807cd2b3941f92f2f60494ce60c807ac03da09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 7 Jul 2013 21:29:09 +0200 Subject: [PATCH] Adapted to Magnum changes. --- .../MagnumFontConverter.cpp | 2 +- .../Test/TgaImageConverterTest.cpp | 10 ++--- .../TgaImageConverter/TgaImageConverter.cpp | 38 +++++++++---------- .../TgaImageConverter/TgaImageConverter.h | 2 +- .../pluginRegistrationTgaImageConverter.cpp | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp index 2c10c006e..99dfb0b96 100644 --- a/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp +++ b/src/Plugins/MagnumFontConverter/MagnumFontConverter.cpp @@ -98,7 +98,7 @@ std::vector>> MagnumFont /* Save cache image */ Image2D image(ImageFormat::Red, ImageType::UnsignedByte); cache->texture()->image(0, image); - auto tgaData = Trade::TgaImageConverter().exportToData(&image); + auto tgaData = Trade::TgaImageConverter().exportToData(image); std::vector>> out; out.emplace_back(filename + ".conf", std::move(confData)); diff --git a/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp index 31bc57129..16cb5562b 100644 --- a/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp +++ b/src/Plugins/TgaImageConverter/Test/TgaImageConverterTest.cpp @@ -68,29 +68,29 @@ TgaImageConverterTest::TgaImageConverterTest() { } void TgaImageConverterTest::wrongFormat() { - Image2D image(ImageFormat::RG, ImageType::UnsignedByte, {}, nullptr); + ImageReference2D image(ImageFormat::RG, ImageType::UnsignedByte, {}, nullptr); std::ostringstream out; Error::setOutput(&out); - const auto data = TgaImageConverter().exportToData(&image); + const auto data = TgaImageConverter().exportToData(image); CORRADE_VERIFY(!data); CORRADE_COMPARE(out.str(), "Trade::TgaImageConverter::TgaImageConverter::convertToData(): unsupported image format ImageFormat::RG\n"); } void TgaImageConverterTest::wrongType() { - Image2D image(ImageFormat::Red, ImageType::Float, {}, nullptr); + ImageReference2D image(ImageFormat::Red, ImageType::Float, {}, nullptr); std::ostringstream out; Error::setOutput(&out); - const auto data = TgaImageConverter().exportToData(&image); + const auto data = TgaImageConverter().exportToData(image); CORRADE_VERIFY(!data); CORRADE_COMPARE(out.str(), "Trade::TgaImageConverter::TgaImageConverter::convertToData(): unsupported image type ImageType::Float\n"); } void TgaImageConverterTest::data() { - const auto data = TgaImageConverter().exportToData(&original); + const auto data = TgaImageConverter().exportToData(original); TgaImporter importer; CORRADE_VERIFY(importer.openData(data)); diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.cpp b/src/Plugins/TgaImageConverter/TgaImageConverter.cpp index a779acc39..ed236a02f 100644 --- a/src/Plugins/TgaImageConverter/TgaImageConverter.cpp +++ b/src/Plugins/TgaImageConverter/TgaImageConverter.cpp @@ -46,48 +46,48 @@ TgaImageConverter::TgaImageConverter(PluginManager::AbstractManager* manager, st auto TgaImageConverter::doFeatures() const -> Features { return Feature::ConvertData; } -Containers::Array TgaImageConverter::doExportToData(const Image2D* const image) const { +Containers::Array TgaImageConverter::doExportToData(const ImageReference2D& image) const { #ifndef MAGNUM_TARGET_GLES - if(image->format() != ImageFormat::BGR && - image->format() != ImageFormat::BGRA && - image->format() != ImageFormat::Red) + if(image.format() != ImageFormat::BGR && + image.format() != ImageFormat::BGRA && + image.format() != ImageFormat::Red) #else - if(image->format() != ImageFormat::RGB && - image->format() != ImageFormat::RGBA && - image->format() != ImageFormat::Red) + if(image.format() != ImageFormat::RGB && + image.format() != ImageFormat::RGBA && + image.format() != ImageFormat::Red) #endif { - Error() << "Trade::TgaImageConverter::TgaImageConverter::convertToData(): unsupported image format" << image->format(); + Error() << "Trade::TgaImageConverter::TgaImageConverter::convertToData(): unsupported image format" << image.format(); return nullptr; } - if(image->type() != ImageType::UnsignedByte) { - Error() << "Trade::TgaImageConverter::TgaImageConverter::convertToData(): unsupported image type" << image->type(); + if(image.type() != ImageType::UnsignedByte) { + Error() << "Trade::TgaImageConverter::TgaImageConverter::convertToData(): unsupported image type" << image.type(); return nullptr; } /* Initialize data buffer */ - const UnsignedByte pixelSize = image->pixelSize(); - auto data = Containers::Array::zeroInitialized(sizeof(TgaHeader) + pixelSize*image->size().product()); + const UnsignedByte pixelSize = image.pixelSize(); + auto data = Containers::Array::zeroInitialized(sizeof(TgaHeader) + pixelSize*image.size().product()); /* Fill header */ auto header = reinterpret_cast(data.begin()); - header->imageType = image->format() == ImageFormat::Red ? 3 : 2; + header->imageType = image.format() == ImageFormat::Red ? 3 : 2; header->bpp = pixelSize*8; - header->width = Utility::Endianness::littleEndian(image->size().x()); - header->height = Utility::Endianness::littleEndian(image->size().y()); + header->width = Utility::Endianness::littleEndian(image.size().x()); + header->height = Utility::Endianness::littleEndian(image.size().y()); /* Fill data */ - std::copy(image->data(), image->data()+pixelSize*image->size().product(), data.begin()+sizeof(TgaHeader)); + std::copy(image.data(), image.data()+pixelSize*image.size().product(), data.begin()+sizeof(TgaHeader)); #ifdef MAGNUM_TARGET_GLES if(image->format() == ImageFormat::RGB) { auto pixels = reinterpret_cast*>(data.begin()+sizeof(TgaHeader)); - std::transform(pixels, pixels + image->size().product(), pixels, + std::transform(pixels, pixels + image.size().product(), pixels, [](Math::Vector3 pixel) { return swizzle<'b', 'g', 'r'>(pixel); }); - } else if(image->format() == ImageFormat::RGBA) { + } else if(image.format() == ImageFormat::RGBA) { auto pixels = reinterpret_cast*>(data.begin()+sizeof(TgaHeader)); - std::transform(pixels, pixels + image->size().product(), pixels, + std::transform(pixels, pixels + image.size().product(), pixels, [](Math::Vector4 pixel) { return swizzle<'b', 'g', 'r', 'a'>(pixel); }); } #endif diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.h b/src/Plugins/TgaImageConverter/TgaImageConverter.h index 472bfaa4a..07c983b01 100644 --- a/src/Plugins/TgaImageConverter/TgaImageConverter.h +++ b/src/Plugins/TgaImageConverter/TgaImageConverter.h @@ -58,7 +58,7 @@ class MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT TgaImageConverter: public AbstractIm private: Features MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL doFeatures() const override; - Containers::Array MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL doExportToData(const Image2D* const image) const override; + Containers::Array MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL doExportToData(const ImageReference2D& image) const override; }; }} diff --git a/src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp b/src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp index eed43e072..fe5767e82 100644 --- a/src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp +++ b/src/Plugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp @@ -25,4 +25,4 @@ #include "TgaImageConverter/TgaImageConverter.h" CORRADE_PLUGIN_REGISTER(TgaImageConverter, Magnum::Trade::TgaImageConverter, - "cz.mosra.magnum.Trade.AbstractImageConverter/0.2") + "cz.mosra.magnum.Trade.AbstractImageConverter/0.2.1")