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

5 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/openmj2/event.h b/src/lib/openmj2/event.h
index ade06cfb..64c737c9 100644
--- a/src/lib/openmj2/event.h
+++ b/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,
diff --git a/src/lib/openmj2/j2k.c b/src/lib/openmj2/j2k.c
index e367737b..85f7b40e 100644
--- a/src/lib/openmj2/j2k.c
+++ b/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));
 
diff --git a/src/lib/openmj2/j2k.h b/src/lib/openmj2/j2k.h
index e13510fb..2dc43119 100644
--- a/src/lib/openmj2/j2k.h
+++ b/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;
diff --git a/src/lib/openmj2/openjpeg.h b/src/lib/openmj2/openjpeg.h
index f6b39737..7861edb5 100644
--- a/src/lib/openmj2/openjpeg.h
+++ b/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,
diff --git a/src/lib/openmj2/tcd.h b/src/lib/openmj2/tcd.h
index f88c1ed3..83bf788e 100644
--- a/src/lib/openmj2/tcd.h
+++ b/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;