Integrating up through commit 90f050496

Gems/Atom/Asset/ImageProcessingAtom/Code/CMakeLists.txt

@@ -69,7 +69,6 @@ ly_add_target(
             3rdParty::PVRTexTool
             3rdParty::squish-ccr
             3rdParty::tiff
-            3rdParty::ispctexcomp
             3rdParty::ilmbase
             Legacy::CryCommon
             AZ::AzFramework

Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Windows/platform_windows.cmake

@@ -8,3 +8,12 @@
 # remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
+
+# windows requires the 3rd Party ISPCTexComp library.
+
+ly_associate_package(PACKAGE_NAME ISPCTexComp-2021.3-rev1-windows    TARGETS ISPCTexComp     PACKAGE_HASH 324fb051a549bc96571530e63c01e18a4c860db45317734d86276fe27a45f6dd)
+
+set(LY_BUILD_DEPENDENCIES
+        PUBLIC
+            3rdParty::ISPCTexComp
+    )

Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp

@@ -784,7 +784,7 @@ namespace UnitTest
     {
         //source image
         AZStd::string inputFile;
-        inputFile = "../SamplesProject/Objects/ParticleAssets/ShowRoom/showroom_pipe_blue_001_ddna.tif";
+        inputFile = "../AutomatedTesting/Objects/ParticleAssets/ShowRoom/showroom_pipe_blue_001_ddna.tif";
 
         IImageObjectPtr srcImage(LoadImageFromFile(inputFile));
         ImageToProcess imageToProcess(srcImage);
@@ -1006,7 +1006,7 @@ namespace UnitTest
     TEST_F(ImageProcessingTest, DISABLED_TestLoadDdsImage)
     {
         IImageObjectPtr originImage, alphaImage;
-        AZStd::string inputFolder = "../SamplesProject/Cache/pc/engineassets/texturemsg/";
+        AZStd::string inputFolder = "../AutomatedTesting/Cache/pc/engineassets/texturemsg/";
         AZStd::string inputFile;
 
         inputFile = "E:/Javelin_NWLYDev/dev/Cache/Assets/pc/assets/textures/blend_maps/moss/jav_moss_ddn.dds";