From 0f9124272d70bcc812f5e2ecb3839df8c2e623d0 Mon Sep 17 00:00:00 2001 From: "Adam D. Moss" Date: Tue, 13 May 2003 14:59:03 +0000 Subject: [PATCH] plug-ins/common/gif.c bolsh got permission from David Koblas to relicense * plug-ins/common/gif.c * plug-ins/common/gifload.c: bolsh got permission from David Koblas to relicense the prehistoric code that begat the original GIMP GIF plugin, so Koblas' mildly-GPL-unfriendly license boilerplate can finally rest in peace. --- ChangeLog | 8 ++++++++ plug-ins/common/gif.c | 16 +++++----------- plug-ins/common/gifload.c | 16 +++++----------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a3db6dea6..0f8d611620 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-05-13 Adam D. Moss + + * plug-ins/common/gif.c + * plug-ins/common/gifload.c: bolsh got permission from David Koblas + to relicense the prehistoric code that begat the original GIMP GIF + plugin, so Koblas' mildly-GPL-unfriendly license boilerplate can + finally rest in peace. + 2003-05-13 Michael Natterer * app/core/gimpitem.[ch]: added "gboolean clip_result" to diff --git a/plug-ins/common/gif.c b/plug-ins/common/gif.c index 3c511976b2..cc6b0a0760 100644 --- a/plug-ins/common/gif.c +++ b/plug-ins/common/gif.c @@ -19,6 +19,11 @@ * CompuServe Incorporated. GIF(sm) is a Service Mark property of * CompuServe Incorporated." */ +/* Copyright notice for GIF code from which this plugin was long ago */ +/* derived (David Koblas has granted permission to relicense): */ +/* +-------------------------------------------------------------------+ */ +/* | Copyright 1990, 1991, 1993, David Koblas. (koblas@extra.com) | */ +/* +-------------------------------------------------------------------+ */ /* * REVISION HISTORY @@ -252,17 +257,6 @@ * */ -/* Copyright notice for code which this plugin was long ago derived from */ -/* +-------------------------------------------------------------------+ */ -/* | Copyright 1990, 1991, 1993, David Koblas. (koblas@netcom.com) | */ -/* | Permission to use, copy, modify, and distribute this software | */ -/* | and its documentation for any purpose and without fee is hereby | */ -/* | granted, provided that the above copyright notice appear in all | */ -/* | copies and that both that copyright notice and this permission | */ -/* | notice appear in supporting documentation. This software is | */ -/* | provided "as is" without express or implied warranty. | */ -/* +-------------------------------------------------------------------+ */ - #include "config.h" #include diff --git a/plug-ins/common/gifload.c b/plug-ins/common/gifload.c index 0a36592288..1b14f09659 100644 --- a/plug-ins/common/gifload.c +++ b/plug-ins/common/gifload.c @@ -19,6 +19,11 @@ * CompuServe Incorporated. GIF(sm) is a Service Mark property of * CompuServe Incorporated." */ +/* Copyright notice for GIF code from which this plugin was long ago */ +/* derived (David Koblas has granted permission to relicense): */ +/* +-------------------------------------------------------------------+ */ +/* | Copyright 1990, 1991, 1993, David Koblas. (koblas@extra.com) | */ +/* +-------------------------------------------------------------------+ */ /* * REVISION HISTORY @@ -54,17 +59,6 @@ * - Remove unused colourmap entries for GRAYSCALE images. */ -/* Copyright notice for code which this plugin was long ago derived from */ -/* +-------------------------------------------------------------------+ */ -/* | Copyright 1990, 1991, 1993, David Koblas. (koblas@netcom.com) | */ -/* | Permission to use, copy, modify, and distribute this software | */ -/* | and its documentation for any purpose and without fee is hereby | */ -/* | granted, provided that the above copyright notice appear in all | */ -/* | copies and that both that copyright notice and this permission | */ -/* | notice appear in supporting documentation. This software is | */ -/* | provided "as is" without express or implied warranty. | */ -/* +-------------------------------------------------------------------+ */ - #include "config.h" #include