Integrating github/staging through commit b0dd7ed

Gems/ImageProcessing/Code/CMakeLists.txt

@@ -64,6 +64,7 @@ ly_add_target(
             3rdParty::etc2comp
             3rdParty::PVRTexTool
             3rdParty::squish-ccr
+            3rdParty::zlib
             3rdParty::tiff
             Legacy::CryCommon
             AZ::AzCore

Gems/ImageProcessing/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h

@@ -105,7 +105,7 @@ namespace ImageProcessing
         {
         }
 
-        explicit ColorRGBA16(uint64 a_u)
+        explicit ColorRGBA16(AZ::u64 a_u)
             : u(a_u)
         {
         }
@@ -152,7 +152,7 @@ namespace ImageProcessing
                 uint16 b;
                 uint16 a;
             };
-            uint64 u;
+            AZ::u64 u;
         };
     };
 

Gems/ImageProcessing/Code/Source/Compressors/PVRTC.cpp

@@ -219,7 +219,7 @@ namespace ImageProcessing
             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,
@@ -310,7 +310,7 @@ namespace ImageProcessing
 
             // 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/ImageProcessing/Code/Source/ImageBuilderBaseType.h

@@ -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/ImageProcessing/Code/Source/ImageLoader/TIFFLoader.cpp

@@ -22,7 +22,7 @@
 
 #include <QString>
 
-#include <libtiff/tiffio.h>  // TIFF library
+#include <tiffio.h>  // TIFF library
 
 namespace ImageProcessing
 {