diff --git a/crnlib/crn_core.cpp b/crnlib/crn_core.cpp index 8dca8c5..763eab6 100644 --- a/crnlib/crn_core.cpp +++ b/crnlib/crn_core.cpp @@ -8,7 +8,7 @@ namespace crnlib { - const char *g_copyright_str = "Copyright (c) 2010-2016 Richard Geldreich, Jr. and Binomial LLC"; + const char *g_copyright_str = "Copyright (c) 2010-2016 Richard Geldreich, Jr. All rights reserved."; const char *g_sig_str = "C8cfRlaorj0wLtnMSxrBJxTC85rho2L9hUZKHcBL"; } // namespace crnlib diff --git a/crunch/crunch.cpp b/crunch/crunch.cpp index 782f6da..58b5456 100644 --- a/crunch/crunch.cpp +++ b/crunch/crunch.cpp @@ -1254,7 +1254,7 @@ static bool check_for_option(int argc, char *argv[], const char *pOption) static void print_title() { console::printf("crunch: Advanced DXTn Texture Compressor - https://github.com/BinomialLLC/crunch"); - console::printf("Copyright (c) 2010-2016 Richard Geldreich, Jr. and Binomial LLC"); + console::printf("Copyright (c) 2010-2016 Richard Geldreich, Jr. All rights reserved."); console::printf("crnlib version v%u.%02u %s Built %s, %s", CRNLIB_VERSION / 100U, CRNLIB_VERSION % 100U, crnlib_is_x64() ? "x64" : "x86", __DATE__, __TIME__); console::printf(""); } diff --git a/example1/example1.cpp b/example1/example1.cpp index 69d1a89..52ec039 100644 --- a/example1/example1.cpp +++ b/example1/example1.cpp @@ -33,7 +33,7 @@ const int cDefaultCRNQualityLevel = 128; static int print_usage() { printf("Description: Simple crnlib API example program.\n"); - printf("Copyright (c) 2010-2016 Richard Geldreich, Jr. and Binomial LLC\n"); + printf("Copyright (c) 2010-2016 Richard Geldreich, Jr. All rights reserved.\n"); printf("Usage: example1 [mode: i/c/d] [source_file] [options]\n"); printf("\nModes:\n"); printf("c: Compress to .DDS or .CRN using the crn_compress() func. in crnlib.h\n"); diff --git a/example2/example2.cpp b/example2/example2.cpp index 63c46ba..d1d6d40 100644 --- a/example2/example2.cpp +++ b/example2/example2.cpp @@ -24,7 +24,7 @@ using namespace crnlib; static int print_usage() { printf("Description: Transcodes .CRN to .DDS files using crn_decomp.h.\n"); - printf("Copyright (c) 2010-2016 Richard Geldreich, Jr. and Binomial LLC\n"); + printf("Copyright (c) 2010-2016 Richard Geldreich, Jr. All rights reserved.\n"); printf("Usage: example2 [source_file] [options]\n"); printf("\nOptions:\n"); printf("-out filename - Force output filename.\n"); diff --git a/example3/example3.cpp b/example3/example3.cpp index 0732feb..6ea8f3a 100644 --- a/example3/example3.cpp +++ b/example3/example3.cpp @@ -29,7 +29,7 @@ const uint cDXTBlockSize = 4; static int print_usage() { printf("Description: Simple .DDS DXTn block compression using crnlib.\n"); - printf("Copyright (c) 2010-2016 Binomial LLC\n"); + printf("Copyright (c) 2010-2016 Richard Geldreich, Jr. All rights reserved.\n"); printf("Usage: example3 [source_file] [options]\n"); printf("\n"); printf("Note: This simple example is not multithreaded, so it's not going to be\n"); diff --git a/inc/crn_decomp.h b/inc/crn_decomp.h index 680beb1..2c626af 100644 --- a/inc/crn_decomp.h +++ b/inc/crn_decomp.h @@ -1,5 +1,5 @@ // File: crn_decomp.h - Fast CRN->DXTc texture transcoder header file library -// Copyright (c) 2010-2016 Richard Geldreich, Jr. and Binomial LLC +// Copyright (c) 2010-2016 Richard Geldreich, Jr. All rights reserved. // See Copyright Notice and license at the end of this file. // // This single header file contains *all* of the code necessary to unpack .CRN files to raw DXTn bits. @@ -4811,29 +4811,33 @@ namespace crnd #endif // CRND_HEADER_FILE_ONLY -//------------------------------------------------------------------------------ -// -// crn_decomp.h uses the ZLIB license: -// http://opensource.org/licenses/Zlib -// -// Copyright (c) 2010-2016 Richard Geldreich, Jr. and Binomial LLC -// -// 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. -// -//------------------------------------------------------------------------------ + //------------------------------------------------------------------------------ + // + // crunch/crnlib uses a modified ZLIB license. Specifically, it's the same as zlib except that + // public credits for using the library are *required*. + // + // Copyright (c) 2010-2016 Richard Geldreich, Jr. All rights reserved. + // + // 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. + // + // 2. If you use this software in a product, this acknowledgment in the product + // documentation or credits is required: + // + // "Crunch Library Copyright (c) 2010-2016 Richard Geldreich, Jr." + // + // 3. Altered source versions must be plainly marked as such, and must not be + // misrepresented as being the original software. + // + // 4. This notice may not be removed or altered from any source distribution. + // + //------------------------------------------------------------------------------ + diff --git a/inc/crnlib.h b/inc/crnlib.h index 641f53f..f07142a 100644 --- a/inc/crnlib.h +++ b/inc/crnlib.h @@ -1,5 +1,5 @@ // File: crnlib.h - Advanced DXTn texture compression library. -// Copyright (c) 2010-2016 Richard Geldreich, Jr. and Binomial LLC +// Copyright (c) 2010-2016 Richard Geldreich, Jr. All rights reserved. // See copyright notice and license at the end of this file. // // This header file contains the public crnlib declarations for DXTn,