add debug logging as well as fixing further warnings

EmilDohne · Jul 7, 2024 · f9687ae · f9687ae
1 parent 765311e
commit f9687ae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/PhotoshopAPI/src/LayeredFile/Util/GenerateLayerMaskInfo.cpp b/PhotoshopAPI/src/LayeredFile/Util/GenerateLayerMaskInfo.cpp
@@ -20,6 +20,7 @@ template <typename T>
 LayerAndMaskInformation generateLayerMaskInfo(LayeredFile<T>& layeredFile, const FileHeader& header)
 {
 	PSAPI_LOG_ERROR("LayeredFile", "Cannot construct layer and mask information section if type is not uint8_t, uint16_t or float32_t");
+	return LayerAndMaskInformation();
 }
 
 // ---------------------------------------------------------------------------------------------------------------------

diff --git a/PhotoshopTest/src/TestMacros.h b/PhotoshopTest/src/TestMacros.h
@@ -21,4 +21,4 @@
 		if (x[i] != y[i]) { \
 			CHECK_MESSAGE(x[i] == y[i], "Failed vector index: ", i); return;\
 		} \
-    }
+    }
diff --git a/PhotoshopTest/src/TestPredictionEncode/TestPredictionEncodeRoundtrip.cpp b/PhotoshopTest/src/TestPredictionEncode/TestPredictionEncodeRoundtrip.cpp
@@ -1,6 +1,7 @@
 #include "doctest.h"
 
 #include "Macros.h"
+#include "../TestMacros.h"
 #include "Core/Compression/Compress_ZIP.h"
 #include "Core/Compression/Decompress_ZIP.h"
 
@@ -93,9 +94,16 @@ TEST_CASE("Prediction Roundtrip Flat Channel 32-bit")
 	std::vector<float32_t> dataExpected = channel;
 
 	NAMESPACE_PSAPI::ZIP_Impl::PredictionEncode(channel, buffer, width, height);
+	for (int y = 0; y < height; ++y)
+	{
+		for (int x = 0; x < width; ++x)
+		{
+			std::cout << "Y: " << y << "X:" << x << channel[y * width + x] << std::endl;
+		}
+	}
 	NAMESPACE_PSAPI::ZIP_Impl::RemovePredictionEncoding<float32_t>(channel, width, height);
 
-	CHECK(channel == dataExpected);
+	CHECK_VEC_VERBOSE(channel, dataExpected);
 }
 
 
@@ -113,5 +121,5 @@ TEST_CASE("Prediction Roundtrip Large Channel 32-bit")
 	NAMESPACE_PSAPI::ZIP_Impl::PredictionEncode(channel, buffer, width, height);
 	NAMESPACE_PSAPI::ZIP_Impl::RemovePredictionEncoding<float32_t>(channel, width, height);
 
-	CHECK(channel == dataExpected);
+	CHECK_VEC_VERBOSE(channel, dataExpected);
 }