shithub: jbig2

Download patch

ref: 13cc9dc158f12c3f446579655e942e44ac158634
parent: 48fd721f3fb53b3fd10456e508b06d808ee9e647
author: Chris Liddell <[email protected]>
date: Mon Aug 13 13:03:22 EDT 2012

Update copyright headers.

--- a/config_win32.h
+++ b/config_win32.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002-2003 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 /* configuration header file for compiling under Microsoft Windows */
 
--- a/jbig2.c
+++ b/jbig2.c
@@ -1,21 +1,23 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is provided AS-IS with no warranty,
-    either express or implied.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+/*
+    jbig2dec
 */
 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -57,12 +59,12 @@
 void *
 jbig2_alloc (Jbig2Allocator *allocator, size_t size, size_t num)
 {
-    /* check for integer multiplication overflow */
-    int64_t check = ((int64_t)num)*((int64_t)size);
-    if (check != (int)check)
-      return NULL;
-    else
-      return allocator->alloc (allocator, (int)check);
+  /* check for integer multiplication overflow */
+  int64_t check = ((int64_t)num)*((int64_t)size);
+  if (check != (int)check)
+    return NULL;
+  else
+    return allocator->alloc (allocator, (int)check);
 }
 
 void
@@ -74,12 +76,12 @@
 void *
 jbig2_realloc (Jbig2Allocator *allocator, void *p, size_t size, size_t num)
 {
-    /* check for integer multiplication overflow */
-    int64_t check = ((int64_t)num)*((int64_t)size);
-    if (check != (int)check)
-      return NULL;
-    else
-      return allocator->realloc (allocator, p, (int)check);
+  /* check for integer multiplication overflow */
+  int64_t check = ((int64_t)num)*((int64_t)size);
+  if (check != (int)check)
+    return NULL;
+  else
+    return allocator->realloc (allocator, p, (int)check);
 }
 
 static int
--- a/jbig2.h
+++ b/jbig2.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 #ifdef __cplusplus
 extern "C" {
--- a/jbig2_arith.c
+++ b/jbig2_arith.c
@@ -1,21 +1,23 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is provided AS-IS with no warranty,
-    either express or implied.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+/*
+    jbig2dec
 */
 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -157,8 +159,6 @@
 }
 
 #if defined(JBIG2_DEBUG) || defined(JBIG2_DEBUG_ARITH)
-#include <stdio.h>
-
 static void
 jbig2_arith_trace (Jbig2ArithState *as, Jbig2ArithCx cx)
 {
--- a/jbig2_arith.h
+++ b/jbig2_arith.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 typedef struct _Jbig2ArithState Jbig2ArithState;
 
--- a/jbig2_arith_iaid.c
+++ b/jbig2_arith_iaid.c
@@ -1,20 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is provided AS-IS with no warranty,
-    either express or implied.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+/*
+    jbig2dec
 */
+
 
 /* Annex A.3 */
 
--- a/jbig2_arith_iaid.h
+++ b/jbig2_arith_iaid.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 typedef struct _Jbig2ArithIaidCtx Jbig2ArithIaidCtx;
 
--- a/jbig2_arith_int.c
+++ b/jbig2_arith_int.c
@@ -1,20 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is provided AS-IS with no warranty,
-    either express or implied.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+/*
+    jbig2dec
 */
+
 
 /* Annex A */
 
--- a/jbig2_arith_int.h
+++ b/jbig2_arith_int.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 typedef struct _Jbig2ArithIntCtx Jbig2ArithIntCtx;
 
--- a/jbig2_generic.c
+++ b/jbig2_generic.c
@@ -1,20 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is provided AS-IS with no warranty,
-    either express or implied.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+/*
+    jbig2dec
 */
+
 
 /**
  * Generic region handlers.
--- a/jbig2_generic.h
+++ b/jbig2_generic.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002-2004 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 /**
  * Headers for Generic and Generic Refinement region handling
--- a/jbig2_halftone.c
+++ b/jbig2_halftone.c
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 /* JBIG2 Pattern Dictionary and Halftone Region decoding */
 
--- a/jbig2_halftone.h
+++ b/jbig2_halftone.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2012 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 #ifndef _JBIG2_HALFTONE_H
 #define _JBIG2_HALFTONE_H
--- a/jbig2_huffman.c
+++ b/jbig2_huffman.c
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 /* Huffman table decoding procedures
     -- See Annex B of the JBIG2 specification */
--- a/jbig2_huffman.h
+++ b/jbig2_huffman.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 #ifndef JBIG2_HUFFMAN_H
 #define JBIG2_HUFFMAN_H
--- a/jbig2_hufftab.h
+++ b/jbig2_hufftab.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 /* predefined Huffman table definitions
     -- See Annex B of the JBIG2 specification */
--- a/jbig2_image.c
+++ b/jbig2_image.c
@@ -1,18 +1,23 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
 
+/*
+    jbig2dec
+*/
+
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -55,7 +60,7 @@
         image->data = jbig2_new(ctx, uint8_t, (int)check);
 	if (image->data == NULL) {
         jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1,
-                "could not allocate image data buffer! [stride(%d)*height(%d) bytes]",
+            "could not allocate image data buffer! [stride(%d)*height(%d) bytes]",
                 stride, height);
 		jbig2_free(ctx->allocator, image);
 		return NULL;
--- a/jbig2_image.h
+++ b/jbig2_image.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2002 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 
 #ifndef _JBIG2_IMAGE_H
--- a/jbig2_image_pbm.c
+++ b/jbig2_image_pbm.c
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2009 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/jbig2_image_png.c
+++ b/jbig2_image_png.c
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/jbig2_metadata.c
+++ b/jbig2_metadata.c
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2003 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/jbig2_metadata.h
+++ b/jbig2_metadata.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2003 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 
 #ifndef _JBIG2_METADATA_H
--- a/jbig2_mmr.c
+++ b/jbig2_mmr.c
@@ -1,20 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2002 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is provided AS-IS with no warranty,
-    either express or implied.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+/*
+    jbig2dec
 */
+
 
 /* An implementation of MMR decoding. This is based on the
    implementation in Fitz, which in turn is based on the one
--- a/jbig2_mmr.h
+++ b/jbig2_mmr.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 int
 jbig2_decode_generic_mmr(Jbig2Ctx *ctx,
--- a/jbig2_page.c
+++ b/jbig2_page.c
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/jbig2_priv.h
+++ b/jbig2_priv.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 /* library internals */
 
--- a/jbig2_refinement.c
+++ b/jbig2_refinement.c
@@ -1,20 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2004 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is provided AS-IS with no warranty,
-    either express or implied.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+/*
+    jbig2dec
 */
+
 
 /**
  * Generic Refinement region handlers.
--- a/jbig2_segment.c
+++ b/jbig2_segment.c
@@ -1,18 +1,23 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
 
+/*
+    jbig2dec
+*/
+
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -158,7 +163,7 @@
 	  if (segment->result != NULL)
 	    jbig2_image_release(ctx, (Jbig2Image*)segment->result);
 	  break;
-       case 16: /* pattern dictionary */
+	case 16: /* pattern dictionary */
       if (segment->result != NULL)
         jbig2_hd_release(ctx, (Jbig2PatternDict*)segment->result);
       break;
--- a/jbig2_symbol_dict.c
+++ b/jbig2_symbol_dict.c
@@ -1,18 +1,23 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
 
+/*
+    jbig2dec
+*/
+
+
 /* symbol dictionary segment decode and support */
 
 #ifdef HAVE_CONFIG_H
@@ -650,7 +655,6 @@
 	if (code || (BMSIZE < 0)) {
 	  jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
 	    "error decoding size of collective bitmap!");
-          jbig2_image_release(ctx, image);
 	  goto cleanup4;
 	}
 
@@ -712,7 +716,7 @@
       {
           jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
               "failed to copy the collective bitmap into symbol dictionary");
-	  jbig2_image_release(ctx, image);
+          jbig2_image_release(ctx, image);
           goto cleanup4;
       }
 	  jbig2_image_compose(ctx, glyph, image, -x, 0, JBIG2_COMPOSE_REPLACE);
@@ -1004,7 +1008,7 @@
   offset += 8;
 
   jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number,
-              "symbol dictionary, flags=%04x, %u exported syms, %u new syms",
+	      "symbol dictionary, flags=%04x, %u exported syms, %u new syms",
 	      flags, params.SDNUMEXSYMS, params.SDNUMNEWSYMS);
 
   /* 7.4.2.2 (2) */
--- a/jbig2_symbol_dict.h
+++ b/jbig2_symbol_dict.h
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2002 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 /* symbol dictionary header */
 
--- a/jbig2_text.c
+++ b/jbig2_text.c
@@ -1,18 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002-2008 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
 
+/*
+    jbig2dec
+*/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -841,7 +845,7 @@
     ws = jbig2_word_stream_buf_new(ctx, segment_data + offset, segment->data_length - offset);
     if (ws == NULL)
     {
-         code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+        code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
             "couldn't allocate ws in text region image");
         goto cleanup2;
     }
@@ -894,8 +898,8 @@
     code = jbig2_decode_text_region(ctx, segment, &params,
         (const Jbig2SymbolDict * const *)dicts, n_dicts, image,
         segment_data + offset, segment->data_length - offset,
-        GR_stats, as, ws);
-     if (code < 0)
+		GR_stats, as, ws);
+    if (code < 0)
     {
         jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
             "failed to decode text region image data");
--- a/jbig2_text.h
+++ b/jbig2_text.h
@@ -1,16 +1,20 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002-2004 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
+
+/*
+    jbig2dec
 */
 
 /**
--- a/jbig2dec.c
+++ b/jbig2dec.c
@@ -1,17 +1,22 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2009 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
+/*
+    jbig2dec
+*/
+
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/memcmp.c
+++ b/memcmp.c
@@ -1,16 +1,20 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2001-2005 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
+
+/*
+    jbig2dec
 */
 
 #ifdef HAVE_CONFIG_H
--- a/memento.c
+++ b/memento.c
@@ -1,15 +1,18 @@
-/* Copyright (C) 2011 Artifex Software, Inc.
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
    All Rights Reserved.
 
    This software is provided AS-IS with no warranty, either express or
    implied.
 
-   This software is distributed under license and may not be copied, modified
-   or distributed except as expressly authorized under the terms of that
-   license.  Refer to licensing information at http://www.artifex.com/
-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
+
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
 
 /* Inspired by Fortify by Simon P Bullen. */
 
--- a/memento.h
+++ b/memento.h
@@ -1,15 +1,18 @@
-/* Copyright (C) 2011 Artifex Software, Inc.
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
    All Rights Reserved.
 
    This software is provided AS-IS with no warranty, either express or
    implied.
 
-   This software is distributed under license and may not be copied, modified
-   or distributed except as expressly authorized under the terms of that
-   license.  Refer to licensing information at http://www.artifex.com/
-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
+
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
+
 
 /* Memento: A library to aid debugging of memory leaks/heap corruption.
  *
--- a/os_types.h
+++ b/os_types.h
@@ -1,16 +1,20 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2003 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
+
+/*
+    jbig2dec
 */
 
 /*
--- a/pbm2png.c
+++ b/pbm2png.c
@@ -1,16 +1,20 @@
-/*
-    jbig2dec
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
 
-    Copyright (C) 2002 Artifex Software, Inc.
+   This software is provided AS-IS with no warranty, either express or
+   implied.
 
-    This software is distributed under license and may not
-    be copied, modified or distributed except as expressly
-    authorized under the terms of the license contained in
-    the file LICENSE in this distribution.
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
 
-    For further licensing information refer to http://artifex.com/ or
-    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
+
+/*
+    jbig2dec
 */
 
 #ifdef HAVE_CONFIG_H