diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.cpp b/src/Plugins/TgaImageConverter/TgaImageConverter.cpp index 976263821..f5b6ddc08 100644 --- a/src/Plugins/TgaImageConverter/TgaImageConverter.cpp +++ b/src/Plugins/TgaImageConverter/TgaImageConverter.cpp @@ -33,7 +33,8 @@ #ifdef MAGNUM_TARGET_GLES #include -#include +#include "Math/Swizzle.h" +#include "Math/Vector4.h" #endif #include "TgaImporter/TgaHeader.h" @@ -84,11 +85,11 @@ Containers::Array TgaImageConverter::doExportToData(const ImageRe if(image.format() == ColorFormat::RGB) { auto pixels = reinterpret_cast*>(data.begin()+sizeof(TgaHeader)); std::transform(pixels, pixels + image.size().product(), pixels, - [](Math::Vector3 pixel) { return swizzle<'b', 'g', 'r'>(pixel); }); + [](Math::Vector3 pixel) { return Math::swizzle<'b', 'g', 'r'>(pixel); }); } else if(image.format() == ColorFormat::RGBA) { auto pixels = reinterpret_cast*>(data.begin()+sizeof(TgaHeader)); std::transform(pixels, pixels + image.size().product(), pixels, - [](Math::Vector4 pixel) { return swizzle<'b', 'g', 'r', 'a'>(pixel); }); + [](Math::Vector4 pixel) { return Math::swizzle<'b', 'g', 'r', 'a'>(pixel); }); } #endif diff --git a/src/Plugins/TgaImporter/TgaImporter.cpp b/src/Plugins/TgaImporter/TgaImporter.cpp index 5e6867c4e..731610160 100644 --- a/src/Plugins/TgaImporter/TgaImporter.cpp +++ b/src/Plugins/TgaImporter/TgaImporter.cpp @@ -33,9 +33,10 @@ #ifdef MAGNUM_TARGET_GLES #include +#include "Math/Swizzle.h" +#include "Math/Vector4.h" #include #include -#include #endif #include "TgaHeader.h" @@ -146,11 +147,11 @@ std::optional TgaImporter::doImage2D(UnsignedInt) { if(format == ColorFormat::RGB) { auto pixels = reinterpret_cast*>(data); std::transform(pixels, pixels + size.product(), pixels, - [](Math::Vector3 pixel) { return swizzle<'b', 'g', 'r'>(pixel); }); + [](Math::Vector3 pixel) { return Math::swizzle<'b', 'g', 'r'>(pixel); }); } else if(format == ColorFormat::RGBA) { auto pixels = reinterpret_cast*>(data); std::transform(pixels, pixels + size.product(), pixels, - [](Math::Vector4 pixel) { return swizzle<'b', 'g', 'r', 'a'>(pixel); }); + [](Math::Vector4 pixel) { return Math::swizzle<'b', 'g', 'r', 'a'>(pixel); }); } #endif