Spelling fixes (patch by ka7, #890, rebased on top of master)

doc/openjpip.dox.in

@@ -88,7 +88,7 @@
  * Before connecting to the JPIP server, every JPIP client checks local cache data of the requesting image with the image decoding server.
  * If its cache exists, the image decoding server provides ChannelID (CID), which identifies the image and its cache model on the JPIP server, and the whole system can continue the session using the CID.
  *
- *  \image html jpip_protocol.png "Message Sequence Chart of OpenJPIP impementation"
+ *  \image html jpip_protocol.png "Message Sequence Chart of OpenJPIP implementation"
  *
  * \author Kaori Hagihara UCL/SST/ICTM/ELEN
  */

src/bin/jp2/convertbmp.c

@@ -56,7 +56,7 @@ typedef struct {
 typedef struct {
     OPJ_UINT32 biSize;             /* Size of the structure in bytes */
     OPJ_UINT32 biWidth;            /* Width of the image in pixels */
-    OPJ_UINT32 biHeight;           /* Heigth of the image in pixels */
+    OPJ_UINT32 biHeight;           /* Height of the image in pixels */
     OPJ_UINT16 biPlanes;           /* 1 */
     OPJ_UINT16 biBitCount;         /* Number of color bits by pixels */
     OPJ_UINT32 biCompression;      /* Type of encoding 0: none 1: RLE8 2: RLE4 */

src/bin/jp3d/opj_jp3d_compress.c

@@ -658,7 +658,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 
         /* ------------------------------------------------------
 
-        case 'T':            // Tranformation of original data (2D-DWT/3D-DWT/3D-RLS/2D-DWT+1D-RLS)
+        case 'T':            // Transformation of original data (2D-DWT/3D-DWT/3D-RLS/2D-DWT+1D-RLS)
         {
         char transform[4];
 
@@ -857,7 +857,7 @@ int main(int argc, char **argv)
 
     /*
     configure the event callbacks (not required)
-    setting of each callback is optionnal
+    setting of each callback is optional
     */
     memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
     event_mgr.error_handler = error_callback;

src/bin/jpwl/convert.c

@@ -561,7 +561,7 @@ typedef struct {
 typedef struct {
     DWORD biSize;         /* Size of the structure in bytes */
     DWORD biWidth;        /* Width of the image in pixels */
-    DWORD biHeight;       /* Heigth of the image in pixels */
+    DWORD biHeight;       /* Height of the image in pixels */
     WORD biPlanes;        /* 1 */
     WORD biBitCount;      /* Number of color bits by pixels */
     DWORD biCompression;      /* Type of encoding 0: none 1: RLE8 2: RLE4 */

src/bin/jpwl/opj_jpwl_compress.c

@@ -1629,7 +1629,7 @@ int main(int argc, char **argv)
 
     /*
     configure the event callbacks (not required)
-    setting of each callback is optionnal
+    setting of each callback is optional
     */
     memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
     event_mgr.error_handler = error_callback;

src/bin/mj2/meta_out.c

@@ -189,7 +189,7 @@ int xml_write_moov(FILE *file, FILE *xmlout, opj_mj2_t * movie,
                 "        <!-- Seconds since start of Jan. 1, 1904 UTC (Greenwich) -->\n");
     }
     /*  2082844800 = seconds between 1/1/04 and 1/1/70 */
-    /* There's still a time zone offset problem not solved... but spec is ambigous as to whether stored time
+    /* There's still a time zone offset problem not solved... but spec is ambiguous as to whether stored time
        should be local or UTC */
     if (derived) {
         fprintf(xmlout, "        <AsLocalTime>");
@@ -677,7 +677,7 @@ void xml_write_mdia(FILE* file, FILE* xmlout, mj2_tk_t *track,
                 "            <!-- Seconds since start of Jan. 1, 1904 UTC (Greenwich) -->\n");
     }
     /*  2082844800 = seconds between 1/1/04 and 1/1/70 */
-    /* There's still a time zone offset problem not solved... but spec is ambigous as to whether stored time
+    /* There's still a time zone offset problem not solved... but spec is ambiguous as to whether stored time
        should be local or UTC */
     if (derived) {
         fprintf(xmlout,  "            <AsLocalTime>");

src/bin/mj2/mj2_to_metadata.c

@@ -310,7 +310,7 @@ int main(int argc, char *argv[])
 
     /*
     configure the event callbacks (not required)
-    setting of each callback is optionnal
+    setting of each callback is optional
     */
     memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
     event_mgr.error_handler = error_callback;

src/bin/mj2/opj_mj2_decompress.c

@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
 
     /*
     configure the event callbacks (not required)
-    setting of each callback is optionnal
+    setting of each callback is optional
     */
     memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
     event_mgr.error_handler = error_callback;

src/bin/mj2/opj_mj2_extract.c

@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
 
     /*
     configure the event callbacks (not required)
-    setting of each callback is optionnal
+    setting of each callback is optional
     */
     memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
     event_mgr.error_handler = error_callback;

src/bin/mj2/opj_mj2_wrap.c

@@ -397,7 +397,7 @@ int main(int argc, char *argv[])
     memset(&img, 0, sizeof(opj_image_t));
     /*
     configure the event callbacks (not required)
-    setting of each callback is optionnal
+    setting of each callback is optional
     */
     memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
     event_mgr.error_handler = error_callback;
@@ -452,7 +452,7 @@ int main(int argc, char *argv[])
             if (snum == 0) { /* Could not open a single codestream */
                 fprintf(stderr, "failed to open %s for reading\n", j2kfilename);
                 return 1;
-            } else {        /* Tried to open a inexistant codestream */
+            } else {        /* Tried to open a inexistent codestream */
                 fprintf(stdout, "%d frames are being added to the MJ2 file\n", snum);
                 break;
             }

src/bin/wx/OPJViewer/source/OPJThreads.cpp

@@ -420,7 +420,7 @@ BEGIN_EVENT_TABLE(OPJMarkerTree, wxGenericTreeCtrl)
     /*EVT_TREE_KEY_DOWN(TreeTest_Ctrl, OPJMarkerTree::OnTreeKeyDown)*/
     /*EVT_TREE_ITEM_ACTIVATED(TreeTest_Ctrl, OPJMarkerTree::OnItemActivated)*/
 
-    // so many differents ways to handle right mouse button clicks...
+    // so many different ways to handle right mouse button clicks...
     /*EVT_CONTEXT_MENU(OPJMarkerTree::OnContextMenu)*/
     // EVT_TREE_ITEM_MENU is the preferred event for creating context menus
     // on a tree control, because it includes the point of the click or item,

src/bin/wx/OPJViewer/source/imagjpeg2000.cpp

@@ -1092,7 +1092,7 @@ bool wxJPEG2000Handler::SaveFile(wxImage *wimage, wxOutputStream& stream,
 
     /*
     configure the event callbacks (not required)
-    setting of each callback is optionnal
+    setting of each callback is optional
     */
     memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
     event_mgr.error_handler = jpeg2000_error_callback;

src/lib/openjp2/j2k.h

@@ -358,7 +358,7 @@ typedef struct opj_cp {
     OPJ_CHAR *comment;
     /** number of tiles in width */
     OPJ_UINT32 tw;
-    /** number of tiles in heigth */
+    /** number of tiles in height */
     OPJ_UINT32 th;
 
     /** number of ppm markers (reserved size) */
@@ -562,7 +562,7 @@ typedef struct opj_j2k {
     /** helper used to write the index file */
     opj_codestream_index_t *cstr_index;
 
-    /** number of the tile curently concern by coding/decoding */
+    /** number of the tile currently concern by coding/decoding */
     OPJ_UINT32 m_current_tile_number;
 
     /** the current tile coder/decoder **/
@@ -728,7 +728,7 @@ opj_j2k_t* opj_j2k_create_decompress(void);
  * Dump some elements from the J2K decompression structure .
  *
  *@param p_j2k              the jpeg2000 codec.
- *@param flag               flag to describe what elments are dump.
+ *@param flag               flag to describe what elements are dump.
  *@param out_stream         output stream where dump the elements.
  *
 */

src/lib/openjp2/jp2.c

@@ -353,7 +353,7 @@ static OPJ_BOOL opj_jp2_read_header_procedure(opj_jp2_t *jp2,
         opj_event_mgr_t * p_manager);
 
 /**
- * Excutes the given procedures on the given codec.
+ * Executes the given procedures on the given codec.
  *
  * @param   p_procedure_list    the list of procedures to execute
  * @param   jp2                 the jpeg2000 file codec to execute the procedures on.
@@ -383,7 +383,7 @@ static OPJ_BOOL opj_jp2_read_boxhdr(opj_jp2_box_t *box,
                                     opj_event_mgr_t * p_manager);
 
 /**
- * Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters
+ * Sets up the validation ,i.e. adds the procedures to launch to make sure the codec parameters
  * are valid. Developpers wanting to extend the library can add their own validation procedures.
  */
 static OPJ_BOOL opj_jp2_setup_encoding_validation(opj_jp2_t *jp2,
@@ -452,7 +452,7 @@ static OPJ_BOOL opj_jp2_read_boxhdr_char(opj_jp2_box_t *box,
         opj_event_mgr_t * p_manager);
 
 /**
- * Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters
+ * Sets up the validation ,i.e. adds the procedures to launch to make sure the codec parameters
  * are valid. Developpers wanting to extend the library can add their own validation procedures.
  */
 static OPJ_BOOL opj_jp2_setup_decoding_validation(opj_jp2_t *jp2,
@@ -2355,7 +2355,7 @@ static OPJ_BOOL opj_jp2_read_header_procedure(opj_jp2_t *jp2,
 }
 
 /**
- * Excutes the given procedures on the given codec.
+ * Executes the given procedures on the given codec.
  *
  * @param   p_procedure_list    the list of procedures to execute
  * @param   jp2                 the jpeg2000 file codec to execute the procedures on.

src/lib/openjp2/jp2.h

@@ -174,7 +174,7 @@ typedef struct opj_jp2 {
     OPJ_UINT32 *cl;
     opj_jp2_comps_t *comps;
     /* FIXME: The following two variables are used to save offset
-      as we write out a JP2 file to disk. This mecanism is not flexible
+      as we write out a JP2 file to disk. This mechanism is not flexible
       as codec writers will need to extand those fields as new part
       of the standard are implemented.
     */
@@ -442,7 +442,7 @@ OPJ_BOOL opj_jp2_set_decoded_resolution_factor(opj_jp2_t *p_jp2,
  * Dump some elements from the JP2 decompression structure .
  *
  *@param p_jp2        the jp2 codec.
- *@param flag        flag to describe what elments are dump.
+ *@param flag        flag to describe what elements are dump.
  *@param out_stream      output stream where dump the elements.
  *
 */

src/lib/openjp2/openjpeg.h

@@ -179,7 +179,7 @@ typedef size_t   OPJ_SIZE_T;
 
 /**
  * JPEG 2000 Profiles, see Table A.10 from 15444-1 (updated in various AMD)
- * These values help chosing the RSIZ value for the J2K codestream.
+ * These values help choosing the RSIZ value for the J2K codestream.
  * The RSIZ value triggers various encoding options, as detailed in Table A.10.
  * If OPJ_PROFILE_PART2 is chosen, it has to be combined with one or more extensions
  * described hereunder.
@@ -1521,7 +1521,7 @@ OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_v2_t
  *
  * @param   p_codec         the jpeg2000 codec.
  * @param   info_flag       type of information dump.
- * @param   output_stream   output stream where dump the informations get from the codec.
+ * @param   output_stream   output stream where dump the information gotten from the codec.
  *
  */
 OPJ_API void OPJ_CALLCONV opj_dump_codec(opj_codec_t *p_codec,

src/lib/openjp3d/event.h

@@ -51,7 +51,7 @@ The functions in EVENT.C have for goal to send output messages (errors, warnings
 Write formatted data to a string and send the string to a user callback.
 @param cinfo Codec context info
 @param event_type Event type or callback to use to send the message
-@param fmt Format-control string (plus optionnal arguments)
+@param fmt Format-control string (plus optional arguments)
 @return Returns true if successful, returns false otherwise
 */
 bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...);

src/lib/openjp3d/jp3d.c

@@ -862,7 +862,7 @@ static void j3d_read_com(opj_j3d_t *j3d)
 
     /*opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);*/
 
-    cio_skip(cio, len - 4);  /*posible comments*/
+    cio_skip(cio, len - 4);  /*possible comments*/
 }
 
 static void j3d_write_cox(opj_j3d_t *j3d, int compno)

src/lib/openjp3d/jp3d.h

@@ -220,7 +220,7 @@ typedef struct opj_tccp {
     int numgbits;
     /** Region Of Interest shift */
     int roishift;
-    /** precinct width heigth & depth*/
+    /** precinct width height & depth*/
     int prctsiz[3][J3D_MAXRLVLS];
 } opj_tccp_t;
 
@@ -300,7 +300,7 @@ typedef struct opj_cp {
     int tdz;
     /** comment for coding */
     char *comment;
-    /** number of tiles in width, heigth and depth */
+    /** number of tiles in width, height and depth */
     int tw;
     int th;
     int tl;
@@ -352,7 +352,7 @@ typedef struct opj_tile_info {
     int end_header;
     /** end position */
     int end_pos;
-    /** precinct number for each resolution level (width, heigth and depth) */
+    /** precinct number for each resolution level (width, height and depth) */
     int prctno[3][J3D_MAXRLVLS];
     /** precinct size (in power of 2), in X for each resolution level */
     int prctsiz[3][J3D_MAXRLVLS];
@@ -425,7 +425,7 @@ typedef struct opj_j3d {
     opj_common_ptr cinfo;
     /** locate in which part of the codestream the decoder is (main header, tile header, end) */
     int state;
-    /** number of the tile curently concern by coding/decoding */
+    /** number of the tile currently concern by coding/decoding */
     int curtileno;
     /** locate the position of the end of the tile in the codestream, used to detect a truncated codestream (in j3d_read_sod)   */
     unsigned char *eot;

src/lib/openjp3d/t1.h

@@ -49,10 +49,10 @@ in T1.C are used by some function in TCD.C.
 #define T1_NMSEDEC_BITS 7
 
 #define T1_MAXCBLKW 256 /*< Maximum size of code-block (width) */
-#define T1_MAXCBLKH 256 /*< Maximum size of code-block (heigth) */
+#define T1_MAXCBLKH 256 /*< Maximum size of code-block (height) */
 #define T1_MAXCBLKD 256 /*< Maximum size of code-block (depth) */
 #define T1_MINCBLKW 4       /*< Minimum size of code-block (width) */
-#define T1_MINCBLKH 4       /*< Minimum size of code-block (heigth) */
+#define T1_MINCBLKH 4       /*< Minimum size of code-block (height) */
 #define T1_MINCBLKD 4       /*< Minimum size of code-block (depth) */
 #define T1_MAXWHD 18
 #define T1_CBLKW 256

src/lib/openjp3d/tcd.h

@@ -56,7 +56,7 @@ typedef struct opj_tcd_seg {
     int len;
     /** Data */
     unsigned char *data;
-    /** Number of passes posible for the segment */
+    /** Number of passes possible for the segment */
     int maxpasses;
     /** Number of passes added to the segment */
     int numnewpasses;
@@ -108,7 +108,7 @@ typedef struct opj_tcd_cblk {
     int numnewpasses;
     /** Number of segments */
     int numsegs;
-    /** Segments informations */
+    /** Segments information */
     opj_tcd_seg_t segs[100];
     /** Number of passes in the layer */
     int numpassesinlayers;
@@ -131,7 +131,7 @@ typedef struct opj_tcd_precinct {
     int x0, y0, z0;
     /** Dimension of the precint : right low corner (x1,y1,z1) */
     int x1, y1, z1;
-    /** Number of codeblocks in precinct in width and heigth and length*/
+    /** Number of codeblocks in precinct in width and height and length*/
     int cblkno[3];
     /** Information about the codeblocks */
     opj_tcd_cblk_t *cblks;
@@ -219,7 +219,7 @@ typedef struct opj_tcd_tile {
 Tile coder/decoder: volume instance
 */
 typedef struct opj_tcd_volume {
-    /** Number of tiles in width and heigth and length */
+    /** Number of tiles in width and height and length */
     int tw, th, tl;
     /** Tiles information */
     opj_tcd_tile_t *tiles;

src/lib/openjpip/auxtrans_manager.h

@@ -47,7 +47,7 @@ typedef struct auxtrans_param {
  *
  * @param[in] tcp_auxport opening tcp auxiliary port ( 0 not to open, valid No. 49152-65535)
  * @param[in] udp_auxport opening udp auxiliary port ( 0 not to open, valid No. 49152-65535)
- * @return                intialized transport parameters
+ * @return                initialized transport parameters
  */
 auxtrans_param_t init_aux_transport(int tcp_auxport, int udp_auxport);
 

src/lib/openjpip/cache_manager.h

@@ -119,7 +119,7 @@ cache_param_t * search_cacheBycsn(int csn, cachelist_param_t *cachelist);
 /**
  * search a cache by cid
  *
- * @param[in] cid        channel identifer
+ * @param[in] cid        channel identifier
  * @param[in] cachelist  cache list pointer
  * @return               found cache pointer
  */
@@ -130,7 +130,7 @@ cache_param_t * search_cacheBycid(const char cid[],
 /**
  * search a cache by tid
  *
- * @param[in] tid        target identifer
+ * @param[in] tid        target identifier
  * @param[in] cachelist  cache list pointer
  * @return               found cache pointer
  */

src/lib/openjpip/jpip_parser.c

@@ -360,7 +360,7 @@ void enqueue_imagedata(query_param_t query_param, msgqueue_param_t *msgqueue)
                     if (msgqueue->cachemodel->jppstream) {
                         enqueue_tileheader((int)tile_id, msgqueue);
 
-                        /* FIXME: The following code is suspicious it implicitely cast an unsigned int to int, which truncates values */
+                        /* FIXME: The following code is suspicious it implicitly cast an unsigned int to int, which truncates values */
                         xmin = tile_Xrange.minvalue >= (Byte4_t)(imgreg.xosiz + imgreg.ox) ? 0 :
                                imgreg.xosiz + imgreg.ox - (int)tile_Xrange.minvalue;
                         xmax = tile_Xrange.maxvalue <= (Byte4_t)(imgreg.xosiz + imgreg.ox + imgreg.sx)

src/lib/openjpip/openjpip.h

@@ -86,7 +86,7 @@ typedef struct QR {
  *
  * @param[in] tcp_auxport opening tcp auxiliary port ( 0 not to open, valid No. 49152-65535)
  * @param[in] udp_auxport opening udp auxiliary port ( 0 not to open, valid No. 49152-65535)
- * @return                intialized server record pointer
+ * @return                initialized server record pointer
  */
 server_record_t * init_JPIPserver(int tcp_auxport, int udp_auxport);
 
@@ -170,7 +170,7 @@ typedef SOCKET client_t;
  * Initialize the image decoding server
  *
  * @param[in] port opening tcp port (valid No. 49152-65535)
- * @return         intialized decoding server record pointer
+ * @return         initialized decoding server record pointer
  */
 OPJ_API dec_server_record_t * OPJ_CALLCONV init_dec_server(int port);
 

src/lib/openjpip/target_manager.h

@@ -39,7 +39,7 @@
 /** target parameters*/
 typedef struct target_param {
     char tid[MAX_LENOFTID];         /**< target identifier*/
-    char *targetname;               /**< local file path or URL ( URL is suported only with SERVER mode)*/
+    char *targetname;               /**< local file path or URL ( URL is supported only with SERVER mode)*/
     int fd;                         /**< file descriptor*/
 #ifdef SERVER
     char *tmpfname;                 /**< temporal file name to download a remote target file*/

src/lib/openjpwl/jpwl_lib.c

@@ -1428,7 +1428,7 @@ jpwl_esd_ms_t *jpwl_esd_create(opj_j2k_t *j2k, int comp,
         esd->data = NULL;
 
     } else {
-        /* we set the data field as the sensitivity values poinnter passed to the function */
+        /* we set the data field as the sensitivity values pointer passed to the function */
         esd->data = (unsigned char *) sensval;
     }
 

src/lib/openmj2/event.h

@@ -51,7 +51,7 @@ The functions in EVENT.C have for goal to send output messages (errors, warnings
 Write formatted data to a string and send the string to a user callback.
 @param cinfo Codec context info
 @param event_type Event type or callback to use to send the message
-@param fmt Format-control string (plus optionnal arguments)
+@param fmt Format-control string (plus optional arguments)
 @return Returns true if successful, returns false otherwise
 */
 opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt,

src/lib/openmj2/j2k.c

@@ -2370,7 +2370,7 @@ void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters,
 #endif /* USE_JPWL */
 
 
-    /* initialize the mutiple tiles */
+    /* initialize the multiple tiles */
     /* ---------------------------- */
     cp->tcps = (opj_tcp_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tcp_t));
 

src/lib/openmj2/j2k.h

@@ -246,7 +246,7 @@ typedef struct opj_cp {
     char *comment;
     /** number of tiles in width */
     int tw;
-    /** number of tiles in heigth */
+    /** number of tiles in height */
     int th;
     /** ID number of the tiles present in the codestream */
     int *tileno;
@@ -323,7 +323,7 @@ typedef struct opj_j2k {
 
     /** locate in which part of the codestream the decoder is (main header, tile header, end) */
     int state;
-    /** number of the tile curently concern by coding/decoding */
+    /** number of the tile currently concern by coding/decoding */
     int curtileno;
     /** Tile part number*/
     int tp_num;

src/lib/openmj2/openjpeg.h

@@ -907,7 +907,7 @@ Encode an image into a JPEG-2000 codestream
 3@param cinfo compressor handle
 @param cio Output buffer stream
 @param image Image to encode
-@param index Depreacted -> Set to NULL. To extract index, used opj_encode_wci()
+@param index Deprecated -> Set to NULL. To extract index, used opj_encode_wci()
 @return Returns true if successful, returns false otherwise
 */
 OPJ_API opj_bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio,

src/lib/openmj2/tcd.h

@@ -97,7 +97,7 @@ typedef struct opj_tcd_cblk_enc {
 
 typedef struct opj_tcd_cblk_dec {
     unsigned char* data;  /* Data */
-    opj_tcd_seg_t* segs;      /* segments informations */
+    opj_tcd_seg_t* segs;      /* segments information */
     int x0, y0, x1,
         y1;     /* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
     int numbps;
@@ -113,7 +113,7 @@ FIXME: documentation
 typedef struct opj_tcd_precinct {
     int x0, y0, x1,
         y1;       /* dimension of the precinct : left upper corner (x0, y0) right low corner (x1,y1) */
-    int cw, ch;           /* number of precinct in width and heigth */
+    int cw, ch;           /* number of precinct in width and height */
     union {       /* code-blocks informations */
         opj_tcd_cblk_enc_t* enc;
         opj_tcd_cblk_dec_t* dec;
@@ -176,7 +176,7 @@ typedef struct opj_tcd_tile {
 FIXME: documentation
 */
 typedef struct opj_tcd_image {
-    int tw, th;           /* number of tiles in width and heigth */
+    int tw, th;           /* number of tiles in width and height */
     opj_tcd_tile_t *tiles;        /* Tiles information */
 } opj_tcd_image_t;
 

tests/conformance/CMakeLists.txt

@@ -8,7 +8,7 @@ set(BASELINE_NR ${OPJ_DATA_ROOT}/baseline/nonregression)
 set(INPUT_CONF ${OPJ_DATA_ROOT}/input/conformance)
 
 
-# List of components by file (normaly p0_13.j2k have 257 components but for this
+# List of components by file (normally p0_13.j2k have 257 components but for this
 #set of test we consider only 4)
 set( CP0_nbC_list "not_used;1;1;1;3;4;4;3;3;1;3;1;1;4;3;1;1")
 set( CP1_nbC_list "not_used;1;3;4;1;3;3;2")
@@ -617,7 +617,7 @@ endforeach()
 
 #--------------------------------------------------------------------------
 # Tests about dump of profile 0 file
-# try to dump image and codestream informations into a file
+# try to dump image and codestream information into a file
 # non regression comparison this file to the baseline
 
 foreach(numFileP0 RANGE 1 16)
@@ -651,7 +651,7 @@ endforeach()
 
 #--------------------------------------------------------------------------
 # Tests about dump of profile 1 file
-# try to dump image and codestream informations into a file
+# try to dump image and codestream information into a file
 # non regression comparison this file to the baseline
 
 foreach(numFileP1 RANGE 1 7)
@@ -680,7 +680,7 @@ endforeach()
 
 #--------------------------------------------------------------------------
 # Tests about dump of JP2 file
-# try to dump image and codestream informations into a file
+# try to dump image and codestream information into a file
 # non regression comparison this file to the baseline
 
 foreach(numFileJP2 RANGE 1 9)

wrapping/java/openjp2/JavaOpenJPEG.c

@@ -1395,7 +1395,7 @@ static int parse_cmdline_encoder(int argc, char **argv,
   @return a pointer to a char[]
   Syntax of the index:
     one char for the version number (1): one byte because no problem with little endian, big endian etc.
-    one int for each of the following informations:
+    one int for each of the following information:
             Image Width
             Image Height
             progression order
@@ -1468,7 +1468,7 @@ static char* create_index_into_byte_array(opj_codestream_info_t *cstr_info,
 
     buffer[0] = 1;  /* Version stored on a byte*/
     buffer++;
-    /* Remaining informations are stored on a int.*/
+    /* Remaining information are stored on a int.*/
     ((int*)buffer)[buffer_pos++] = cstr_info->image_w;
     ((int*)buffer)[buffer_pos++] = cstr_info->image_h;
     ((int*)buffer)[buffer_pos++] = cstr_info->prog;