From 729c8c2982164ce67dd291ce73a2cdc6dfe0ca65 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 18 Jul 2011 12:41:17 +0200 Subject: [PATCH] properly mark everything as MIT licensed --- Makefile.am | 6 +++--- s2tc_algorithm.cpp | 23 +++++++++++++++++++++++ s2tc_algorithm.h | 21 +++++++++++++++++++++ s2tc_common.h | 21 +++++++++++++++++++++ s2tc_compress.cpp | 23 +++++++++++++++++++++++ s2tc_decompress.cpp | 23 +++++++++++++++++++++++ s2tc_libtxc_dxtn.cpp | 23 +++++++++++++++++++++++ s2tc_license.h | 27 +++++++++++++++++++++++++++ 8 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 s2tc_license.h diff --git a/Makefile.am b/Makefile.am index 6223ced..6cf2e10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,13 @@ ACLOCAL_AMFLAGS = -I m4 bin_PROGRAMS = s2tc_compress s2tc_decompress -s2tc_compress_SOURCES = s2tc_compress.cpp +s2tc_compress_SOURCES = s2tc_compress.cpp txc_dxtn.h s2tc_license.h s2tc_compress_LDADD = libtxc_dxtn.la -s2tc_decompress_SOURCES = s2tc_decompress.cpp +s2tc_decompress_SOURCES = s2tc_decompress.cpp txc_dxtn.h s2tc_license.h s2tc_decompress_LDADD = libtxc_dxtn.la lib_LTLIBRARIES = libtxc_dxtn.la -libtxc_dxtn_la_SOURCES = s2tc_algorithm.cpp s2tc_libtxc_dxtn.cpp s2tc_common.h s2tc_algorithm.h txc_dxtn.h +libtxc_dxtn_la_SOURCES = s2tc_algorithm.cpp s2tc_libtxc_dxtn.cpp s2tc_common.h s2tc_algorithm.h txc_dxtn.h s2tc_license.h libtxc_dxtn_la_LDFLAGS = -versioninfo 0:0:0 libtxc_dxtn_la_LIBADD = -lm libtxc_dxtn_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement diff --git a/s2tc_algorithm.cpp b/s2tc_algorithm.cpp index 3a0e7d2..c432486 100644 --- a/s2tc_algorithm.cpp +++ b/s2tc_algorithm.cpp @@ -1,3 +1,26 @@ +/* + * Copyright (C) 2011 Rudolf Polzer All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * RUDOLF POLZER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +#define S2TC_LICENSE_IDENTIFIER s2tc_algorithm_license +#include "s2tc_license.h" + #include #include #include diff --git a/s2tc_algorithm.h b/s2tc_algorithm.h index 23beb93..7316266 100644 --- a/s2tc_algorithm.h +++ b/s2tc_algorithm.h @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2011 Rudolf Polzer All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * RUDOLF POLZER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + #ifndef S2TC_COMPRESSOR_H #define S2TC_COMPRESSOR_H diff --git a/s2tc_common.h b/s2tc_common.h index 69e4a90..07b8790 100644 --- a/s2tc_common.h +++ b/s2tc_common.h @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2011 Rudolf Polzer All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * RUDOLF POLZER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + #ifndef S2TC_COMMON_H #define S2TC_COMMON_H diff --git a/s2tc_compress.cpp b/s2tc_compress.cpp index 93b08b5..f2337e5 100644 --- a/s2tc_compress.cpp +++ b/s2tc_compress.cpp @@ -1,3 +1,26 @@ +/* + * Copyright (C) 2011 Rudolf Polzer All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * RUDOLF POLZER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +#define S2TC_LICENSE_IDENTIFIER s2tc_compress_license +#include "s2tc_license.h" + #include #include #include diff --git a/s2tc_decompress.cpp b/s2tc_decompress.cpp index 599e011..a2dd7e0 100644 --- a/s2tc_decompress.cpp +++ b/s2tc_decompress.cpp @@ -1,3 +1,26 @@ +/* + * Copyright (C) 2011 Rudolf Polzer All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * RUDOLF POLZER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +#define S2TC_LICENSE_IDENTIFIER s2tc_decompress_license +#include "s2tc_license.h" + #include #include #include diff --git a/s2tc_libtxc_dxtn.cpp b/s2tc_libtxc_dxtn.cpp index 35dce98..147d736 100644 --- a/s2tc_libtxc_dxtn.cpp +++ b/s2tc_libtxc_dxtn.cpp @@ -1,3 +1,26 @@ +/* + * Copyright (C) 2011 Rudolf Polzer All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * RUDOLF POLZER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +#define S2TC_LICENSE_IDENTIFIER s2tc_libtxc_dxtn_license +#include "s2tc_license.h" + extern "C" { #include "txc_dxtn.h" diff --git a/s2tc_license.h b/s2tc_license.h new file mode 100644 index 0000000..446c22c --- /dev/null +++ b/s2tc_license.h @@ -0,0 +1,27 @@ +// A helper source file to include the license text into the shared library +// +// We do this to ensure that the only condition of the MIT license is +// automatically fulfilled without another program author doing anything +// special. + +// NOTE: this is NOT static! We WANT to create an external symbol of this. +const char *S2TC_LICENSE_IDENTIFIER = +"Copyright (C) 2011 Rudolf Polzer All Rights Reserved.\n" +"\n" +"Permission is hereby granted, free of charge, to any person obtaining a\n" +"copy of this software and associated documentation files (the \"Software\"),\n" +"to deal in the Software without restriction, including without limitation\n" +"the rights to use, copy, modify, merge, publish, distribute, sublicense,\n" +"and/or sell copies of the Software, and to permit persons to whom the\n" +"Software is furnished to do so, subject to the following conditions:\n" +"\n" +"The above copyright notice and this permission notice shall be included\n" +"in all copies or substantial portions of the Software.\n" +"\n" +"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\n" +"OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n" +"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL\n" +"RUDOLF POLZER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\n" +"AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\n" +"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n" +; -- 2.11.0