Optimize opj_t1_update_flags()

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

diff --git a/src/lib/openjpip/query_parser.h b/src/lib/openjpip/query_parser.h
index 112bc59ad80377bc9a7b2d5e3597c81923b8982b..46d57484d18da9f23cdb19be00b55966a05263a4 100644 (file)
--- a/src/lib/openjpip/query_parser.h
+++ b/src/lib/openjpip/query_parser.h
@@ -1,8 +1,8 @@
 /*
  * $Id$
  *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2010-2011, Kaori Hagihara
  * Copyright (c) 2011,      Lucian Corlaciu, GSoC
  * All rights reserved.
@@ -29,10 +29,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef        QUERY_PARSER_H_
-# define       QUERY_PARSER_H_
+#ifndef     QUERY_PARSER_H_
+# define    QUERY_PARSER_H_
 
-#include "bool.h"
+#include "opj_includes.h"
 
 /** maximum number of meta request box */
 #define MAX_NUMOFBOX 10
@@ -41,33 +41,34 @@
 typedef enum cnew_transport { non, http, tcp, udp} cnew_transport_t;
 
 /** image return type */
-typedef enum image_return { JPPstream, JPTstream, UNKNOWN=-1} image_return_t;
+typedef enum image_return { JPPstream, JPTstream, UNKNOWN = -1} image_return_t;
 
 /** Query parameters */
-typedef struct query_param{
-  char *target;                               /**< target name */
-  char *tid;                                  /**< target identifier */
-  int fx, fy;                                 /**< frame size (fx,fy) */
-  int rx, ry, rw, rh;                         /**< roi region */
-  int layers;                                 /**< quality layers */
-  int lastcomp;                               /**< last component number */
-  bool *comps;                                /**< components (dynamic array) for jpp-stream, null means all components */
-  char *cid;                                  /**< channel identifier */
-  cnew_transport_t cnew;                      /**< transport name if there is new channel request, else non */
-  char *cclose;                               /**< list of closing channel identifiers, separated by '\\0' */
-  int numOfcclose;                            /**< number of closing channels */
-  char box_type[MAX_NUMOFBOX][4];             /**< interested box-types */
-  int limit[MAX_NUMOFBOX];                    /**< limit value, -1: skeleton request "r", 0: entire contents */
-  bool w[MAX_NUMOFBOX];                       /**< Metadata request qualifier flags */
-  bool s[MAX_NUMOFBOX];
-  bool g[MAX_NUMOFBOX];
-  bool a[MAX_NUMOFBOX];
-  bool priority[MAX_NUMOFBOX];                /**< priority flag */
-  int root_bin;                               /**< root-bin */
-  int max_depth;                              /**< max-depth */
-  bool metadata_only;                         /**< metadata-only request */
-  image_return_t return_type;                 /**< image return type */
-  int len;                                    /**< maximum response length */
+typedef struct query_param {
+    char *target;                               /**< target name */
+    char *tid;                                  /**< target identifier */
+    int fx, fy;                                 /**< frame size (fx,fy) */
+    int rx, ry, rw, rh;                         /**< roi region */
+    int layers;                                 /**< quality layers */
+    int lastcomp;                               /**< last component number */
+    OPJ_BOOL *comps;                                /**< components (dynamic array) for jpp-stream, null means all components */
+    char *cid;                                  /**< channel identifier */
+    cnew_transport_t
+    cnew;                      /**< transport name if there is new channel request, else non */
+    char *cclose;                               /**< list of closing channel identifiers, separated by '\\0' */
+    int numOfcclose;                            /**< number of closing channels */
+    char box_type[MAX_NUMOFBOX][4];             /**< interested box-types */
+    int limit[MAX_NUMOFBOX];                    /**< limit value, -1: skeleton request "r", 0: entire contents */
+    OPJ_BOOL w[MAX_NUMOFBOX];                       /**< Metadata request qualifier flags */
+    OPJ_BOOL s[MAX_NUMOFBOX];
+    OPJ_BOOL g[MAX_NUMOFBOX];
+    OPJ_BOOL a[MAX_NUMOFBOX];
+    OPJ_BOOL priority[MAX_NUMOFBOX];                /**< priority flag */
+    int root_bin;                               /**< root-bin */
+    int max_depth;                              /**< max-depth */
+    OPJ_BOOL metadata_only;                         /**< metadata-only request */
+    image_return_t return_type;                 /**< image return type */
+    int len;                                    /**< maximum response length */
 } query_param_t;
 
 
@@ -77,14 +78,14 @@ typedef struct query_param{
  * @param[in]  query_string request query string
  * @return     pointer to query parameters
  */
-query_param_t * parse_query( const char *query_string);
+query_param_t * parse_query(const char *query_string);
 
 /**
  * print query parameters
  *
  * @param[in] query_param  query parameters
  */
-void print_queryparam( query_param_t query_param);
+void print_queryparam(query_param_t query_param);
 
 
 /**
@@ -92,6 +93,6 @@ void print_queryparam( query_param_t query_param);
  *
  * @param[in] query address of the deleting query pointer
  */
-void delete_query( query_param_t **query);
+void delete_query(query_param_t **query);
 
-#endif             /* !QUERY_PARSER_H_ */
+#endif      /* !QUERY_PARSER_H_ */