From 60f78cf536c2de0345fde23cd9e7d370590cd0ff Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Fri, 5 Sep 2008 09:19:48 +0000 Subject: Change libnsbmp to MIT licence svn path=/trunk/libnsbmp/; revision=5242 --- COPYING | 20 ++++++++++++++++++++ examples/decode_bmp.c | 16 +++------------- examples/decode_ico.c | 16 +++------------- libnsbmp.c | 18 ++++-------------- utils/log.h | 19 ++++--------------- 5 files changed, 34 insertions(+), 55 deletions(-) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..5e3d030 --- /dev/null +++ b/COPYING @@ -0,0 +1,20 @@ +Copyright (C) 2006 Richard Wilson +Copyright (C) 2008 Sean Fox + +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 THE +AUTHORS OR COPYRIGHT HOLDERS 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. diff --git a/examples/decode_bmp.c b/examples/decode_bmp.c index dbf83e2..8675b34 100644 --- a/examples/decode_bmp.c +++ b/examples/decode_bmp.c @@ -2,19 +2,9 @@ * Copyright 2008 Sean Fox * Copyright 2008 James Bursa * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf 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; version 2 of the License. - * - * NetSurf 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, see . + * This file is part of NetSurf's libnsbmp, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php */ #include diff --git a/examples/decode_ico.c b/examples/decode_ico.c index b02cd57..c940606 100644 --- a/examples/decode_ico.c +++ b/examples/decode_ico.c @@ -2,19 +2,9 @@ * Copyright 2008 Sean Fox * Copyright 2008 James Bursa * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf 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; version 2 of the License. - * - * NetSurf 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, see . + * This file is part of NetSurf's libnsbmp, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php */ #include diff --git a/libnsbmp.c b/libnsbmp.c index d671c54..fb1d147 100644 --- a/libnsbmp.c +++ b/libnsbmp.c @@ -1,20 +1,10 @@ /* - * Copyright 2006 Richard Wilson + * Copyright 2006 Richard Wilson * Copyright 2008 Sean Fox * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf 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; version 2 of the License. - * - * NetSurf 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, see . + * This file is part of NetSurf's libnsbmp, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php */ #include diff --git a/utils/log.h b/utils/log.h index 18b68d0..cfea5e9 100644 --- a/utils/log.h +++ b/utils/log.h @@ -1,27 +1,16 @@ /* * Copyright 2003 James Bursa * Copyright 2004 John Tytgat - * Copyright 2008 Sean Fox * * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf 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; version 2 of the License. - * - * NetSurf 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, see . + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php */ #include -#ifndef _LIBNSBMP_LOG_H_ -#define _LIBNSBMP_LOG_H_ +#ifndef _LIBNSGIF_LOG_H_ +#define _LIBNSGIF_LOG_H_ #ifdef NDEBUG # define LOG(x) ((void) 0) -- cgit v1.2.3