Merge pull request #45 from winterheart/msvc2022

Fix crnlib compilation on MSVC 2022 toolchain

.gitignore

@@ -0,0 +1,2 @@
+*.o
+crnlib/crunch

CHANGELOG.md

@@ -0,0 +1,17 @@
+# Change Log
+
+## [0.1.4] - 2012-11-24
+### Added
+* KTX file format
+* Basic ETC1 support
+* Simple makefile
+
+### Fixed
+* Various DDS format fixes
+
+## [0.1.3] - 2012-04-26
+### Added
+* Ported to Linux (tested on Ubuntu x86 w/Codeblocks). Note that a few features of the cmd line tool don't work yet (eg. -timestamp)
+
+[0.1.4]: https://github.com/BinomialLLC/crunch
+[0.1.3]: https://github.com/BinomialLLC/crunch

README.md

@@ -1,10 +1,6 @@
 crunch/crnlib v1.04 - Advanced DXTn texture compression library
-Copyright (C) 2010-2012 Rich Geldreich and Tenacious Software LLC
 
-For bugs or support contact Rich Geldreich <richgel99@gmail.com>.
-
-This software uses the ZLIB license, which is located in license.txt.
-http://opensource.org/licenses/Zlib
+Public Domain - Please see license.txt. 
 
 Portions of this software make use of public domain code originally
 written by Igor Pavlov (LZMA), RYG (crn_ryg_dxt*), and Sean Barrett (stb_image.c).
@@ -12,31 +8,12 @@ written by Igor Pavlov (LZMA), RYG (crn_ryg_dxt*), and Sean Barrett (stb_image.c
 If you use this software in a product, an acknowledgment in the product 
 documentation would be highly appreciated but is not required.
 
-New for v1.04 [11/24/12]: KTX file format, basic ETC1 support, DDS format fixes, simple makefile
-------------------------------------------------
-
-Lots of higher level changes to get crnlib into a state where I can carry it forward to
-support other file and texture compression formats. No major codec-level changes. 
-I've regression tested the codec writing .CRN and RDO .DDS files at various bitrates.
-Everything seems OK, but with all the changes I made to support KTX and other formats like ETC1 
-I'm still worried about bugs.
-
-New for v1.03 [4/26/12]: crnlib more portable, Linux Port
-------------------------------------------------
-
-v1.03 has been ported to Linux. It's still a work in progress. A few features 
-of the command line tool don't work under Linux yet (such as -timestamp), 
-but the core functionality (compression/decompression/transcoding) should work
-OK. I'm currently testing crnlib/crunch with Codeblocks 10.05 under Ubuntu x86.
-
-Overview
---------
+## Overview
 
 crnlib is a lossy texture compression library for developers that ship
 content using the DXT1/5/N or 3DC compressed color/normal map/cubemap
 mipmapped texture formats. It was written by the same author as the open
-source LZHAM lossless data compression library:
-http://code.google.com/p/lzham/
+source [LZHAM compression library](http://code.google.com/p/lzham/).
 
 It can compress mipmapped 2D textures, normal maps, and cubemaps to
 approx. 1-1.25 bits/texel, and normal maps to 1.75-2 bits/texel. The
@@ -65,21 +42,17 @@ It also supports several popular swizzled variants (several are
 also supported by AMD's Compressonator): 
 DXT5_XGBR, DXT5_xGxR, DXT5_AGBR, and DXT5_CCxY (experimental luma-chroma YCoCg).
 
-Recommended Software
---------------------
+## Recommended Software
 
-AMD's Compressonator tool is recommended to view the .DDS files created by
-the crunch tool and the included example projects:
-
-http://developer.amd.com/gpu/compressonator/pages/default.aspx
+AMD's [Compressonator tool](https://github.com/GPUOpen-Tools/Compressonator)
+is recommended to view the .DDS files created by the crunch tool and the included example projects.
 
 Note: Some of the swizzled DXTn .DDS output formats (such as DXT5_xGBR)
 read/written by the crunch tool or examples deviate from the DX9 DDS
 standard, so DXSDK tools such as DXTEX.EXE won't load them at all or
 they won't be properly displayed.
 
-Compression Algorithm Details
------------------------------
+## Compression Algorithm Details
 
 The compression process employed in creating both .CRN and
 clustered .DDS files utilizes a very high quality, scalable DXTn
@@ -100,8 +73,7 @@ version will also utilize adaptive binary arithmetic coding and higher
 order context modeling using already developed tech from the my LZHAM
 compression library.
 
-Supported File Formats
-----------------------
+## Supported File Formats
 
 crnlib supports two compressed texture file formats. The first
 format (clustered .DDS) is simple to integrate into an existing project
@@ -111,7 +83,8 @@ the second, higher quality custom format (.CRN) requires a few
 typically straightforward engine modifications to integrate the
 .CRN->DXTn transcoder header file library into your tools/engine.
 
-.DDS
+### .DDS
+
 crnlib can compress textures to standard DX9-style .DDS files using
 clustered DXTn compression, which is a subset of the approach used to
 create .CRN files.(For completeness, crnlib also supports vanilla, block
@@ -132,7 +105,8 @@ data.)
 Clustered .DDS files are intended to be the simplest/fastest way to
 integrate crnlib's tech into a project.
 
-.CRN
+### .CRN
+
 The second, better, option is to compress your textures to .CRN files
 using crnlib. To read the resulting .CRN data, you must add the .CRN
 transcoder library (located in the included single file, stand-alone
@@ -144,7 +118,7 @@ further lossless compression because they're already highly compressed.
 .CRN files are a bit more difficult/risky to integrate into a project, but
 the resulting compression ratio and quality is superior vs. clustered .DDS files.
 
-.KTX
+### .KTX
 
 crnlib and crunch can read/write the .KTX file format in various pixel formats.
 Rate distortion optimization (clustered DXTc compression) is not yet supported
@@ -156,8 +130,7 @@ found that support .KTX are fairly (to very) buggy, or are limited to only a han
 of pixel formats, so there's no guarantee that the .KTX files written by crnlib can
 be reliably read by other tools.
 
-Building the Examples
----------------------
+## Building the Examples
 
 This release contains the source code and projects for three simple
 example projects:
@@ -168,11 +141,14 @@ VS2005, VS2010, and gcc 4.5.0 (TDM GCC+MinGW).  A codeblocks 10.05
 workspace and project file is also included, but compiling crnlib this
 way hasn't been tested much.
 
-example1: Demonstrates how to use crnlib's high-level C-helper
+### example1
+
+Demonstrates how to use crnlib's high-level C-helper
 compression/decompression/transcoding functions in inc/crnlib.h. It's a
 fairly complete example of crnlib's functionality.
 
-example2: Shows how to transcodec .CRN files to .DDS using *only*
+### example2
+Shows how to transcodec .CRN files to .DDS using **only**
 the functionality in inc/crn_decomp.h. It does not link against against
 crnlib.lib or depend on it in any way. (Note: The complete source code,
 approx. 4800 lines, to the CRN transcoder is included in inc/crn_decomp.h.)
@@ -180,15 +156,15 @@ approx. 4800 lines, to the CRN transcoder is included in inc/crn_decomp.h.)
 example2 is intended to show how simple it is to integrate CRN textures
 into your application.
 
-example3: Shows how to use the regular, low-level DXTn block compressor
+### example3
+Shows how to use the regular, low-level DXTn block compressor
 functions in inc/crnlib.h. This functionality is included for
 completeness. (Your engine or toolchain most likely already has its own
 DXTn compressor. crnlib's compressor is typically very competitive or
 superior to most available closed and open source CPU-based
 compressors.)
 
-Creating Compressed Textures from the Command Line (crunch.exe)
----------------------------------------------------------------
+## Creating Compressed Textures from the Command Line (crunch.exe)
 
 The simplest way to create compressed textures using crnlib is to
 integrate the bin\crunch.exe or bin\crunch_x64.exe) command line tool
@@ -205,25 +181,25 @@ form under inc/crn_decomp.h.
 Here are a few example crunch.exe command lines:
 
 1. Compress blah.tga to blah.dds using normal DXT1 compression:
-crunch -file blah.tga -fileformat dds -dxt1
+  * `crunch -file blah.tga -fileformat dds -dxt1`
 
 2. Compress blah.tga to blah.dds using clustered DXT1 at an effective bitrate of 1.5 bits/texel, display image statistic:
-crunch -file blah.tga -fileformat dds -dxt1 -bitrate 1.5 -imagestats
+  * `crunch -file blah.tga -fileformat dds -dxt1 -bitrate 1.5 -imagestats`
 
 3. Compress blah.tga to blah.dds using clustered DXT1 at quality level 100 (from [0,255]), with no mipmaps, display LZMA statistics:
-crunch -file blah.tga -fileformat dds -dxt1 -quality 100 -mipmode none -lzmastats
+  * `crunch -file blah.tga -fileformat dds -dxt1 -quality 100 -mipmode none -lzmastats`
 
 3. Compress blah.tga to blah.crn using clustered DXT1 at a bitrate of 1.2 bits/texel, no mipmaps:
-crunch -file blah.tga -dxt1 -bitrate 1.2 -mipmode none
+  * `crunch -file blah.tga -dxt1 -bitrate 1.2 -mipmode none`
 
 4. Decompress blah.dds to a .tga file:
-crunch -file blah.dds -fileformat tga
+  * `crunch -file blah.dds -fileformat tga`
 
 5. Transcode blah.crn to a .dds file:
-crunch -file blah.crn
+  * `crunch -file blah.crn`
 
 6. Decompress blah.crn, writing each mipmap level to a separate .tga file:
-crunch -split -file blah.crn -fileformat tga
+  * `crunch -split -file blah.crn -fileformat tga`
 
 crunch.exe can do a lot more, like rescale/crop images before
 compression, convert images from one file format to another, compare
@@ -235,8 +211,7 @@ time to address. This version of crunch.exe has some reduced
 functionality compared to an earlier eval release. For example, XML file
 support is not included in this version.
 
-Using crnlib
-------------
+## Using crnlib
 
 The most flexible and powerful way of using crnlib is to integrate the
 library into your editor/toolchain/etc. and directly supply it your
@@ -245,30 +220,40 @@ inc/crnlib.h.
 
 To compress, you basically fill in a few structs in and call one function:
 
-  void *crn_compress(const crn_comp_params &comp_params, crn_uint32 &compressed_size, crn_uint32 *pActual_quality_level = NULL, float *pActual_bitrate = NULL);
+```c
+void *crn_compress( const crn_comp_params &comp_params,
+                    crn_uint32 &compressed_size,
+                    crn_uint32 *pActual_quality_level = NULL,
+                    float *pActual_bitrate = NULL);
+```
 
 Or, if you want crnlib to also generate mipmaps, you call this function:
 
-  void *crn_compress(const crn_comp_params &comp_params, const crn_mipmap_params &mip_params, crn_uint32 &compressed_size, crn_uint32 *pActual_quality_level = NULL, float *pActual_bitrate = NULL);
+```c
+void *crn_compress( const crn_comp_params &comp_params,
+                    const crn_mipmap_params &mip_params,
+                    crn_uint32 &compressed_size,
+                    crn_uint32 *pActual_quality_level = NULL,
+                    float *pActual_bitrate = NULL);
+```
 
 You can also transcode/uncompress .DDS/.CRN files to raw 32bpp images
-using crn_decompress_crn_to_dds() and crn_decompress_dds_to_images().
+using `crn_decompress_crn_to_dds()` and `crn_decompress_dds_to_images()`.
 
 Internally, crnlib just uses inc/crn_decomp.h to transcode textures to
 DXTn. If you only need to transcode .CRN format files to raw DXTn bits
 at runtime (and not compress), you don't actually need to compile or
 link against crnlib at all. Just include inc/crn_decomp.h, which
 contains a completely self-contained CRN transcoder in the "crnd"
-namespace. The crnd_get_texture_info(), crnd_unpack_begin(),
-crnd_unpack_level(), etc. functions are all you need to efficiently get
+namespace. The `crnd_get_texture_info()`, `crnd_unpack_begin()`,
+`crnd_unpack_level()`, etc. functions are all you need to efficiently get
 at the raw DXTn bits, which can be directly supplied to whatever API or
 GPU you're using. (See example2.)
 
 Important note: When compiling under native client, be sure to define
-the PLATFORM_NACL macro before including the inc/crn_decomp.h header file library.
+the `PLATFORM_NACL` macro before including the `inc/crn_decomp.h` header file library.
 
-Known Issues/Bugs
------------------
+## Known Issues/Bugs
 
 * crnlib currently assumes you'll be further losslessly compressing its
 output .DDS files using LZMA. However, some engines use weaker codecs
@@ -305,3 +290,12 @@ hasn't been tuned for max. quality yet.
 supported when writing to .DDS, not .KTX. Also, only plain block by block
 compression is supported when writing to ETC1, and .CRN does not support ETC1.
 
+## Compile to Javascript with Emscripten
+
+Download and install Emscripten:
+    http://kripken.github.io/emscripten-site/docs/getting_started/downloads.html
+
+From the root directory, run:
+```c
+    emcc -O3 emscripten/crn.cpp -I./inc -s EXPORTED_FUNCTIONS="['_malloc', '_free', '_crn_get_width', '_crn_get_height', '_crn_get_levels', '_crn_get_dxt_format', '_crn_get_bytes_per_block', '_crn_get_uncompressed_size', '_crn_decompress']" -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ALLOW_MEMORY_GROWTH=1 --memory-init-file 0 -o crunch.js
+```

crnlib/crn_arealist.cpp

@@ -1,5 +1,5 @@
 // File: crn_arealist.cpp - 2D shape algebra (currently unused)
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 // Ported from the PowerView DOS image viewer, a product I wrote back in 1993. Not currently used in the open source release of crnlib.
 #include "crn_core.h"
 #include "crn_arealist.h"

crnlib/crn_arealist.h

@@ -1,5 +1,5 @@
 // File: crn_arealist.h - 2D shape algebra
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_assert.cpp

@@ -1,5 +1,5 @@
 // File: crn_assert.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #if CRNLIB_USE_WIN32_API
 #include "crn_winhdr.h"

crnlib/crn_assert.h

@@ -1,5 +1,5 @@
 // File: crn_assert.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 const unsigned int CRNLIB_FAIL_EXCEPTION_CODE = 256U;

crnlib/crn_buffer_stream.h

@@ -1,5 +1,5 @@
 // File: crn_buffer_stream.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_data_stream.h"
 

crnlib/crn_cfile_stream.h

@@ -1,5 +1,5 @@
 // File: crn_cfile_stream.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_data_stream.h"
 

crnlib/crn_clusterizer.h

@@ -1,5 +1,5 @@
 // File: crn_clusterizer.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_matrix.h"
 

crnlib/crn_color.h

@@ -1,5 +1,5 @@
 // File: crn_color.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_core.h"
 

crnlib/crn_colorized_console.cpp

@@ -1,5 +1,5 @@
 // File: crn_colorized_console.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_colorized_console.h"
 #ifdef CRNLIB_USE_WIN32_API

crnlib/crn_colorized_console.h

@@ -1,5 +1,5 @@
 // File: crn_colorized_console.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_console.h"
 

crnlib/crn_command_line_params.cpp

@@ -1,5 +1,5 @@
 // File: crn_command_line_params.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_command_line_params.h"
 #include "crn_console.h"

crnlib/crn_command_line_params.h

@@ -1,5 +1,5 @@
 // File: crn_command_line_params.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_value.h"
 #include <map>

crnlib/crn_comp.cpp

@@ -1,5 +1,5 @@
 // File: crn_comp.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_console.h"
 #include "crn_comp.h"

crnlib/crn_comp.h

@@ -1,5 +1,5 @@
 // File: crn_comp.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 #define CRND_HEADER_FILE_ONLY

crnlib/crn_console.cpp

@@ -1,5 +1,5 @@
 // File: crn_console.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_console.h"
 #include "crn_data_stream.h"

crnlib/crn_console.h

@@ -1,5 +1,5 @@
 // File: crn_console.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_dynamic_string.h"
 

crnlib/crn_core.cpp

@@ -1,5 +1,5 @@
 // File: crn_core.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 
 #if CRNLIB_USE_WIN32_API
@@ -8,7 +8,7 @@
 
 namespace crnlib
 {
-   const char *g_copyright_str = "Copyright (c) 2010-2012 Rich Geldreich and Tenacious Software LLC";
+   const char *g_copyright_str = "This is Public Domain Software, please see license.txt.";
    const char *g_sig_str = "C8cfRlaorj0wLtnMSxrBJxTC85rho2L9hUZKHcBL";
 
 } // namespace crnlib

crnlib/crn_core.h

@@ -1,5 +1,5 @@
 // File: crn_core.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 #if defined(WIN32) && defined(_MSC_VER)

crnlib/crn_data_stream.cpp

@@ -1,5 +1,5 @@
 // File: crn_data_stream.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_data_stream.h"
 

crnlib/crn_data_stream.h

@@ -1,5 +1,5 @@
 // File: crn_data_stream.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_data_stream_serializer.h

@@ -1,5 +1,5 @@
 // File: data_stream_serializer.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_data_stream.h"
 

crnlib/crn_dds_comp.cpp

@@ -1,5 +1,5 @@
 // File: crn_dds_comp.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_dds_comp.h"
 #include "crn_dynamic_stream.h"

crnlib/crn_dds_comp.h

@@ -1,5 +1,5 @@
 // File: crn_comp.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_comp.h"
 #include "crn_mipmapped_texture.h"

crnlib/crn_decomp.cpp

@@ -1,5 +1,5 @@
 // File: crn_decomp.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 
 // Include the single-file header library with no defines, which brings in the full CRN decompressor.

crnlib/crn_dxt.cpp

@@ -1,5 +1,5 @@
 // File: crn_dxt.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_dxt.h"
 #include "crn_dxt1.h"

crnlib/crn_dxt.h

@@ -1,5 +1,5 @@
 // File: crn_dxt.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "../inc/crnlib.h"
 #include "crn_color.h"

crnlib/crn_dxt1.cpp

@@ -1,5 +1,5 @@
 // File: crn_dxt1.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 //
 // Notes:
 // This class is not optimized for performance on small blocks, unlike typical DXT1 compressors. It's optimized for scalability and quality:
@@ -112,9 +112,9 @@ namespace crnlib
          uint weight = m_unique_colors[i].m_weight;
          total_weight += weight;
 
-         tot_r += m_unique_colors[i].m_color.r * weight;
-         tot_g += m_unique_colors[i].m_color.g * weight;
-         tot_b += m_unique_colors[i].m_color.b * weight;
+         tot_r += m_unique_colors[i].m_color.r * static_cast<uint64>(weight);
+         tot_g += m_unique_colors[i].m_color.g * static_cast<uint64>(weight);
+         tot_b += m_unique_colors[i].m_color.b * static_cast<uint64>(weight);
       }
 
       const uint half_total_weight = total_weight >> 1;
@@ -494,7 +494,7 @@ namespace crnlib
          ll[2] = (ll[0]*2+ll[1])/3;
          ll[3] = (ll[0]+ll[1]*2)/3;
 
-         uint error_to_beat = 0;
+         uint64 error_to_beat = 0;
          uint min_color_weight = 0;
          uint max_color_weight = 0;
          for (uint i = 0; i < m_unique_colors.size(); i++)
@@ -503,7 +503,7 @@ namespace crnlib
             uint w = m_unique_colors[i].m_weight;
 
             int delta = ll[m_best_solution.m_selectors[i]] - c;
-            error_to_beat += (int)w * (delta * delta);
+            error_to_beat += static_cast<int64>(w) * (delta * delta);
 
             if (c == min_color[comp_index])
                min_color_weight += w;
@@ -561,11 +561,11 @@ namespace crnlib
                   tl[2] = (tl[0]*2+tl[1])/3;
                   tl[3] = (tl[0]+tl[1]*2)/3;
 
-                  uint trial_error = 0;
+                  uint64 trial_error = 0;
                   for (uint i = 0; i < m_unique_colors.size(); i++)
                   {
                      int delta = tl[m_best_solution.m_selectors[i]] - m_unique_colors[i].m_color[comp_index];
-                     trial_error += m_unique_colors[i].m_weight * (delta * delta);
+                     trial_error += static_cast<int64>(m_unique_colors[i].m_weight) * (delta * delta);
                      if (trial_error >= error_to_beat)
                         break;
                   }
@@ -599,7 +599,7 @@ namespace crnlib
                         for (uint i = 0; i < m_unique_colors.size(); i++)
                         {
                            int delta = tl[m_best_solution.m_selectors[i]] - m_unique_colors[i].m_color[comp_index];
-                           error_to_beat += m_unique_colors[i].m_weight * (delta * delta);
+                           error_to_beat += static_cast<int64>(m_unique_colors[i].m_weight) * (delta * delta);
                         }
 
                      } // better
@@ -1582,7 +1582,7 @@ namespace crnlib
                   err = color_distance(true, c, colors[3], false);
                   if (err < best_error) { best_error = err; best_color_index = 3; }
 
-                  trial_error += best_error * m_unique_colors[unique_color_index].m_weight;
+                  trial_error += best_error * static_cast<uint64>(m_unique_colors[unique_color_index].m_weight);
                   if (trial_error >= solution.m_error)
                      break;
 
@@ -1607,7 +1607,7 @@ namespace crnlib
                   err = color_distance(false, c, colors[3], false);
                   if (err < best_error) { best_error = err; best_color_index = 3; }
 
-                  trial_error += best_error * m_unique_colors[unique_color_index].m_weight;
+                  trial_error += best_error * static_cast<uint64>(m_unique_colors[unique_color_index].m_weight);
                   if (trial_error >= solution.m_error)
                      break;
 
@@ -1634,7 +1634,7 @@ namespace crnlib
                   err = color_distance(true, c, colors[2], false);
                   if (err < best_error) { best_error = err; best_color_index = 2; }
 
-                  trial_error += best_error * m_unique_colors[unique_color_index].m_weight;
+                  trial_error += best_error * static_cast<uint64>(m_unique_colors[unique_color_index].m_weight);
                   if (trial_error >= solution.m_error)
                      break;
 
@@ -1656,7 +1656,7 @@ namespace crnlib
                   err = color_distance(false, c, colors[2], false);
                   if (err < best_error) { best_error = err; best_color_index = 2; }
 
-                  trial_error += best_error * m_unique_colors[unique_color_index].m_weight;
+                  trial_error += best_error * static_cast<uint64>(m_unique_colors[unique_color_index].m_weight);
                   if (trial_error >= solution.m_error)
                      break;
 
@@ -1781,7 +1781,7 @@ namespace crnlib
 
                uint best_error = color_distance(m_perceptual, c, colors[best_color_index], false);
 
-               trial_error += best_error * m_unique_colors[unique_color_index].m_weight;
+               trial_error += best_error * static_cast<uint64>(m_unique_colors[unique_color_index].m_weight);
                if (trial_error >= solution.m_error)
                   break;
 
@@ -1814,7 +1814,7 @@ namespace crnlib
 
                uint best_error = color_distance(m_perceptual, c, colors[best_color_index], false);
 
-               trial_error += best_error * m_unique_colors[unique_color_index].m_weight;
+               trial_error += best_error * static_cast<uint64>(m_unique_colors[unique_color_index].m_weight);
                if (trial_error >= solution.m_error)
                   break;
 

crnlib/crn_dxt1.h

@@ -1,5 +1,5 @@
 // File: crn_dxt1.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_dxt.h"
 

crnlib/crn_dxt5a.cpp

@@ -1,5 +1,5 @@
 // File: crn_dxt5a.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_dxt5a.h"
 #include "crn_ryg_dxt.hpp"

crnlib/crn_dxt5a.h

@@ -1,5 +1,5 @@
 // File: crn_dxt5a.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_dxt.h"
 

crnlib/crn_dxt_endpoint_refiner.cpp

@@ -1,5 +1,5 @@
 // File: crn_dxt_endpoint_refiner.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_dxt_endpoint_refiner.h"
 #include "crn_dxt1.h"

crnlib/crn_dxt_endpoint_refiner.h

@@ -1,5 +1,5 @@
 // File: crn_dxt_endpoint_refiner.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_dxt.h"
 

crnlib/crn_dxt_fast.cpp

@@ -1,5 +1,5 @@
 // File: crn_dxt_fast.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 // Parts of this module are derived from RYG's excellent public domain DXTx compressor.
 #include "crn_core.h"
 #include "crn_dxt_fast.h"

crnlib/crn_dxt_fast.h

@@ -1,5 +1,5 @@
 // File: crn_dxt_fast.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_color.h"
 #include "crn_dxt.h"

crnlib/crn_dxt_hc.cpp

@@ -1,5 +1,5 @@
 // File: crn_dxt_hc.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_dxt_hc.h"
 #include "crn_image_utils.h"

crnlib/crn_dxt_hc.h

@@ -1,5 +1,5 @@
 // File: crn_dxt_hc.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_dxt1.h"
 #include "crn_dxt5a.h"

crnlib/crn_dxt_hc_common.cpp

@@ -1,5 +1,5 @@
 // File: crn_dxt_hc_common.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_dxt_hc_common.h"
 

crnlib/crn_dxt_hc_common.h

@@ -1,5 +1,5 @@
 // File: crn_dxt_hc_common.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_dxt_image.cpp

@@ -1,5 +1,5 @@
 // File: crn_dxt_image.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_dxt_image.h"
 #if CRNLIB_SUPPORT_SQUISH

crnlib/crn_dxt_image.h

@@ -1,5 +1,5 @@
 // File: crn_dxt_image.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_dxt1.h"
 #include "crn_dxt5a.h"

crnlib/crn_dynamic_stream.h

@@ -1,5 +1,5 @@
 // File: crn_dynamic_stream.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_data_stream.h"
 

crnlib/crn_dynamic_string.cpp

@@ -1,5 +1,5 @@
 // File: crn_dynamic_string.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_strutils.h"
 

crnlib/crn_dynamic_string.h

@@ -1,5 +1,5 @@
 // File: crn_dynamic_string.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_etc.cpp

@@ -1,5 +1,5 @@
 // File: crn_etc.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_etc.h"
 #include "crn_radix_sort.h"

crnlib/crn_etc.h

@@ -1,5 +1,5 @@
 // File: crn_etc.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "../inc/crnlib.h"
 #include "crn_dxt.h"

crnlib/crn_file_utils.cpp

@@ -1,5 +1,5 @@
 // File: crn_file_utils.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_file_utils.h"
 #include "crn_strutils.h"

crnlib/crn_file_utils.h

@@ -1,5 +1,5 @@
 // File: crn_file_utils.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_find_files.cpp

@@ -1,5 +1,5 @@
 // File: crn_win32_find_files.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_find_files.h"
 #include "crn_file_utils.h"

crnlib/crn_find_files.h

@@ -1,5 +1,5 @@
 // File: crn_win32_find_files.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_freeimage_image_utils.h

@@ -1,5 +1,5 @@
 // File: crn_freeimage_image_utils.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 // Note: This header file requires FreeImage/FreeImagePlus.
 
 #include "crn_image_utils.h"

crnlib/crn_hash.h

@@ -1,5 +1,5 @@
 // File: crn_hash.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_hash_map.cpp

@@ -1,5 +1,5 @@
 // File: crn_hash_map.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_hash_map.h"
 #include "crn_rand.h"

crnlib/crn_hash_map.h

@@ -1,5 +1,5 @@
 // File: crn_hash_map.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 //
 // Notes:
 // stl-like hash map/hash set, with predictable performance across platforms/compilers/C run times/etc.

crnlib/crn_helpers.h

@@ -1,5 +1,5 @@
 // File: crn_helpers.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 #define CRNLIB_NO_COPY_OR_ASSIGNMENT_OP(c) c(const c&); c& operator= (const c&);

crnlib/crn_huffman_codes.cpp

@@ -1,5 +1,5 @@
 // File: crn_huffman_codes.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_huffman_codes.h"
 

crnlib/crn_huffman_codes.h

@@ -1,5 +1,5 @@
 // File: crn_huffman_codes.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_image.h

@@ -1,5 +1,5 @@
 // File: crn_image.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_color.h"
 #include "crn_vec.h"

crnlib/crn_image_utils.cpp

@@ -1,5 +1,5 @@
 // File: crn_image_utils.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_image_utils.h"
 #include "crn_console.h"
@@ -1305,7 +1305,7 @@ namespace crnlib
          *pActualComps = 0;
 
          if ((req_comps < 1) || (req_comps > 4))
-            return false;
+            return NULL;
 
          mipmapped_texture tex;
 

crnlib/crn_image_utils.h

@@ -1,5 +1,5 @@
 // File: crn_image_utils.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_image.h"
 #include "crn_data_stream_serializer.h"

crnlib/crn_intersect.h

@@ -1,5 +1,5 @@
 // File: crn_intersect.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_ray.h"
 

crnlib/crn_lzma_codec.cpp

@@ -1,5 +1,5 @@
 // File: crn_lzma_codec.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_lzma_codec.h"
 #include "crn_strutils.h"

crnlib/crn_lzma_codec.h

@@ -1,5 +1,5 @@
 // File: crn_lzma_codec.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_packed_uint.h"
 

crnlib/crn_math.cpp

@@ -1,5 +1,5 @@
 // File: crn_math.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 
 namespace crnlib

crnlib/crn_math.h

@@ -1,5 +1,5 @@
 // File: crn_math.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 #if defined(_M_IX86) && defined(_MSC_VER)

crnlib/crn_matrix.h

@@ -1,5 +1,5 @@
 // File: crn_matrix.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 #include "crn_vec.h"

crnlib/crn_mem.cpp

@@ -1,5 +1,5 @@
 // File: crn_mem.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_console.h"
 #include "../inc/crnlib.h"

crnlib/crn_mem.h

@@ -1,5 +1,5 @@
 // File: crn_mem.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 #ifndef CRNLIB_MIN_ALLOC_ALIGNMENT

crnlib/crn_mipmapped_texture.cpp

@@ -1,5 +1,5 @@
 // File: crn_dds_texture.cpp - Actually supports both .DDS and .KTX. Probably will rename this eventually.
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_mipmapped_texture.h"
 #include "crn_cfile_stream.h"

crnlib/crn_mipmapped_texture.h

@@ -1,5 +1,5 @@
 // File: crn_mipmapped_texture.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_dxt_image.h"
 #include "../inc/dds_defs.h"

crnlib/crn_packed_uint.h

@@ -1,5 +1,5 @@
 // File: crn_packed_uint
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_pixel_format.cpp

@@ -1,5 +1,5 @@
 // File: crn_pixel_format.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_pixel_format.h"
 #include "crn_image.h"

crnlib/crn_pixel_format.h

@@ -1,5 +1,5 @@
 // File: crn_pixel_format.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_dxt.h"
 #include "../inc/crnlib.h"

crnlib/crn_platform.cpp

@@ -1,5 +1,5 @@
 // File: crn_platform.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 
 #if CRNLIB_USE_WIN32_API

crnlib/crn_platform.h

@@ -1,5 +1,5 @@
 // File: crn_platform.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 bool crnlib_is_debugger_present(void);

crnlib/crn_prefix_coding.cpp

@@ -1,5 +1,5 @@
 // File: crn_prefix_coding.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_prefix_coding.h"
 //#include "rand.h"

crnlib/crn_prefix_coding.h

@@ -1,5 +1,5 @@
 // File: crn_prefix_coding.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_qdxt1.cpp

@@ -1,5 +1,5 @@
 // File: crn_qdxt.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_qdxt1.h"
 #include "crn_dxt1.h"

crnlib/crn_qdxt1.h

@@ -1,5 +1,5 @@
 // File: crn_qdxt1.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_dxt.h"
 #include "crn_hash_map.h"

crnlib/crn_qdxt5.cpp

@@ -1,5 +1,5 @@
 // File: crn_qdxt5.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_qdxt5.h"
 #include "crn_dxt5a.h"

crnlib/crn_qdxt5.h

@@ -1,5 +1,5 @@
 // File: crn_qdxt5.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_hash_map.h"
 #include "crn_clusterizer.h"

crnlib/crn_radix_sort.h

@@ -1,5 +1,5 @@
 // File: crn_radix_sort.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_rand.cpp

@@ -1,5 +1,5 @@
 // File: crn_rand.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 // See:
 // http://www.ciphersbyritter.com/NEWS4/RANDC.HTM
 // http://burtleburtle.net/bob/rand/smallprng.html

crnlib/crn_rand.h

@@ -1,5 +1,5 @@
 // File: crn_rand.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once 
 
 namespace crnlib

crnlib/crn_ray.h

@@ -1,5 +1,5 @@
 // File: crn_ray.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_vec.h"
 

crnlib/crn_rect.h

@@ -1,5 +1,5 @@
 // File: crn_rect.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_vec.h"
 #include "crn_hash.h"

crnlib/crn_rg_etc1.h

@@ -1,5 +1,5 @@
 // File: rg_etc1.h - Fast, high quality ETC1 block packer/unpacker - Rich Geldreich <richgel99@gmail.com>
-// Please see ZLIB license at the end of this file.
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib {
@@ -52,29 +52,3 @@ namespace rg_etc1
 
 } // namespace crnlib
 
-//------------------------------------------------------------------------------
-//
-// rg_etc1 uses the ZLIB license:
-// http://opensource.org/licenses/Zlib
-//
-// Copyright (c) 2012 Rich Geldreich
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-// claim that you wrote the original software. If you use this software
-// in a product, an acknowledgment in the product documentation would be
-// appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such, and must not be
-// misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//------------------------------------------------------------------------------

crnlib/crn_sparse_array.h

@@ -1,5 +1,5 @@
 // File: crn_sparse_array.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib
@@ -355,7 +355,7 @@ namespace crnlib
 
       inline T* alloc_group(bool nofail = false)
       {
-         T* p = static_cast<T*>(alloc_space(N * sizeof(T)));
+         T* p = static_cast<T*>(sparse_array_traits<T, Log2N>::alloc_space(N * sizeof(T)));
 
          if (!p)
          {
@@ -365,7 +365,7 @@ namespace crnlib
             CRNLIB_FAIL("Out of memory");
          }
 
-         construct_group(p);
+         sparse_array_traits<T, Log2N>::construct_group(p);
 
          m_num_active_groups++;
 
@@ -379,20 +379,20 @@ namespace crnlib
             CRNLIB_ASSERT(m_num_active_groups);
             m_num_active_groups--;
 
-            destruct_group(p);
+            sparse_array_traits<T, Log2N>::destruct_group(p);
 
-            free_space(p);
+            sparse_array_traits<T, Log2N>::free_space(p);
          }
       }
 
       inline void init_default()
       {
-         construct_element(reinterpret_cast<T*>(m_default));
+         sparse_array_traits<T, Log2N>::construct_element(reinterpret_cast<T*>(m_default));
       }
 
       inline void deinit_default()
       {
-         destruct_element(reinterpret_cast<T*>(m_default));
+         sparse_array_traits<T, Log2N>::destruct_element(reinterpret_cast<T*>(m_default));
       }
    };
 

crnlib/crn_sparse_bit_array.cpp

@@ -1,5 +1,5 @@
 // File: crn_sparse_bit_array.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_sparse_bit_array.h"
 

crnlib/crn_sparse_bit_array.h

@@ -1,5 +1,5 @@
 // File: crn_sparse_bit_array.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 namespace crnlib

crnlib/crn_strutils.cpp

@@ -1,5 +1,5 @@
 // File: crn_strutils.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_strutils.h"
 

crnlib/crn_strutils.h

@@ -1,5 +1,5 @@
 // File: crn_strutils.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 
 #ifdef WIN32

crnlib/crn_symbol_codec.cpp

@@ -1,5 +1,5 @@
 // File: crn_symbol_codec.cpp
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #include "crn_core.h"
 #include "crn_symbol_codec.h"
 #include "crn_huffman_codes.h"

crnlib/crn_symbol_codec.h

@@ -1,5 +1,5 @@
 // File: crn_symbol_codec.h
-// See Copyright Notice and license at the end of inc/crnlib.h
+// This software is in the public domain. Please see license.txt.
 #pragma once
 #include "crn_prefix_coding.h"