summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c')
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c44
1 files changed, 34 insertions, 10 deletions
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c b/xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c
index fdc043c93..9c5d827b1 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c
@@ -1,10 +1,35 @@
-/* $XConsortium: jdlossy.c,v 1.2 93/10/31 09:47:12 dpw Exp $ */
+/* $XConsortium: jdlossy.c,v 1.3 94/01/12 20:19:17 rws Exp $ */
/* Module jdlossy.c */
/****************************************************************************
+
+Copyright (c) 1993, 1994 X Consortium
+
+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
+X CONSORTIUM 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.
+
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
+
+
NOTICE
-This software is being provided by AGE Logic, Inc. and MIT under the
+This software is being provided by AGE Logic, Inc. under the
following license. By obtaining, using and/or copying this software,
you agree that you have read, understood, and will comply with these
terms and conditions:
@@ -17,27 +42,26 @@ terms and conditions:
the disclaimer, and that the same appears on all copies and
derivative works of the software and documentation you make.
- "Copyright 1993, 1994 by AGE Logic, Inc. and the Massachusetts
- Institute of Technology"
+ "Copyright 1993, 1994 by AGE Logic, Inc."
- THIS SOFTWARE IS PROVIDED "AS IS". AGE LOGIC AND MIT MAKE NO
+ THIS SOFTWARE IS PROVIDED "AS IS". AGE LOGIC MAKES NO
REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. By way of
- example, but not limitation, AGE LOGIC AND MIT MAKE NO
+ example, but not limitation, AGE LOGIC MAKE NO
REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE SOFTWARE DOES NOT
- INFRINGE THIRD-PARTY PROPRIETARY RIGHTS. AGE LOGIC AND MIT
+ INFRINGE THIRD-PARTY PROPRIETARY RIGHTS. AGE LOGIC
SHALL BEAR NO LIABILITY FOR ANY USE OF THIS SOFTWARE. IN NO
EVENT SHALL EITHER PARTY BE LIABLE FOR ANY INDIRECT,
INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS
OF PROFITS, REVENUE, DATA OR USE, INCURRED BY EITHER PARTY OR
ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT OR
- BASED ON A WARRANTY, EVEN IF AGE LOGIC OR MIT OR LICENSEES
+ BASED ON A WARRANTY, EVEN IF AGE LOGIC LICENSEES
HEREUNDER HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
- The names of AGE Logic, Inc. and MIT may not be used in
+ The name of AGE Logic, Inc. may not be used in
advertising or publicity pertaining to this software without
- specific, written prior permission from AGE Logic and MIT.
+ specific, written prior permission from AGE Logic.
Title to this software shall at all times remain with AGE
Logic, Inc.