summaryrefslogtreecommitdiff
path: root/jdmerge.c
diff options
context:
space:
mode:
Diffstat (limited to 'jdmerge.c')
-rw-r--r--jdmerge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/jdmerge.c b/jdmerge.c
index 5336125..9830be2 100644
--- a/jdmerge.c
+++ b/jdmerge.c
@@ -1,10 +1,11 @@
/*
* jdmerge.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1996, Thomas G. Lane.
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
+ * libjpeg-turbo Modifications:
* Copyright (C) 2009, 2011, D. R. Commander.
- * This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
* This file contains code for merged upsampling/color conversion.