Make CMakeLists easily usable as a subproject and fix build issues

.gitignore

@@ -1,4 +1,5 @@
-build/
+
+CMakeUserPresets.json
 
 # VS project and working files
 *.vcxproj.user

REUSE.toml

@@ -0,0 +1,39 @@
+version = 1
+SPDX-PackageName = "basis_universal"
+SPDX-PackageDownloadLocation = "https://github.com/BinomialLLC/basis_universal"
+
+[[annotations]]
+path = "**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = ["2019-2024 Binomial LLC", "2016 The Android Open Source Project"]
+SPDX-License-Identifier = "Apache-2.0"
+
+[[annotations]]
+path = "OpenCL/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2008-2020 The Khronos Group Inc."
+SPDX-License-Identifier = "Apache-2.0"
+
+[[annotations]]
+path = "zstd/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2016-present Facebook, Inc."
+SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = "encoder/3rdparty/tinyexr.h"
+precedence = "aggregate"
+SPDX-FileCopyrightText = ["2014 - 2021, Syoyo Fujita and many contributors.", "2002 Industrial Light & Magic, a division of Lucas"]
+SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = "encoder/3rdparty/qoi.h"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2021 Dominic Szablewski - https://phoboslab.org"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "encoder/3rdparty/tinydds.h"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2019 DeanoC"
+SPDX-License-Identifier = "MIT"

bin/.gitignore

@@ -0,0 +1,7 @@
+
+*
+
+!.gitignore
+!ocl_kernels.cl
+!clean.bat
+!readme.txt

build/.gitignore

@@ -0,0 +1,5 @@
+
+*
+
+!.gitignore
+!readme.txt

encoder/basisu_astc_ldr_common.cpp

@@ -878,7 +878,7 @@ namespace astc_ldr
 	}
 #endif
 
-	// TODO: Try two-step Lanczos iteration/Rayleigh–Ritz approximation in a 2-dimensional Krylov subspace method vs. power method.
+	// TODO: Try two-step Lanczos iteration/Rayleigh-Ritz approximation in a 2-dimensional Krylov subspace method vs. power method.
 	static vec4F calc_pca_4D(uint32_t num_pixels, const vec4F* pPixels, const vec4F& mean_f)
 	{
 		float m00 = 0, m01 = 0, m02 = 0, m03 = 0;
@@ -1127,7 +1127,7 @@ namespace astc_ldr
 	{
 		BASISU_NOTE_UNUSED(weight_ise_index);
 
-		assert((ccs_index >= 0) && (ccs_index <= 3));
+		assert(ccs_index <= 3);
 		assert((total_weights <= 32) || (total_weights == 65));
 
 		uint64_t total_err = 0;
@@ -4414,7 +4414,7 @@ namespace astc_ldr
 		const cem_encode_params& enc_params, uint32_t flags)
 	{
 		assert(g_initialized);
-		assert((ccs_index >= 0) && (ccs_index <= 3));
+		assert(ccs_index <= 3);
 		assert((ps.m_num_pixels) && (ps.m_num_pixels <= ASTC_LDR_MAX_BLOCK_PIXELS));
 		assert(pWeights0 && pWeights1);
 
@@ -4830,7 +4830,7 @@ namespace astc_ldr
 		uint32_t endpoint_ise_range, uint32_t weight_ise_range,
 		vec4F& low_endpoint, vec4F& high_endpoint, float* pWeights0, float *pWeights1, uint32_t flags)
 	{
-		assert((ccs_index >= 0) && (ccs_index <= 3));
+		assert(ccs_index <= 3);
 		const uint32_t num_endpoint_levels = astc_helpers::get_ise_levels(endpoint_ise_range);
 
 		// astc_helpers::BISE_64_LEVELS=raw weights ([0,64], NOT [0,63])

transcoder/basisu_transcoder.cpp

@@ -1,4 +1,4 @@
-// basisu_transcoder.cpp
+// basisu_transcoder.cpp
 // Copyright (C) 2019-2026 Binomial LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -32148,11 +32148,9 @@ namespace bc7f
 			{
 				scaledLow[i] = (xMinColor[i] << (8 - total_bits));
 				scaledLow[i] |= (scaledLow[i] >> total_bits);
-				assert(scaledLow[i] <= 255);
 
 				scaledHigh[i] = (xMaxColor[i] << (8 - total_bits));
 				scaledHigh[i] |= (scaledHigh[i] >> total_bits);
-				assert(scaledHigh[i] <= 255);
 			}
 
 			float err0 = 0, err1 = 0;
@@ -32222,11 +32220,9 @@ namespace bc7f
 			{
 				scaledLow[i] = (xMinColor[i] << (8 - total_bits));
 				scaledLow[i] |= (scaledLow[i] >> total_bits);
-				assert(scaledLow[i] <= 255);
 
 				scaledHigh[i] = (xMaxColor[i] << (8 - total_bits));
 				scaledHigh[i] |= (scaledHigh[i] >> total_bits);
-				assert(scaledHigh[i] <= 255);
 			}
 
 			float err = 0;

transcoder/basisu_transcoder_internal.h

@@ -1758,7 +1758,7 @@ namespace basist
 					return (int)std::round(d / (float)L);
 				}
 
-				// L = quant step, alpha in [0,1.2] (typical 0.7–0.85)
+				// L = quant step, alpha in [0,1.2] (typical 0.7-0.85)
 				if (L <= 0) 
 					return 0;
 
@@ -2123,7 +2123,7 @@ namespace basist
 		enum { TABLE_BITS = 8 };               // 256..1024 entries typical (8..10)
 		enum { TABLE_SIZE = 1 << TABLE_BITS };
 		enum { MANT_BITS = 23 };
-		enum { FRAC_BITS = MANT_BITS - TABLE_BITS };
+		enum { FRAC_BITS = (int)MANT_BITS - (int)TABLE_BITS };
 		enum { FRAC_MASK = (1u << FRAC_BITS) - 1u };
 
 		extern bool g_initialized;