[trunk] WIP: update output filename of conformance dump test to be compatible with...

[openjpeg.git] / libopenjpeg / opj_includes.h

diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h
index 7ec641bc10392e4feb909108ea5e4179e87062f3..d94237e7fbff290e120ab12337e81bc10a4451a6 100644 (file)
--- a/libopenjpeg/opj_includes.h
+++ b/libopenjpeg/opj_includes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Herv� Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,6 +40,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <ctype.h>
+#include <assert.h>
 
 /*
  ==========================================================
@@ -104,10 +105,10 @@ static INLINE long lrintf(float f){
 }
 #endif
 
-#include "opj_convert.h"
 #include "j2k_lib.h"
 #include "opj_malloc.h"
 #include "event.h"
+#include "bio.h"
 #include "cio.h"
 
 #include "image.h"
@@ -128,10 +129,16 @@ static INLINE long lrintf(float f){
 #include "int.h"
 #include "fix.h"
 
+#include "cidx_manager.h"
+#include "indexbox_manager.h"
+
 /* JPWL>> */
 #ifdef USE_JPWL
-#include "../jpwl/jpwl.h"
+#include "./jpwl/jpwl.h"
 #endif /* USE_JPWL */
 /* <<JPWL */
 
+// V2
+#include "function_list.h"
+
 #endif /* OPJ_INCLUDES_H */