[trunk] Remove bool.h, use opj_bool instead

[openjpeg.git] / src / lib / openjpip / index_manager.h

diff --git a/src/lib/openjpip/index_manager.h b/src/lib/openjpip/index_manager.h
index c1969facbcb83b68547e1410576125e252153271..7783157e61e4b3ee6bfcdcfedba8e2d5f218a8bc 100644 (file)
--- a/src/lib/openjpip/index_manager.h
+++ b/src/lib/openjpip/index_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: index_manager.h 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
@@ -31,13 +31,16 @@
 #ifndef        INDEX_MANAGER_H_
 # define       INDEX_MANAGER_H_
 
+#include "opj_config.h"
+#include "opj_includes.h"
+
 #include "byte_manager.h"
 #include "faixbox_manager.h"
 #include "metadata_manager.h"
 #include "mhixbox_manager.h"
-#include "bool.h"
 
 /** progression order */
+#if 0
 typedef enum porder {
   PROG_UNKNOWN = -1,      /**< place-holder */
   LRCP = 0,               /**< layer-resolution-component-precinct order */
@@ -46,6 +49,7 @@ typedef enum porder {
   PCRL = 3,               /**< precinct-component-resolution-layer order */
   CPRL = 4                /**< component-precinct-resolution-layer order */
 } porder_t;
+#endif
 
 /** A.5.1 Image and tile size (SIZ)*/
 typedef struct SIZmarker_param{
@@ -71,7 +75,7 @@ typedef struct SIZmarker_param{
 typedef struct CODmarker_param{
   Byte2_t  Lcod;             /**< length of marker segment excluding the marker*/
   Byte_t   Scod;             /**< Coding style for all components*/
-  porder_t prog_order;       /**< progression order*/
+  OPJ_PROG_ORDER prog_order;       /**< progression order*/
   Byte2_t  numOflayers;      /**< number of layers*/
   Byte_t   numOfdecomp;      /**< number of decompositions levels*/
   Byte4_t  *XPsiz;           /**< dynamic array of precinct width  at successive resolution level in order*/
@@ -182,6 +186,6 @@ Byte4_t get_tile_YSiz( SIZmarker_param_t SIZ, Byte4_t tile_id, int level);
  * @param[in] index index parameters
  * @return    true if JPT-stream is feasible
  */
-bool isJPTfeasible( index_param_t index);
+opj_bool isJPTfeasible( index_param_t index);
 
 #endif             /* !INDEX_MANAGER_H_ */