fix linux build

Author: YunHsiao

Source/ert.cpp

@@ -21,6 +21,7 @@
 #include "ert.h"
 
 #include <cassert>
+#include <cstring>
 
 #define ERT_FAVOR_CONT_AND_REP0_MATCHES (1)
 #define ERT_FAVOR_REP0_MATCHES (0)
@@ -143,7 +144,7 @@ namespace ert
 	bool reduce_entropy(uint8_t* pBlock_bytes, uint32_t num_blocks,
 		uint32_t total_block_stride_in_bytes, uint32_t block_size_to_optimize_in_bytes,
 		const reduce_entropy_params& params, uint32_t& total_modified,
-		pDiff_block_func pDiff_block_func, void* pDiff_block_func_user_data,
+		diff_block_func_type pDiff_block_func, void* pDiff_block_func_user_data,
 		const float* pBlock_mse_scales)
 	{
 		assert(total_block_stride_in_bytes && block_size_to_optimize_in_bytes);
@@ -175,7 +176,7 @@ namespace ert
 			uint8_t* pOrig_block = &pBlock_bytes[block_index * total_block_stride_in_bytes];
 
 			float max_std_dev = 0.0f;
-			float cur_mse = (*pDiff_block_func)(pDiff_block_func_user_data, pOrig_block, block_index, &max_std_dev);
+			float cur_mse = pDiff_block_func(pDiff_block_func_user_data, pOrig_block, block_index, &max_std_dev);
 			if (cur_mse < 0.0f)
 				return false;
 
@@ -283,7 +284,7 @@ namespace ert
 								memcpy(trial_block, pOrig_block, block_size_to_optimize_in_bytes);
 								memcpy(trial_block + dst_ofs, pPrev_blk + src_ofs, len);
 
-								float trial_mse = (*pDiff_block_func)(pDiff_block_func_user_data, trial_block, block_index, nullptr);
+								float trial_mse = pDiff_block_func(pDiff_block_func_user_data, trial_block, block_index, nullptr);
 								if (trial_mse < 0.0f)
 									continue;
 
@@ -366,7 +367,7 @@ namespace ert
 							memcpy(trial_block, pOrig_block, block_size_to_optimize_in_bytes);
 							memcpy(trial_block + ofs, pPrev_blk + ofs, len);
 
-							float trial_mse = (*pDiff_block_func)(pDiff_block_func_user_data, trial_block, block_index, nullptr);
+							float trial_mse = pDiff_block_func(pDiff_block_func_user_data, trial_block, block_index, nullptr);
 							if (trial_mse < 0.0f)
 								continue;
 
@@ -436,7 +437,7 @@ namespace ert
 								memcpy(trial_block, orig_best_block, block_size_to_optimize_in_bytes);
 								memcpy(trial_block + ofs, pPrev_blk + ofs, len);
 
-								float trial_mse = (*pDiff_block_func)(pDiff_block_func_user_data, trial_block, block_index, nullptr);
+								float trial_mse = pDiff_block_func(pDiff_block_func_user_data, trial_block, block_index, nullptr);
 								if (trial_mse < 0.0f)
 									continue;
 

Source/ert.h

@@ -21,6 +21,8 @@
 #pragma once
 
 #include <algorithm>
+#include <cstdint>
+#include <cstdio>
 
 // Based on https://github.com/richgel999/bc7enc_rdo/blob/master/ert.h
 // With interface tweaks that can make format integration more general & performant.
@@ -85,13 +87,13 @@ namespace ert
 	 *
 	 * @return Should return the mean squared error for current trial block, or any negative value to indicate errors.
 	 */
-	typedef float (*pDiff_block_func)(void* pUser_data, const uint8_t* pBlock, uint32_t block_index, float* out_max_std_dev);
+	typedef float diff_block_func_type(void* pUser_data, const uint8_t* pBlock, uint32_t block_index, float* out_max_std_dev);
 
 	// BC7 entropy reduction transform with Deflate/LZMA/LZHAM optimizations
 	bool reduce_entropy(uint8_t* pBlock_bytes, uint32_t num_blocks,
 		uint32_t total_block_stride_in_bytes, uint32_t block_size_to_optimize_in_bytes,
 		const reduce_entropy_params& params, uint32_t& total_modified,
-		pDiff_block_func pDiff_block_func, void* pDiff_block_func_user_data,
+		diff_block_func_type pDiff_block_func, void* pDiff_block_func_user_data,
 		const float* pBlock_mse_scales = nullptr);
 
 } // namespace ert