projects
/
opencv
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the trunk to the OpenCV's CVS (2008-07-14)
[opencv]
/
otherlibs
/
_graphics
/
src
/
libjasper
/
jp2_cod.h
diff --git
a/otherlibs/_graphics/src/libjasper/jp2_cod.h
b/otherlibs/_graphics/src/libjasper/jp2_cod.h
index
0555946
..
590957c
100644
(file)
--- a/
otherlibs/_graphics/src/libjasper/jp2_cod.h
+++ b/
otherlibs/_graphics/src/libjasper/jp2_cod.h
@@
-9,9
+9,9
@@
*
* JasPer License Version 2.0
*
*
* JasPer License Version 2.0
*
+ * Copyright (c) 2001-2006 Michael David Adams
* Copyright (c) 1999-2000 Image Power, Inc.
* Copyright (c) 1999-2000 The University of British Columbia
* Copyright (c) 1999-2000 Image Power, Inc.
* Copyright (c) 1999-2000 The University of British Columbia
- * Copyright (c) 2001-2003 Michael David Adams
*
* All rights reserved.
*
*
* All rights reserved.
*
@@
-64,7
+64,7
@@
/*
* JP2 Library
*
/*
* JP2 Library
*
- * $Id: jp2_cod.h,v 1.1 2007/01/15 16:09:24 vp153 Exp $
+ * $Id: jp2_cod.h,v 1.2 2008/05/26 09:40:52 vp153 Exp $
*/
#ifndef JP2_COD_H
*/
#ifndef JP2_COD_H
@@
-87,7
+87,7
@@
* Box class.
\******************************************************************************/
* Box class.
\******************************************************************************/
-#define JP2_BOX_HDRLEN 8
+#define JP2_BOX_HDRLEN(ext) ((ext) ? 16 : 8)
/* Box types. */
#define JP2_BOX_JP 0x6a502020 /* Signature */
/* Box types. */
#define JP2_BOX_JP 0x6a502020 /* Signature */
@@
-241,8
+241,13
@@
typedef struct {
struct jp2_boxinfo_s *info;
uint_fast32_t type;
struct jp2_boxinfo_s *info;
uint_fast32_t type;
+
+ /* The length of the box including the (variable-length) header. */
uint_fast32_t len;
uint_fast32_t len;
+ /* The length of the box data. */
+ uint_fast32_t datalen;
+
union {
jp2_jp_t jp;
jp2_ftyp_t ftyp;
union {
jp2_jp_t jp;
jp2_ftyp_t ftyp;