birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
This commit is contained in:
Esteban Papp
2021-08-06 10:08:37 -07:00
parent 03cf71b12d 9e0b8c564d
commit 6db7488939
252 changed files with 2886 additions and 1079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Util/ImageTIF.cpp
+6 -6
View File
@@ -142,7 +142,7 @@ bool CImageTIF::Load(const QString& fileName, CImageEx& outImage)
uint32 dwWidth, dwHeight;
size_t npixels;
uint32* raster;
char* dccfilename = NULL;
char* dccfilename = nullptr;
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &dwWidth);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &dwHeight);
@@ -232,7 +232,7 @@ bool CImageTIF::Load(const QString& fileName, CFloatImage& outImage)
{
uint32 width = 0, height = 0;
uint16 spp = 0, bpp = 0, format = 0;
char* dccfilename = NULL;
char* dccfilename = nullptr;
TIFFGetField(tif, TIFFTAG_IMAGEDESCRIPTION, &dccfilename);
@@ -252,11 +252,11 @@ bool CImageTIF::Load(const QString& fileName, CFloatImage& outImage)
// Check to see if it's a GeoTIFF, and if so, whether or not it has the ZScale parameter.
uint32 tagCount = 0;
double *pixelScales = NULL;
double *pixelScales = nullptr;
if (TIFFGetField(tif, GEOTIFF_MODELPIXELSCALE_TAG, &tagCount, &pixelScales) == 1)
{
// if there's an xyz scale, and the Z scale isn't 0, let's use it.
if ((tagCount == 3) && (pixelScales != NULL) && (pixelScales[2] != 0.0f))
if ((tagCount == 3) && (pixelScales != nullptr) && (pixelScales[2] != 0.0f))
{
pixelValueScale = static_cast<float>(pixelScales[2]);
}
@@ -455,7 +455,7 @@ const char* CImageTIF::GetPreset(const QString& fileName)
if (!file.Open(fileName.toUtf8().data(), "rb"))
{
CLogFile::FormatLine("File not found %s", fileName.toUtf8().data());
return NULL;
return nullptr;
}
MemImage memImage;
@@ -473,7 +473,7 @@ const char* CImageTIF::GetPreset(const QString& fileName)
libtiffDummyCloseProc, libtiffDummySizeProc, libtiffDummyMapFileProc, libtiffDummyUnmapFileProc);
AZStd::string strReturn;
char* preset = NULL;
char* preset = nullptr;
int size;
if (tif)
{