Fix: fix issue with conversion to FP formats due to missing conversions.

Author: Trico-Everfire

VTFLib/VTFFile.cpp

@@ -22,8 +22,6 @@
 #define STB_IMAGE_IMPLEMENTATION
 #undef STBI_NO_FAILURE_STRINGS
 
-#include "Float16.h"
-#include "half.hpp"
 #include "stb_image.h"
 #include "stb_image_resize.h"
 
@@ -33,6 +31,8 @@ using namespace VTFLib;
 #undef min
 #undef max
 
+#include "half.hpp"
+
 // Class construction
 // ------------------
 CVTFFile::CVTFFile()
@@ -4358,6 +4358,45 @@ vlBool CVTFFile::Convert( vlByte *lpSource, vlByte *lpDest, vlUInt uiWidth, vlUI
 		return didConvert;
 	}
 
+	if ( DestFormat == IMAGE_FORMAT_RGBA16161616F )
+	{
+		if ( SourceFormat == IMAGE_FORMAT_RGBA32323232F || SourceFormat == IMAGE_FORMAT_RGB323232F )
+		{
+			vlBool hasAlpha = SourceFormat == IMAGE_FORMAT_RGBA32323232F;
+
+			float *lpSourceFP = reinterpret_cast<float *>( lpSource );
+			float *lpLastFP = reinterpret_cast<float *>( lpSource + CVTFFile::ComputeImageSize( uiWidth, uiHeight, 1, SourceFormat ) );
+			unsigned short *lpDestFP = reinterpret_cast<unsigned short *>( lpDest );
+
+			for ( ; lpSourceFP < lpLastFP; lpSourceFP += hasAlpha ? 4 : 3, lpDestFP += 4 )
+			{
+				float test = lpSourceFP[0];
+				float test2 = CVTFFile::FP32ToFP16( lpSourceFP[0] );
+
+				lpDestFP[0] = CVTFFile::FP32ToFP16( lpSourceFP[0] );
+				lpDestFP[1] = CVTFFile::FP32ToFP16( lpSourceFP[1] );
+				lpDestFP[2] = CVTFFile::FP32ToFP16( lpSourceFP[2] );
+				lpDestFP[3] = hasAlpha ? CVTFFile::FP32ToFP16( lpSourceFP[3] ) : CVTFFile::FP32ToFP16( 1.f );
+			}
+
+			return vlTrue;
+		}
+
+		auto lpIntermediateRGBA = new vlByte[CVTFFile::ComputeImageSize( uiWidth, uiHeight, 1, IMAGE_FORMAT_RGBA32323232F )];
+
+		if ( !LDR_TO_HDR( lpSource, lpIntermediateRGBA, uiWidth, uiHeight, SourceInfo, VTFImageConvertInfo[IMAGE_FORMAT_RGBA32323232F] ) )
+		{
+			delete[] lpIntermediateRGBA;
+			return vlFalse;
+		}
+
+		vlBool didConvert = Convert( lpIntermediateRGBA, lpDest, uiWidth, uiHeight, IMAGE_FORMAT_RGBA32323232F, DestFormat );
+
+		delete[] lpIntermediateRGBA;
+
+		return didConvert;
+	}
+
 	if ( SourceFormat == IMAGE_FORMAT_RGBA32323232F && DestFormat == IMAGE_FORMAT_RGB323232F )
 	{
 		float *lpSourceFP = reinterpret_cast<float *>( lpSource );
@@ -4390,43 +4429,36 @@ vlBool CVTFFile::Convert( vlByte *lpSource, vlByte *lpDest, vlUInt uiWidth, vlUI
 		return vlTrue;
 	}
 
-	if ( DestFormat == IMAGE_FORMAT_RGBA16161616F )
+	if ( DestFormat == IMAGE_FORMAT_RGBA32323232F || DestFormat == IMAGE_FORMAT_RGB323232F )
 	{
-		if ( SourceFormat == IMAGE_FORMAT_RGBA32323232F || SourceFormat == IMAGE_FORMAT_RGB323232F )
+		auto lpRGBA8888Data = new vlByte[ComputeImageSize( uiWidth, uiHeight, 1, IMAGE_FORMAT_RGBA8888 )];
+		if ( !ConvertToRGBA8888( lpSource, lpRGBA8888Data, uiWidth, uiHeight, SourceFormat ) )
 		{
-			vlBool hasAlpha = SourceFormat == IMAGE_FORMAT_RGBA32323232F;
+			delete[] lpRGBA8888Data;
+			return vlFalse;
+		}
 
-			float *lpSourceFP = reinterpret_cast<float *>( lpSource );
-			float *lpLastFP = reinterpret_cast<float *>( lpSource + CVTFFile::ComputeImageSize( uiWidth, uiHeight, 1, SourceFormat ) );
-			unsigned short *lpDestFP = reinterpret_cast<unsigned short *>( lpDest );
+		if ( DestFormat == IMAGE_FORMAT_RGBA32323232F )
+			LDR_TO_HDR( lpRGBA8888Data, lpDest, uiWidth, uiHeight, VTFImageConvertInfo[IMAGE_FORMAT_RGBA8888], DestInfo );
+		else
+		{
+			auto lpRGBAFP32Data = new vlByte[ComputeImageSize( uiWidth, uiHeight, 1, IMAGE_FORMAT_RGBA32323232F )];
 
-			for ( ; lpSourceFP < lpLastFP; lpSourceFP += hasAlpha ? 4 : 3, lpDestFP += 4 )
-			{
-				float test = lpSourceFP[0];
-				float test2 = CVTFFile::FP32ToFP16( lpSourceFP[0] );
+			LDR_TO_HDR( lpRGBA8888Data, lpRGBAFP32Data, uiWidth, uiHeight, VTFImageConvertInfo[IMAGE_FORMAT_RGBA8888], VTFImageConvertInfo[IMAGE_FORMAT_RGBA32323232F] );
 
-				lpDestFP[0] = CVTFFile::FP32ToFP16( lpSourceFP[0] );
-				lpDestFP[1] = CVTFFile::FP32ToFP16( lpSourceFP[1] );
-				lpDestFP[2] = CVTFFile::FP32ToFP16( lpSourceFP[2] );
-				lpDestFP[3] = hasAlpha ? CVTFFile::FP32ToFP16( lpSourceFP[3] ) : CVTFFile::FP32ToFP16( 1.f );
+			if ( !Convert( lpRGBAFP32Data, lpSource, uiWidth, uiHeight, IMAGE_FORMAT_RGBA32323232F, DestFormat ) )
+			{
+				delete[] lpRGBAFP32Data;
+				delete[] lpRGBA8888Data;
+				return vlFalse;
 			}
 
-			return vlTrue;
+			delete[] lpRGBAFP32Data;
 		}
 
-		auto lpIntermediateRGBA = new vlByte[CVTFFile::ComputeImageSize( uiWidth, uiHeight, 1, IMAGE_FORMAT_RGBA32323232F )];
+		delete[] lpRGBA8888Data;
 
-		if ( !LDR_TO_HDR( lpSource, lpIntermediateRGBA, uiWidth, uiHeight, SourceInfo, VTFImageConvertInfo[IMAGE_FORMAT_RGBA32323232F] ) )
-		{
-			delete[] lpIntermediateRGBA;
-			return vlFalse;
-		}
-
-		vlBool didConvert = Convert( lpIntermediateRGBA, lpDest, uiWidth, uiHeight, IMAGE_FORMAT_RGBA32323232F, DestFormat );
-
-		delete[] lpIntermediateRGBA;
-
-		return didConvert;
+		return vlTrue;
 	}
 
 	// Do general convertions.