projects
/
openjpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b7f6f8
)
minor changes in header inclusions
author
Antonin Descampe
<antonin@gmail.com>
Mon, 15 Nov 2010 11:08:03 +0000
(11:08 +0000)
committer
Antonin Descampe
<antonin@gmail.com>
Mon, 15 Nov 2010 11:08:03 +0000
(11:08 +0000)
CHANGES
patch
|
blob
|
history
codec/image_to_j2k.c
patch
|
blob
|
history
codec/j2k_dump.c
patch
|
blob
|
history
codec/j2k_to_image.c
patch
|
blob
|
history
libopenjpeg/jp2.c
patch
|
blob
|
history
libopenjpeg/openjpeg.c
patch
|
blob
|
history
libopenjpeg/opj_includes.h
patch
|
blob
|
history
diff --git
a/CHANGES
b/CHANGES
index 4165a6d52030deaef2af6d9662cc8711cffa6ca4..fdd4b96e555d24c83f2d39e315c8100132df7317 100644
(file)
--- a/
CHANGES
+++ b/
CHANGES
@@
-6,6
+6,7
@@
What's New for OpenJPEG
+ : added
November 15, 2010
+ : added
November 15, 2010
+* [antonin] minor changes in header inclusions
* [antonin] complete rewrite of opj_convert.c with correct values (from winfried)
November 11, 2010
* [antonin] complete rewrite of opj_convert.c with correct values (from winfried)
November 11, 2010
diff --git
a/codec/image_to_j2k.c
b/codec/image_to_j2k.c
index 16f1d58d2121762ef0af1a0e4a7fb9508981ce10..d4b87e985f7947b7fd6fa803121d4b6c53773806 100644
(file)
--- a/
codec/image_to_j2k.c
+++ b/
codec/image_to_j2k.c
@@
-29,12
+29,13
@@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <opj_config.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <math.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <math.h>
+#include "../opj_config.h"
#include "openjpeg.h"
#include "compat/getopt.h"
#include "convert.h"
#include "openjpeg.h"
#include "compat/getopt.h"
#include "convert.h"
diff --git
a/codec/j2k_dump.c
b/codec/j2k_dump.c
index 8b567c552575622dfb68f1d21d7f672a7e721dbe..20b65d735848fad37d3cd90901b9ee2b70867e02 100644
(file)
--- a/
codec/j2k_dump.c
+++ b/
codec/j2k_dump.c
@@
-1,4
+1,3
@@
-#include <opj_config.h>
/*
* Copyright (c) 20010, Mathieu Malaterre, GDCM
* All rights reserved.
/*
* Copyright (c) 20010, Mathieu Malaterre, GDCM
* All rights reserved.
@@
-30,6
+29,7
@@
#include <stdlib.h>
#include <math.h>
#include <stdlib.h>
#include <math.h>
+#include "../opj_config.h"
#include "openjpeg.h"
#include "../libopenjpeg/j2k.h"
#include "../libopenjpeg/jp2.h"
#include "openjpeg.h"
#include "../libopenjpeg/j2k.h"
#include "../libopenjpeg/jp2.h"
diff --git
a/codec/j2k_to_image.c
b/codec/j2k_to_image.c
index 6a1da8f1ca24d248a042c42986374a3b1d1ea092..62b33e3b44f26a522fe87af56d5763ea60a315d2 100644
(file)
--- a/
codec/j2k_to_image.c
+++ b/
codec/j2k_to_image.c
@@
-29,12
+29,13
@@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <opj_config.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <math.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <math.h>
+#include "../opj_config.h"
#include "openjpeg.h"
#include "compat/getopt.h"
#include "convert.h"
#include "openjpeg.h"
#include "compat/getopt.h"
#include "convert.h"
diff --git
a/libopenjpeg/jp2.c
b/libopenjpeg/jp2.c
index 48a1f8d016d0badec1802583b347cfb4fb59a771..518e4f121a822280592e4f7e0366efc577bb7431 100644
(file)
--- a/
libopenjpeg/jp2.c
+++ b/
libopenjpeg/jp2.c
@@
-28,7
+28,7
@@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include
<opj_config.h>
+#include
"../opj_config.h"
#ifdef HAVE_LIBLCMS2
#include <math.h>
#include <lcms2.h>
#ifdef HAVE_LIBLCMS2
#include <math.h>
#include <lcms2.h>
@@
-38,7
+38,6
@@
#include <lcms.h>
#endif
#include "opj_includes.h"
#include <lcms.h>
#endif
#include "opj_includes.h"
-#include "opj_convert.h"
/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
/*@{*/
/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
/*@{*/
diff --git
a/libopenjpeg/openjpeg.c
b/libopenjpeg/openjpeg.c
index 99866b8a61d58432b04cfd8b88dec09d6cd456dc..a7bcf13624bbf0cf210c3054b7033c09710db5e5 100644
(file)
--- a/
libopenjpeg/openjpeg.c
+++ b/
libopenjpeg/openjpeg.c
@@
-1,4
+1,3
@@
-#include <opj_config.h>
/*
* Copyright (c) 2005, Herv� Drolon, FreeImage Team
* All rights reserved.
/*
* Copyright (c) 2005, Herv� Drolon, FreeImage Team
* All rights reserved.
@@
-29,6
+28,7
@@
#include <windows.h>
#endif /* WIN32 */
#include <windows.h>
#endif /* WIN32 */
+#include "../opj_config.h"
#include "opj_includes.h"
/* ---------------------------------------------------------------------- */
#include "opj_includes.h"
/* ---------------------------------------------------------------------- */
diff --git
a/libopenjpeg/opj_includes.h
b/libopenjpeg/opj_includes.h
index 53739abf8157b8a6422a2551b363e1338132f114..7ec641bc10392e4feb909108ea5e4179e87062f3 100644
(file)
--- a/
libopenjpeg/opj_includes.h
+++ b/
libopenjpeg/opj_includes.h
@@
-104,6
+104,7
@@
static INLINE long lrintf(float f){
}
#endif
}
#endif
+#include "opj_convert.h"
#include "j2k_lib.h"
#include "opj_malloc.h"
#include "event.h"
#include "j2k_lib.h"
#include "opj_malloc.h"
#include "event.h"