From ad14d9cdd7a65ef44decde1ada4bb76741ba4a29 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 2 Aug 2021 17:55:27 -0700 Subject: [PATCH] AtomFont Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../AtomFont/Code/Include/AtomLyIntegration/AtomFont/FBitmap.h | 2 +- .../AtomFont/Code/Platform/Common/FontTexture_Common.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FBitmap.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FBitmap.h index 0e97440538..6443633245 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FBitmap.h +++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FBitmap.h @@ -26,7 +26,7 @@ namespace AZ int Create(int width, int height); int Release(); - int SaveBitmap(const string& fileName); + int SaveBitmap(const AZStd::string& fileName); int Get32Bpp(unsigned int** buffer) { (*buffer) = new unsigned int[m_width * m_height]; diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp index 02cbb5a7a4..e3be52965c 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp @@ -11,7 +11,7 @@ #include //------------------------------------------------------------------------------------------------- -int AZ::FontTexture::WriteToFile([[maybe_unused]] const string& fileName) +int AZ::FontTexture::WriteToFile([[maybe_unused]] const AZStd::string& fileName) { return 1; }