diff --git a/debian-unstable-upstream/copyright b/debian-unstable-upstream/copyright index 2abe00d65..799ff70a5 100644 --- a/debian-unstable-upstream/copyright +++ b/debian-unstable-upstream/copyright @@ -155,9 +155,11 @@ License: BSD (3 clause) OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: plugins/zzogl-pg/opengl/ZeroGSShaders/* plugins/zzogl-pg/opengl/zpipe* -Copyright: Unknown +Files: plugins/zzogl-pg/opengl/zpipe.cpp +Copyright: public domain +Files: plugins/zzogl-pg/opengl/ZeroGSShaders/zerogsshaders* +Copyright: Unknown The Debian packaging is: diff --git a/debian-upstream/copyright b/debian-upstream/copyright index 2abe00d65..799ff70a5 100644 --- a/debian-upstream/copyright +++ b/debian-upstream/copyright @@ -155,9 +155,11 @@ License: BSD (3 clause) OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: plugins/zzogl-pg/opengl/ZeroGSShaders/* plugins/zzogl-pg/opengl/zpipe* -Copyright: Unknown +Files: plugins/zzogl-pg/opengl/zpipe.cpp +Copyright: public domain +Files: plugins/zzogl-pg/opengl/ZeroGSShaders/zerogsshaders* +Copyright: Unknown The Debian packaging is: diff --git a/plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.cpp b/plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.cpp index 23eef6e76..f4e946849 100644 --- a/plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.cpp +++ b/plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.cpp @@ -1,10 +1,9 @@ - /* ZeroGS KOSMOS - * - * Zerofrog's ZeroGS KOSMOS (c)2005-2008 - * - * Zerofrog forgot to write any copyright notice after release the plugin into GPLv2 - * If someone can contact him successfully to clarify this matter that would be great. - */ +/* The file is based of zpipe.c + minor rename and minor adaptation + * + * zpipe.c: example of proper use of zlib's inflate() and deflate() + * Not copyrighted -- provided to the public domain + * Version 1.4 11 December 2005 Mark Adler + */ // zpipe.cpp : Defines the entry point for the console application. // diff --git a/plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.h b/plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.h index b8c13d248..6562c7b5d 100644 --- a/plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.h +++ b/plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.h @@ -1,10 +1,21 @@ - /* ZeroGS KOSMOS - * - * Zerofrog's ZeroGS KOSMOS (c)2005-2008 - * - * Zerofrog forgot to write any copyright notice after release the plugin into GPLv2 - * If someone can contact him successfully to clarify this matter that would be great. - */ +/* ZZ Open GL graphics plugin + * Copyright (c)2009-2010 zeydlitz@gmail.com, arcum42@gmail.com + * Based on Zerofrog's ZeroGS KOSMOS (c)2005-2008 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ #ifndef zpipe_h #define zpipe_h diff --git a/plugins/zzogl-pg/opengl/zpipe.cpp b/plugins/zzogl-pg/opengl/zpipe.cpp index 1c58fe5d1..45f80824d 100644 --- a/plugins/zzogl-pg/opengl/zpipe.cpp +++ b/plugins/zzogl-pg/opengl/zpipe.cpp @@ -1,13 +1,9 @@ - /* ZeroGS KOSMOS - * - * Zerofrog's ZeroGS KOSMOS (c)2005-2008 - * - * Zerofrog forgot to write any copyright notice after release the plugin into GPLv2 - * If someone can contact him successfully to clarify this matter that would be great. - */ - -// zpipe.cpp : Defines the entry point for the console application. -// +/* The file is based of zpipe.c + minor rename and minor adaptation + * + * zpipe.c: example of proper use of zlib's inflate() and deflate() + * Not copyrighted -- provided to the public domain + * Version 1.4 11 December 2005 Mark Adler + */ #include @@ -18,14 +14,11 @@ //#define ZLIB_WINAPI #include "zlib.h" -int def(char *src, char *dst, int bytes_to_compress, int *bytes_after_compressed) ; -int inf(char *src, char *dst, int bytes_to_decompress, int maximum_after_decompress) ; - int def(char *src, char *dst, int bytes_to_compress, int *bytes_after_compressed) { z_stream strm; - int ret;//, flush; + int ret; unsigned have; /* allocate deflate state */ @@ -63,7 +56,6 @@ int inf(char *src, char *dst, int bytes_to_decompress, int maximum_after_decompr z_stream strm; int ret; - //unsigned have; /* allocate inflate state */ strm.zalloc = Z_NULL; diff --git a/plugins/zzogl-pg/opengl/zpipe.h b/plugins/zzogl-pg/opengl/zpipe.h index b8c13d248..6562c7b5d 100644 --- a/plugins/zzogl-pg/opengl/zpipe.h +++ b/plugins/zzogl-pg/opengl/zpipe.h @@ -1,10 +1,21 @@ - /* ZeroGS KOSMOS - * - * Zerofrog's ZeroGS KOSMOS (c)2005-2008 - * - * Zerofrog forgot to write any copyright notice after release the plugin into GPLv2 - * If someone can contact him successfully to clarify this matter that would be great. - */ +/* ZZ Open GL graphics plugin + * Copyright (c)2009-2010 zeydlitz@gmail.com, arcum42@gmail.com + * Based on Zerofrog's ZeroGS KOSMOS (c)2005-2008 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ #ifndef zpipe_h #define zpipe_h