feat: remove unused class ImageUtil (#18206)

Signed-off-by: Michael Pollind <[email protected]>

Code/Editor/IEditor.h

@@ -60,7 +60,6 @@ struct AABB;
 struct IErrorReport; // Vladimir@conffx
 struct IFileUtil;  // Vladimir@conffx
 struct IEditorLog;  // Vladimir@conffx
-struct IImageUtil;  // Vladimir@conffx
 struct IEditorParticleUtils;  // Leroy@conffx
 struct ILogFile; // Vladimir@conffx
 
@@ -596,7 +595,6 @@ struct IEditor
 
 
     virtual SSystemGlobalEnvironment* GetEnv() = 0;
-    virtual IImageUtil* GetImageUtil() = 0;  // Vladimir@conffx
     virtual SEditorSettings* GetEditorSettings() = 0;
 
     virtual ILogFile* GetLogFile() = 0;  // Vladimir@conffx

Code/Editor/IEditorImpl.cpp

@@ -55,7 +55,6 @@
 #include "MainStatusBar.h"
 
 #include "Util/FileUtil_impl.h"
-#include "Util/ImageUtil_impl.h"
 #include "LogFileImpl.h"
 
 #include "Editor/AssetDatabase/AssetDatabaseLocationListener.h"
@@ -109,7 +108,6 @@ CEditorImpl::CEditorImpl()
     , m_bInitialized(false)
     , m_bExiting(false)
     , m_QtApplication(static_cast<Editor::EditorQtApplication*>(qApp))
-    , m_pImageUtil(nullptr)
     , m_pLogFile(nullptr)
 {
     // note that this is a call into EditorCore.dll, which stores the g_pEditorPointer for all shared modules that share EditorCore.dll
@@ -135,7 +133,6 @@ CEditorImpl::CEditorImpl()
     m_pSequenceManager = new CTrackViewSequenceManager;
     m_pAnimationContext = new CAnimationContext;
 
-    m_pImageUtil = new CImageUtil_impl();
     m_selectedRegion.min = Vec3(0, 0, 0);
     m_selectedRegion.max = Vec3(0, 0, 0);
     DetectVersion();
@@ -280,7 +277,6 @@ CEditorImpl::~CEditorImpl()
     SAFE_DELETE(m_pErrorReport);
 
     SAFE_DELETE(m_pFileUtil); // Vladimir@Conffx
-    SAFE_DELETE(m_pImageUtil); // Vladimir@Conffx
     SAFE_DELETE(m_pLogFile); // Vladimir@Conffx
 }
 
@@ -1241,11 +1237,6 @@ SEditorSettings* CEditorImpl::GetEditorSettings()
     return &gSettings;
 }
 
-IImageUtil* CEditorImpl::GetImageUtil()
-{
-    return m_pImageUtil;
-}
-
 QMimeData* CEditorImpl::CreateQMimeData() const
 {
     return new QMimeData();

Code/Editor/IEditorImpl.h

@@ -242,7 +242,6 @@ public:
     void ShowStatusText(bool bEnable) override;
 
     SSystemGlobalEnvironment* GetEnv() override;
-    IImageUtil* GetImageUtil() override;  // Vladimir@conffx
     SEditorSettings* GetEditorSettings() override;
     ILogFile* GetLogFile() override { return m_pLogFile; }
 
@@ -318,7 +317,6 @@ protected:
     AzAssetBrowserRequestHandler* m_pAssetBrowserRequestHandler;
     AssetEditorRequestsHandler* m_assetEditorRequestsHandler;
 
-    IImageUtil* m_pImageUtil;  // Vladimir@conffx
     ILogFile* m_pLogFile;  // Vladimir@conffx
 
     AZStd::mutex m_pluginMutex; // protect any pointers that come from plugins, such as the source control cached pointer.

Code/Editor/Include/IImageUtil.h

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IIMAGEUTIL_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IIMAGEUTIL_H
-#pragma once
-
-#include "Util/Image.h"
-class CAlphaBitmap;
-
-struct IImageUtil
-{
-    virtual ~IImageUtil() = default;
-    
-    //! Load image, detect image type by file extension.
-    // Arguments:
-    //   pQualityLoss - 0 if info is not needed, pointer to the result otherwise - not need to preinitialize
-    virtual bool LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss = 0) = 0;
-
-    //! Save image, detect image type by file extension.
-    virtual bool SaveImage(const QString& fileName, CImageEx& image) = 0;
-
-    // General image fucntions
-    virtual bool LoadJPEG(const QString& strFileName, CImageEx& image) = 0;
-
-    virtual bool SaveJPEG(const QString& strFileName, CImageEx& image) = 0;
-
-    virtual bool SaveBitmap(const QString& szFileName, CImageEx& image) = 0;
-
-    virtual bool LoadBmp(const QString& file, CImageEx& image) = 0;
-
-    virtual bool SavePGM(const QString& fileName, const CImageEx& image) = 0;
-
-    virtual bool LoadPGM(const QString& fileName, CImageEx& image) = 0;
-
-    //! Scale source image to fit size of target image.
-    virtual void ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage) = 0;
-
-    //! Scale source image to fit size of target image.
-    virtual void ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage) = 0;
-
-    //! Scale source image to fit twice side by side in target image.
-    virtual void ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage) = 0;
-
-    //! Scale source image twice down image with filering
-    enum _EAddrMode
-    {
-        WRAP, CLAMP
-    };
-    virtual void DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, _EAddrMode eAddressingMode = WRAP) = 0;
-
-    //! Smooth image.
-    virtual void SmoothImage(CByteImage& image, int numSteps) = 0;
-
-    //! behavior outside of the texture is not defined
-    //! \param iniX in fix point 24.8
-    //! \param iniY in fix point 24.8
-    //! \return 0..255
-    virtual unsigned char GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image) = 0;
-};
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IIMAGEUTIL_H

Code/Editor/Lib/Tests/IEditorMock.h

@@ -147,7 +147,6 @@ public:
     MOCK_METHOD0(ReloadTemplates, void());
     MOCK_METHOD1(ShowStatusText, void(bool ));
     MOCK_METHOD0(GetEnv, SSystemGlobalEnvironment* ());
-    MOCK_METHOD0(GetImageUtil, IImageUtil* ());
     MOCK_METHOD0(GetEditorSettings, SEditorSettings* ());
     MOCK_METHOD0(GetLogFile, ILogFile* ());
     MOCK_METHOD0(UnloadPlugins, void());

Code/Editor/Util/ImageUtil.cpp

@@ -1,526 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Image utilities implementation.
-
-
-#include "EditorDefs.h"
-
-#include "ImageUtil.h"
-
-// Editor
-#include "Util/ImageGif.h"
-#include "Util/ImageTIF.h"
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::Save(const QString& strFileName, CImageEx& inImage)
-{
-    QImage imgBitmap;
-
-    ImageToQImage(inImage, imgBitmap);
-
-    // Explicitly set the pixels per meter in our images to a consistent default.
-    // The normal default is 96 pixels per inch, or 3780 pixels per meter.
-    // However, the Windows scaling display setting can cause these numbers to vary
-    // on different machines, producing output files that have slightly different
-    // headers from machine to machine, which often isn't desirable.
-    const int defaultPixelsPerMeter = 3780;
-    imgBitmap.setDotsPerMeterX(defaultPixelsPerMeter);
-    imgBitmap.setDotsPerMeterY(defaultPixelsPerMeter);
-    
-    return imgBitmap.save(strFileName);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::SaveBitmap(const QString& szFileName, CImageEx& inImage)
-{
-    return Save(szFileName, inImage);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::SaveJPEG(const QString& strFileName, CImageEx& inImage)
-{
-    return Save(strFileName, inImage);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::Load(const QString& fileName, CImageEx& image)
-{
-    QImage imgBitmap(fileName);
-
-    if (imgBitmap.isNull())
-    {
-        CLogFile::FormatLine("Invalid file:  %s", fileName.toUtf8().data());
-        return false;
-    }
-
-    return QImageToImage(imgBitmap, image);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::LoadJPEG(const QString& strFileName, CImageEx& outImage)
-{
-    return CImageUtil::Load(strFileName, outImage);
-}
-
-//===========================================================================
-bool CImageUtil::LoadBmp(const QString& fileName, CImageEx& image)
-{
-    return CImageUtil::Load(fileName, image);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::SavePGM(const QString& fileName, const CImageEx& image)
-{
-    // There are two types of PGM ("Portable Grey Map") files - "raw" (binary) and "plain" (ASCII).  This function supports the "plain PGM"  format.
-    // See http://netpbm.sourceforge.net/doc/pgm.html or https://en.wikipedia.org/wiki/Netpbm_format for the definition.
-
-    uint32 width = image.GetWidth();
-    uint32 height = image.GetHeight();
-    uint32* pixels = image.GetData();
-
-    // Create the file header.
-    AZStd::string fileHeader = AZStd::string::format(
-        // P2 = PGM header for ASCII output.  (P5 is PGM header for binary output)
-        "P2\n"
-        // width and height of the image
-        "%d %d\n"
-        // The maximum grey value in the file.  (i.e. the max value for any given pixel below)
-        "65535\n"
-        , width, height);
-
-    FILE* file = nullptr;
-    azfopen(&file, fileName.toUtf8().data(), "wt");
-    if (!file)
-    {
-        return false;
-    }
-
-    // First print the file header
-    fprintf(file, "%s", fileHeader.c_str());
-
-    // Then print all the pixels.
-    for (uint32 y = 0; y < height; y++)
-    {
-        for (uint32 x = 0; x < width; x++)
-        {
-            fprintf(file, "%d ", pixels[x + (y * width)]);
-        }
-        fprintf(file, "\n");
-    }
-
-    fclose(file);
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::LoadPGM(const QString& fileName, CImageEx& image)
-{
-    FILE* file = nullptr;
-    azfopen(&file, fileName.toUtf8().data(), "rt");
-    if (!file)
-    {
-        return false;
-    }
-
-    const char seps[] = " \n\t\r";
-    char* token;
-
-
-    int32 width = 0;
-    int32 height = 0;
-    int32 numColors = 1;
-
-
-    fseek(file, 0, SEEK_END);
-    int fileSize = static_cast<int>(ftell(file));
-    fseek(file, 0, SEEK_SET);
-
-    char* str = new char[fileSize];
-
-    [[maybe_unused]] auto bytesRead = fread(str, fileSize, 1, file);
-
-    [[maybe_unused]] char* nextToken = nullptr;
-    token = azstrtok(str, 0, seps, &nextToken);
-
-    while (token != nullptr && token[0] == '#')
-    {
-        if (token != nullptr && token[0] == '#')
-        {
-            azstrtok(nullptr, 0, "\n", &nextToken);
-        }
-        token = azstrtok(nullptr, 0, seps, &nextToken);
-    }
-    if (azstricmp(token, "P2") != 0)
-    {
-        // Bad file. not supported pgm.
-        delete[]str;
-        fclose(file);
-        return false;
-    }
-
-    do
-    {
-        token = azstrtok(nullptr, 0, seps, &nextToken);
-        if (token != nullptr && token[0] == '#')
-        {
-            azstrtok(nullptr, 0, "\n", &nextToken);
-        }
-    } while (token != nullptr && token[0] == '#');
-    width = atoi(token);
-
-    do
-    {
-        token = azstrtok(nullptr, 0, seps, &nextToken);
-        if (token != nullptr && token[0] == '#')
-        {
-            azstrtok(nullptr, 0, "\n", &nextToken);
-        }
-    } while (token != nullptr && token[0] == '#');
-    height = atoi(token);
-
-    do
-    {
-        token = azstrtok(nullptr, 0, seps, &nextToken);
-        if (token != nullptr && token[0] == '#')
-        {
-            azstrtok(nullptr, 0, "\n", &nextToken);
-        }
-    } while (token != nullptr && token[0] == '#');
-    numColors = atoi(token);
-
-    image.Allocate(width, height);
-
-    uint32* p = image.GetData();
-    int size = width * height;
-    int i = 0;
-    while (token != nullptr && i < size)
-    {
-        do
-        {
-            token = azstrtok(nullptr, 0, seps, &nextToken);
-        } while (token != nullptr && token[0] == '#');
-        *p++ = atoi(token);
-        i++;
-    }
-
-    delete[]str;
-
-    fclose(file);
-
-    // If we have 16-bit greyscale values that we're storing into 32-bit pixels, denote it with an appropriate texture type.
-    if (numColors > 255)
-    {
-        image.SetFormat(eTF_R16G16);
-    }
-
-    return true;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss)
-{
-    char drive[_MAX_DRIVE];
-    char dir[_MAX_DIR];
-    char fname[_MAX_FNAME];
-    char ext[_MAX_EXT];
-
-    if (pQualityLoss)
-    {
-        *pQualityLoss = false;
-    }
-
-    _splitpath_s(fileName.toUtf8().data(), drive, dir, fname, ext);
-
-    // Only DDS has explicit sRGB flag - we'll assume by default all formats are stored in gamma space
-    image.SetSRGB(true);
-
-    if (azstricmp(ext, ".bmp") == 0)
-    {
-        return LoadBmp(fileName, image);
-    }
-    else if (azstricmp(ext, ".tif") == 0)
-    {
-        return CImageTIF().Load(fileName, image);
-    }
-    else if (azstricmp(ext, ".jpg") == 0)
-    {
-        if (pQualityLoss)
-        {
-            *pQualityLoss = true;     // we assume JPG has quality loss
-        }
-        return LoadJPEG(fileName, image);
-    }
-    else if (azstricmp(ext, ".gif") == 0)
-    {
-        return CImageGif().Load(fileName, image);
-    }
-    else if (azstricmp(ext, ".pgm") == 0)
-    {
-        return LoadPGM(fileName, image);
-    }
-    else if (azstricmp(ext, ".png") == 0)
-    {
-        return CImageUtil::Load(fileName, image);
-    }
-    else
-    {
-        return CImageUtil::Load(fileName, image);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CImageUtil::SaveImage(const QString& fileName, CImageEx& image)
-{
-    char drive[_MAX_DRIVE];
-    char dir[_MAX_DIR];
-    char fname[_MAX_FNAME];
-    char ext[_MAX_EXT];
-
-    // Remove the read-only attribute so the file can be overwritten.
-    QFile(fileName).setPermissions(QFile::ReadUser | QFile::WriteUser);
-
-    _splitpath_s(fileName.toUtf8().data(), drive, dir, fname, ext);
-    if (azstricmp(ext, ".bmp") == 0)
-    {
-        return SaveBitmap(fileName, image);
-    }
-    else if (azstricmp(ext, ".jpg") == 0)
-    {
-        return SaveJPEG(fileName, image);
-    }
-    else if (azstricmp(ext, ".pgm") == 0)
-    {
-        return SavePGM(fileName, image);
-    }
-    else
-    {
-        return Save(fileName, image);
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageUtil::ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage)
-{
-    trgImage.ScaleToFit(srcImage);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageUtil::DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, IImageUtil::_EAddrMode eAddressingMode)
-{
-    uint32* pSrcData = srcImage.GetData();
-    int nSrcWidth = srcImage.GetWidth();
-    int nSrcHeight = srcImage.GetHeight();
-    int nTrgWidth = srcImage.GetWidth() >> 1;
-    int nTrgHeight = srcImage.GetHeight() >> 1;
-
-    // reallocate target
-    trgImage.Release();
-    trgImage.Allocate(nTrgWidth, nTrgHeight);
-    uint32* pDstData = trgImage.GetData();
-
-    // values in this filter are the log2 of the actual multiplicative values .. see DXCFILTER_BLUR3X3 for the used 3x3 filter
-    static int filter[3][3] =
-    {
-        {0, 1, 0},
-        {1, 2, 1},
-        {0, 1, 0}
-    };
-
-    for (int i = 0; i < nTrgHeight; i++)
-    {
-        for (int j = 0; j < nTrgWidth; j++)
-        {
-            // filter3x3
-            int x = j << 1;
-            int y = i << 1;
-
-            int r, g, b, a;
-            r = b = g = a = 0;
-            uint32 col;
-
-            if (eAddressingMode == IImageUtil::WRAP) // TODO: this condition could be compile-time static by making it a template arg
-            {
-                for (int ii = 0; ii < 3; ii++)
-                {
-                    for (int jj = 0; jj < 3; jj++)
-                    {
-                        col = pSrcData[((y + nSrcHeight + ii - 1) % nSrcHeight) * nSrcWidth + ((x + nSrcWidth + jj - 1) % nSrcWidth)];
-
-                        r += (col        & 0xff) << filter[ii][jj];
-                        g += ((col >> 8)  & 0xff) << filter[ii][jj];
-                        b += ((col >> 16) & 0xff) << filter[ii][jj];
-                        a += ((col >> 24) & 0xff) << filter[ii][jj];
-                    }
-                }
-            }
-            else
-            {
-                assert(eAddressingMode == IImageUtil::CLAMP);
-                for (int ii = 0; ii < 3; ii++)
-                {
-                    for (int jj = 0; jj < 3; jj++)
-                    {
-                        int x1 = clamp_tpl<int>((x + jj), 0, nSrcWidth - 1);
-                        int y1 = clamp_tpl<int>((y + ii), 0, nSrcHeight - 1);
-                        col = pSrcData[ y1 * nSrcWidth + x1];
-
-                        r += (col        & 0xff) << filter[ii][jj];
-                        g += ((col >> 8)  & 0xff) << filter[ii][jj];
-                        b += ((col >> 16) & 0xff) << filter[ii][jj];
-                        a += ((col >> 24) & 0xff) << filter[ii][jj];
-                    }
-                }
-            }
-
-            // the sum of the multiplicative values here is 16 so we shift by 4 bits
-            r >>= 4;
-            g >>= 4;
-            b >>= 4;
-            a >>= 4;
-
-            uint32 res = r + (g << 8) + (b << 16) + (a << 24);
-
-            *pDstData++ = res;
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageUtil::ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage)
-{
-    trgImage.ScaleToFit(srcImage);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageUtil::ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage)
-{
-    uint32 x, y, u, v;
-    unsigned int* destRow, * dest, * src, * sourceRow;
-
-    uint32 srcW = srcImage.GetWidth();
-    uint32 srcH = srcImage.GetHeight();
-
-    uint32 trgHalfW = trgImage.GetWidth() / 2;
-    uint32 trgH = trgImage.GetHeight();
-
-    uint32 xratio = trgHalfW > 0 ? (srcW << 16) / trgHalfW : 1;
-    uint32 yratio = trgH > 0 ? (srcH << 16) / trgH : 1;
-
-    src = srcImage.GetData();
-    destRow = trgImage.GetData();
-
-    v = 0;
-    for (y = 0; y < trgH; y++)
-    {
-        u = 0;
-        sourceRow = src + (v >> 16) * srcW;
-        dest = destRow;
-        for (x = 0; x < trgHalfW; x++)
-        {
-            *(dest + trgHalfW) = sourceRow[u >> 16];
-            *dest++ = sourceRow[u >> 16];
-            u += xratio;
-        }
-        v += yratio;
-        destRow += trgHalfW * 2;
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CImageUtil::SmoothImage(CByteImage& image, int numSteps)
-{
-    assert(numSteps > 0);
-    uint8* buf = image.GetData();
-    int w = image.GetWidth();
-    int h = image.GetHeight();
-
-    for (int steps = 0; steps < numSteps; steps++)
-    {
-        // Smooth the image.
-        for (int y = 1; y < h - 1; y++)
-        {
-            // Precalculate for better speed
-            uint8* ptr = &buf[y * w + 1];
-
-            for (int x = 1; x < w - 1; x++)
-            {
-                // Smooth it out
-                *ptr =
-                    (
-                        (uint32)ptr[1] +
-                        ptr[w] +
-                        ptr[-1] +
-                        ptr[-w] +
-                        ptr[w + 1] +
-                        ptr[w - 1] +
-                        ptr[-w + 1] +
-                        ptr[-w - 1]
-                    ) >> 3;
-
-                // Next pixel
-                ptr++;
-            }
-        }
-    }
-}
-
-unsigned char CImageUtil::GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image)
-{
-    //  assert(image.IsValid());        if(!image.IsValid())return(0);      // this shouldn't be
-
-    DWORD x = (DWORD)(iniX256) >> 8;
-    DWORD y = (DWORD)(iniY256) >> 8;
-
-    if (x >= static_cast<DWORD>(image.GetWidth() - 1) || y >= static_cast<DWORD>(image.GetHeight() - 1))
-    {
-        return image.ValueAt(x, y);                                                          // border is not filtered, 255 to get in range 0..1
-    }
-    DWORD rx = (DWORD)(iniX256) & 0xff;       // fractional aprt
-    DWORD ry = (DWORD)(iniY256) & 0xff;       // fractional aprt
-
-    DWORD top = (DWORD)image.ValueAt((int)x, (int)y) * (256 - rx)                      // left top
-        + (DWORD)image.ValueAt((int)x + 1, (int)y) * rx;                                            // right top
-
-    DWORD bottom = (DWORD)image.ValueAt((int)x, (int)y + 1) * (256 - rx)              // left bottom
-        + (DWORD)image.ValueAt((int)x + 1, (int)y + 1) * rx;                                        // right bottom
-
-    return (unsigned char)((top * (256 - ry) + bottom * ry) >> 16);
-}
-
-bool CImageUtil::QImageToImage(const QImage& bitmap, CImageEx& image)
-{
-
-    QImage convertedBitmap;
-    const QImage *srcBitmap = &bitmap;
-    
-    if (bitmap.format() != QImage::Format_RGBA8888)
-    {
-        convertedBitmap = bitmap.convertToFormat(QImage::Format_RGBA8888);
-        srcBitmap = &convertedBitmap;
-    }
-
-    if (image.Allocate(srcBitmap->width(), srcBitmap->height()) == false)
-    {
-        return false;
-    }
-
-    AZStd::copy(srcBitmap->bits(), srcBitmap->bits() + (srcBitmap->width() * srcBitmap->height() * sizeof(uint32)), reinterpret_cast<uint8*>(image.GetData()));
-
-    return true;
-}
-
-bool CImageUtil::ImageToQImage(const CImageEx& image, QImage& bitmapObj)
-{
-    bitmapObj = QImage(image.GetWidth(), image.GetHeight(), QImage::Format_RGBA8888);
-    AZStd::copy(image.GetData(), image.GetData() + image.GetWidth() * image.GetHeight(), reinterpret_cast<uint32*>(bitmapObj.bits()));
-
-    return true;
-}

Code/Editor/Util/ImageUtil.h

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Image utilities.
-
-
-#pragma once
-
-#include <Include/IImageUtil.h>
-
-/*!
- *  Utility Class to manipulate images.
- */
-class SANDBOX_API CImageUtil
-{
-public:
-    //////////////////////////////////////////////////////////////////////////
-    // Image loading.
-    //////////////////////////////////////////////////////////////////////////
-    //! Load image, detect image type by file extension.
-    // Arguments:
-    //   pQualityLoss - 0 if info is not needed, pointer to the result otherwise - not need to preinitialize
-    static bool LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss = 0);
-    //! Save image, detect image type by file extension.
-    static bool SaveImage(const QString& fileName, CImageEx& image);
-
-    // General image fucntions
-    static bool LoadJPEG(const QString& strFileName, CImageEx& image);
-    static bool SaveJPEG(const QString& strFileName, CImageEx& image);
-
-    static bool SaveBitmap(const QString& szFileName, CImageEx& image);
-    static bool LoadBmp(const QString& file, CImageEx& image);
-
-    //! Save image in PGM format.
-    static bool SavePGM(const QString& fileName, const CImageEx& image);
-    //! Load image in PGM format.
-    static bool LoadPGM(const QString& fileName, CImageEx& image);
-
-    //////////////////////////////////////////////////////////////////////////
-    // Image scaling.
-    //////////////////////////////////////////////////////////////////////////
-    //! Scale source image to fit size of target image.
-    static void ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage);
-    //! Scale source image to fit size of target image.
-    static void ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage);
-    //! Scale source image to fit twice side by side in target image.
-    static void ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage);
-    //! Scale source image twice down image with filering
-
-    static void DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, IImageUtil::_EAddrMode eAddressingMode = IImageUtil::WRAP);
-
-    //! Smooth image.
-    static void SmoothImage(CByteImage& image, int numSteps);
-
-    //////////////////////////////////////////////////////////////////////////
-    // filtered lookup
-    //////////////////////////////////////////////////////////////////////////
-
-    //! behaviour outside of the texture is not defined
-    //! \param iniX in fix point 24.8
-    //! \param iniY in fix point 24.8
-    //! \return 0..255
-    static unsigned char GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image);
-
-    static bool QImageToImage(const QImage& bitmap, CImageEx& image);
-    static bool ImageToQImage(const CImageEx& image, QImage& bitmapObj);
-
-private:
-    static bool Load(const QString& fileName, CImageEx& image);
-    static bool Save(const QString& strFileName, CImageEx& inImage);
-};
-

Code/Editor/Util/ImageUtil_impl.cpp

@@ -1,83 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "ImageUtil_impl.h"
-
-// Editor
-#include "Util/ImageUtil.h"
-
-bool CImageUtil_impl::LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss)
-{
-    return CImageUtil::LoadImage(fileName, image, pQualityLoss);
-}
-
-bool CImageUtil_impl::SaveImage(const QString& fileName, CImageEx& image)
-{
-    return CImageUtil::SaveImage(fileName, image);
-}
-
-bool CImageUtil_impl::LoadJPEG(const QString& strFileName, CImageEx& image)
-{
-    return CImageUtil::LoadJPEG(strFileName, image);
-}
-
-bool CImageUtil_impl::SaveJPEG(const QString& strFileName, CImageEx& image)
-{
-    return CImageUtil::SaveJPEG(strFileName, image);
-}
-
-bool CImageUtil_impl::SaveBitmap(const QString& szFileName, CImageEx& image)
-{
-    return CImageUtil::SaveBitmap(szFileName, image);
-}
-
-bool CImageUtil_impl::LoadBmp(const QString& file, CImageEx& image)
-{
-    return CImageUtil::LoadBmp(file, image);
-}
-
-bool CImageUtil_impl::SavePGM(const QString& fileName, const CImageEx& image)
-{
-    return CImageUtil::SavePGM(fileName, image);
-}
-
-bool CImageUtil_impl::LoadPGM(const QString& fileName, CImageEx& image)
-{
-    return CImageUtil::LoadPGM(fileName, image);
-}
-
-void CImageUtil_impl::ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage)
-{
-    CImageUtil::ScaleToFit(srcImage, trgImage);
-}
-
-void CImageUtil_impl::ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage)
-{
-    CImageUtil::ScaleToFit(srcImage, trgImage);
-}
-
-void CImageUtil_impl::ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage)
-{
-    CImageUtil::ScaleToDoubleFit(srcImage, trgImage);
-}
-
-void CImageUtil_impl::DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage, IImageUtil::_EAddrMode eAddressingMode)
-{
-    CImageUtil::DownScaleSquareTextureTwice(srcImage, trgImage, eAddressingMode);
-}
-
-void CImageUtil_impl::SmoothImage(CByteImage& image, int numSteps)
-{
-    CImageUtil::SmoothImage(image, numSteps);
-}
-
-unsigned char CImageUtil_impl::GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image)
-{
-    return CImageUtil::GetBilinearFilteredAt(iniX256, iniY256, image);
-}

Code/Editor/Util/ImageUtil_impl.h

@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef CRYINCLUDE_EDITOR_UTILIMAGEUTIL_IMPL_H
-#define CRYINCLUDE_EDITOR_UTILIMAGEUTIL_IMPL_H
-#pragma once
-
-#include "Include/IImageUtil.h"
-
-class CImageUtil_impl
-    : public IImageUtil
-{
-public:
-    CImageUtil_impl(){}
-    ~CImageUtil_impl(){}
-
-    //! Load image, detect image type by file extension.
-    // Arguments:
-    //   pQualityLoss - 0 if info is not needed, pointer to the result otherwise - not need to preinitialize
-    virtual bool LoadImage(const QString& fileName, CImageEx& image, bool* pQualityLoss = 0) override;
-
-    //! Save image, detect image type by file extension.
-    virtual bool SaveImage(const QString& fileName, CImageEx& image) override;
-
-    // General image fucntions
-    virtual bool LoadJPEG(const QString& strFileName, CImageEx& image) override;
-
-    virtual bool SaveJPEG(const QString& strFileName, CImageEx& image) override;
-
-    virtual bool SaveBitmap(const QString& szFileName, CImageEx& image) override;
-
-    virtual bool LoadBmp(const QString& file, CImageEx& image) override;
-
-    virtual bool SavePGM(const QString& fileName, const CImageEx& image) override;
-
-    virtual bool LoadPGM(const QString& fileName, CImageEx& image) override;
-
-    //! Scale source image to fit size of target image.
-    virtual void ScaleToFit(const CByteImage& srcImage, CByteImage& trgImage) override;
-
-    //! Scale source image to fit size of target image.
-    virtual void ScaleToFit(const CImageEx& srcImage, CImageEx& trgImage) override;
-
-    //! Scale source image to fit twice side by side in target image.
-    virtual void ScaleToDoubleFit(const CImageEx& srcImage, CImageEx& trgImage) override;
-
-    //! Scale source image twice down image with filtering
-    enum _EAddrMode
-    {
-        WRAP, CLAMP
-    };
-    virtual void DownScaleSquareTextureTwice(const CImageEx& srcImage, CImageEx& trgImage,
-        IImageUtil::_EAddrMode eAddressingMode = IImageUtil::WRAP) override;
-
-    //! Smooth image.
-    virtual void SmoothImage(CByteImage& image, int numSteps) override;
-
-    //! behavior outside of the texture is not defined
-    //! \param iniX in fix point 24.8
-    //! \param iniY in fix point 24.8
-    //! \return 0..255
-    virtual unsigned char GetBilinearFilteredAt(const int iniX256, const int iniY256, const CByteImage& image) override;
-};
-#endif // CRYINCLUDE_EDITOR_UTILIMAGEUTIL_IMPL_H

Code/Editor/editor_core_files.cmake

@@ -12,7 +12,6 @@ set(FILES
     Include/IErrorReport.h
     Include/IFileUtil.h
     Include/EditorCoreAPI.h
-    Include/IImageUtil.h
     Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.qrc
     Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
     Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h

Code/Editor/editor_lib_files.cmake

@@ -561,8 +561,6 @@ set(FILES
     WaitProgress.h
     Util/FileUtil_impl.h
     Util/FileUtil_impl.cpp
-    Util/ImageUtil_impl.h
-    Util/ImageUtil_impl.cpp
     Util/ColumnSortProxyModel.h
     Util/ColumnSortProxyModel.cpp
     Util/AbstractGroupProxyModel.h
@@ -583,8 +581,6 @@ set(FILES
     Util/3DConnexionDriver.h
     Util/FileChangeMonitor.cpp
     Util/FileChangeMonitor.h
-    Util/ImageUtil.cpp
-    Util/ImageUtil.h
     Util/ImageGif.cpp
     Util/ImageGif.h
     Util/ImageTIF.cpp