diff options
| author | Antonin Descampe <antonin@gmail.com> | 2014-04-10 11:36:37 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2014-04-10 11:36:37 +0000 |
| commit | 5c2a08edd71f75e5aa6b5240b152d9b395523e7e (patch) | |
| tree | 45ae8ab3b0629b96930b5a2c26fc20a088212d6a /src/lib/openjp2/opj_malloc.h | |
| parent | d7c5c8518f9c9defdff3e0df034fbcac7d8557b8 (diff) | |
[2.0] Backport all changes since r2798 (included) from trunkopenjpeg-2.0
Diffstat (limited to 'src/lib/openjp2/opj_malloc.h')
| -rw-r--r-- | src/lib/openjp2/opj_malloc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/openjp2/opj_malloc.h b/src/lib/openjp2/opj_malloc.h index 95ad1472..5007b0c9 100644 --- a/src/lib/openjp2/opj_malloc.h +++ b/src/lib/openjp2/opj_malloc.h @@ -1,4 +1,9 @@ /* + * The copyright in this software is being made available under the 2-clauses + * BSD License, included below. This software may be subject to other third + * party and contributor rights, including patent rights, and no such rights + * are granted under this license. + * * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com> * All rights reserved. |