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

Integrating github/staging through commit b0dd7ed

Browse Source
This commit is contained in:
alexpete
2021-04-09 12:03:26 -07:00
parent 1044dc3da1
commit c5b955d281
180 changed files with 6416 additions and 1850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h
+2 -2
View File
@@ -105,7 +105,7 @@ namespace ImageProcessingAtom
{
}
explicit ColorRGBA16(uint64 a_u)
explicit ColorRGBA16(AZ::u64 a_u)
: u(a_u)
{
}
@@ -152,7 +152,7 @@ namespace ImageProcessingAtom
uint16 b;
uint16 a;
};
uint64 u;
AZ::u64 u;
};
};
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp
+2 -2
View File
@@ -224,7 +224,7 @@ namespace ImageProcessingAtom
srcImage->GetImagePointer(mip, srcMem, srcPitch);
const pvrtexture::CPVRTextureHeader srcHeader(
srcPixelType.PixelTypeID, // uint64 u64PixelFormat,
srcPixelType.PixelTypeID, // AZ::u64 u64PixelFormat,
width, // uint32 u32Height=1,
height, // uint32 u32Width=1,
1, // uint32 u32Depth=1,
@@ -315,7 +315,7 @@ namespace ImageProcessingAtom
// Preparing source compressed data
const pvrtexture::CPVRTextureHeader compressedHeader(
FindPvrPixelFormat(fmtSrc), // uint64 u64PixelFormat,
FindPvrPixelFormat(fmtSrc), // AZ::u64 u64PixelFormat,
width, // uint32 u32Height=1,
height, // uint32 u32Width=1,
1, // uint32 u32Depth=1,
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderBaseType.h
-4
View File
@@ -25,9 +25,5 @@ typedef AZ::s32 int32;
typedef AZ::s32 sint32;
typedef AZ::u32 uint32;
typedef AZ::s64 int64;
typedef AZ::s64 sint64;
typedef AZ::u64 uint64;
typedef float f32;
typedef double f64;
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <QString>
#include <libtiff/tiffio.h> // TIFF library
#include <tiffio.h> // TIFF library
namespace ImageProcessingAtom
{