c: fix compilation, use C-style initializer list cast in a C program

Author: craftablescience

lang/c/include/sourceppc/API.h

@@ -10,6 +10,7 @@
 
 #ifdef __cplusplus
 	#define SOURCEPP_API extern "C" SOURCEPP_EXPORT
+	#define SOURCEPP_CAST_CTOR(name) name
 	#include <cstddef>
 	#include <cstdint>
 	using std::size_t;
@@ -23,6 +24,7 @@
 	using std::uint64_t;
 #else
 	#define SOURCEPP_API SOURCEPP_EXPORT
+	#define SOURCEPP_CAST_CTOR(name) (name)
 	#include <stddef.h>
 	#include <stdint.h>
 #endif

lang/c/include/sourceppc/Buffer.h

@@ -11,7 +11,7 @@ typedef struct {
 	void* data;
 } sourcepp_buffer_t;
 
-#define SOURCEPP_BUFFER_INVALID (sourcepp_buffer_t{.size = -1, .data = NULL})
+#define SOURCEPP_BUFFER_INVALID (SOURCEPP_CAST_CTOR(sourcepp_buffer_t) {.size = -1, .data = NULL})
 
 // Aliases
 typedef sourcepp_buffer_t sourcepp_buffer_uint32_t;

lang/c/include/sourceppc/String.h

@@ -11,14 +11,14 @@ typedef struct {
 	uint8_t* data;
 } sourcepp_string_t;
 
-#define SOURCEPP_STRING_INVALID (sourcepp_string_t{.size = -1, .data = NULL})
+#define SOURCEPP_STRING_INVALID (SOURCEPP_CAST_CTOR(sourcepp_string_t) {.size = -1, .data = NULL})
 
 typedef struct {
 	int64_t size;
 	char** data;
 } sourcepp_string_array_t;
 
-#define SOURCEPP_STRING_ARRAY_INVALID (sourcepp_string_array_t{.size = -1, .data = NULL})
+#define SOURCEPP_STRING_ARRAY_INVALID (SOURCEPP_CAST_CTOR(sourcepp_string_array_t) {.size = -1, .data = NULL})
 
 #ifdef __cplusplus
 } // extern "C"

lang/c/include/vtfppc/ImageConversion.h

@@ -77,7 +77,7 @@ SOURCEPP_API void vtfpp_image_conversion_set_resized_dims(uint16_t* width, vtfpp
 SOURCEPP_API sourcepp_buffer_t vtfpp_image_conversion_resize_image_data(const unsigned char* buffer, size_t bufferLen, vtfpp_image_format_e format, uint16_t width, uint16_t newWidth, uint16_t height, uint16_t newHeight, int srgb, vtfpp_image_conversion_resize_filter_e filter, vtfpp_image_conversion_resize_edge_e edge);
 
 // REQUIRES MANUAL FREE: sourcepp_buffer_free
-SOURCEPP_API sourcepp_buffer_t vtfpp_image_conversion_resize_image_data_strict(const unsigned char* buffer, size_t bufferLen, vtfpp_image_format_e format, uint16_t width, uint16_t newWidth, uint16_t* widthOut, vtfpp_image_conversion_resize_method_e widthResize, uint16_t height, uint16_t newHeight, uint16_t* heightOut, vtfpp_image_conversion_resize_method_e heightResize, bool srgb, vtfpp_image_conversion_resize_filter_e filter, vtfpp_image_conversion_resize_edge_e edge);
+SOURCEPP_API sourcepp_buffer_t vtfpp_image_conversion_resize_image_data_strict(const unsigned char* buffer, size_t bufferLen, vtfpp_image_format_e format, uint16_t width, uint16_t newWidth, uint16_t* widthOut, vtfpp_image_conversion_resize_method_e widthResize, uint16_t height, uint16_t newHeight, uint16_t* heightOut, vtfpp_image_conversion_resize_method_e heightResize, int srgb, vtfpp_image_conversion_resize_filter_e filter, vtfpp_image_conversion_resize_edge_e edge);
 
 // REQUIRES MANUAL FREE: sourcepp_buffer_free
 SOURCEPP_API sourcepp_buffer_t vtfpp_image_conversion_crop_image_data(const unsigned char* buffer, size_t bufferLen, vtfpp_image_format_e format, uint16_t width, uint16_t newWidth, uint16_t xOffset, uint16_t height, uint16_t newHeight, uint16_t yOffset);

lang/c/include/vtfppc/SHT.h

@@ -19,7 +19,7 @@ typedef struct {
 	vtfpp_sht_frame_bounds_t bounds[4];
 } vtfpp_sht_frame_t;
 
-#define VTFPP_SHT_FRAME_INVALID (vtfpp_sht_frame_t{.duration = 0.f})
+#define VTFPP_SHT_FRAME_INVALID (SOURCEPP_CAST_CTOR(vtfpp_sht_frame_t) {.duration = 0.f})
 
 typedef struct {
 	uint32_t id;
@@ -28,7 +28,7 @@ typedef struct {
 	float durationTotal;
 } vtfpp_sht_sequence_t;
 
-#define VTFPP_SHT_SEQUENCE_INVALID (vtfpp_sht_sequence_t{.id = 0, .loop = 0, .frameCount = 0, .durationTotal = 0.f})
+#define VTFPP_SHT_SEQUENCE_INVALID (SOURCEPP_CAST_CTOR(vtfpp_sht_sequence_t) {.id = 0, .loop = 0, .frameCount = 0, .durationTotal = 0.f})
 
 typedef void* vtfpp_sht_handle_t;
 

lang/c/include/vtfppc/VTF.h

@@ -112,7 +112,7 @@ typedef struct {
 	float bumpMapScale;
 } vtfpp_vtf_creation_options_t;
 
-#define VTFPP_VTF_CREATION_OPTIONS_DEFAULT (vtfpp_vtf_creation_options_t{ \
+#define VTFPP_VTF_CREATION_OPTIONS_DEFAULT (SOURCEPP_CAST_CTOR(vtfpp_vtf_creation_options_t) { \
 	.majorVersion = 7, \
 	.minorVersion = 4, \
 	.outputFormat = VTFPP_VTF_FORMAT_DEFAULT, \

lang/c/src/vtfppc/ImageConversion.cpp

@@ -111,7 +111,7 @@ SOURCEPP_API sourcepp_buffer_t vtfpp_image_conversion_resize_image_data(const un
 	return Convert::toBuffer(ImageConversion::resizeImageData({reinterpret_cast<const std::byte*>(buffer), bufferLen}, static_cast<ImageFormat>(format), width, newWidth, height, newHeight, srgb, static_cast<ImageConversion::ResizeFilter>(filter), static_cast<ImageConversion::ResizeEdge>(edge)));
 }
 
-SOURCEPP_API sourcepp_buffer_t vtfpp_image_conversion_resize_image_data_strict(const unsigned char* buffer, size_t bufferLen, vtfpp_image_format_e format, uint16_t width, uint16_t newWidth, uint16_t* widthOut, vtfpp_image_conversion_resize_method_e widthResize, uint16_t height, uint16_t newHeight, uint16_t* heightOut, vtfpp_image_conversion_resize_method_e heightResize, bool srgb, vtfpp_image_conversion_resize_filter_e filter, vtfpp_image_conversion_resize_edge_e edge) {
+SOURCEPP_API sourcepp_buffer_t vtfpp_image_conversion_resize_image_data_strict(const unsigned char* buffer, size_t bufferLen, vtfpp_image_format_e format, uint16_t width, uint16_t newWidth, uint16_t* widthOut, vtfpp_image_conversion_resize_method_e widthResize, uint16_t height, uint16_t newHeight, uint16_t* heightOut, vtfpp_image_conversion_resize_method_e heightResize, int srgb, vtfpp_image_conversion_resize_filter_e filter, vtfpp_image_conversion_resize_edge_e edge) {
 	SOURCEPP_EARLY_RETURN_VAL(buffer, SOURCEPP_BUFFER_INVALID);
 	SOURCEPP_EARLY_RETURN_VAL(bufferLen, SOURCEPP_BUFFER_INVALID);
 	SOURCEPP_EARLY_RETURN_VAL(format != VTFPP_IMAGE_FORMAT_EMPTY, SOURCEPP_BUFFER_INVALID);