Skip to content

Made the failure to change the desired bitmap origin (which is a hint… #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Unarmed1000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Made the failure to change the desired bitmap origin (which is a hint… #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...amework/FslDemoHost/Base/source/FslDemoHost/Base/Service/ImageBasic/ImageBasicService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <FslGraphics/Exceptions.hpp>
#include <FslGraphics/IO/BMPUtil.hpp>
#include <FslGraphics/ImageFormatUtil.hpp>
#include <FslGraphics/Log/Bitmap/FmtBitmapOrigin.hpp>
#include <FslGraphics/PixelFormatUtil.hpp>
#include <FslGraphics/Texture/Texture.hpp>
#include <FslGraphics/Texture/TextureBlobBuilder.hpp>
Expand Down Expand Up @@ -234,16 +235,18 @@ namespace Fsl
}

const bool isCompressed = PixelFormatUtil::IsCompressed(rTexture.GetPixelFormat());
auto resolvedOrigin = desiredOrigin;
if (isCompressed && desiredOrigin != BitmapOrigin::Undefined && rTexture.GetBitmapOrigin() != desiredOrigin)
{
throw NotSupportedException("The origin of compressed formats can not be modified");
resolvedOrigin = rTexture.GetBitmapOrigin();
FSLLOG3_WARNING("The origin of compressed formats can not be modified (desired: {}) using {}", desiredOrigin, resolvedOrigin);
}

const auto usedDesiredPixelFormat = (desiredPixelFormat != PixelFormat::Undefined ? desiredPixelFormat : rTexture.GetPixelFormat());

if (rTexture.GetPixelFormat() != usedDesiredPixelFormat || rTexture.GetBitmapOrigin() != desiredOrigin)
if (rTexture.GetPixelFormat() != usedDesiredPixelFormat || rTexture.GetBitmapOrigin() != resolvedOrigin)
{
m_bitmapConverter->Convert(rTexture, usedDesiredPixelFormat, desiredOrigin);
m_bitmapConverter->Convert(rTexture, usedDesiredPixelFormat, resolvedOrigin);
}

// When loading a undefined pixel format we prefer the unorm variant
Expand Down