Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libjpeg_turbo / jdmerge.c

diff --git a/src/third_party/libjpeg_turbo/jdmerge.c b/src/third_party/libjpeg_turbo/jdmerge.c
index 5336125..9830be2 100644 (file)
--- a/src/third_party/libjpeg_turbo/jdmerge.c
+++ b/src/third_party/libjpeg_turbo/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.