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_enc.c
diff --git
a/otherlibs/_graphics/src/libjasper/jp2_enc.c
b/otherlibs/_graphics/src/libjasper/jp2_enc.c
index
d9acedd
..
6eca6ae
100644
(file)
--- a/
otherlibs/_graphics/src/libjasper/jp2_enc.c
+++ b/
otherlibs/_graphics/src/libjasper/jp2_enc.c
@@
-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_enc.c,v 1.1 2007/01/15 16:09:24 vp153 Exp $
+ * $Id: jp2_enc.c,v 1.2 2008/05/26 09:40:52 vp153 Exp $
*/
/******************************************************************************\
*/
/******************************************************************************\
@@
-312,7
+312,7
@@
int sgnd;
if (!(box = jp2_box_create(JP2_BOX_JP2H))) {
goto error;
}
if (!(box = jp2_box_create(JP2_BOX_JP2H))) {
goto error;
}
- box->len = len + JP2_BOX_HDRLEN;
+ box->len = len + JP2_BOX_HDRLEN(false);
if (jp2_box_put(box, out)) {
goto error;
}
if (jp2_box_put(box, out)) {
goto error;
}