summaryrefslogtreecommitdiff
path: root/src/lib/openjp3d
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2017-07-26 21:06:38 +0200
committerEven Rouault <even.rouault@spatialys.com>2017-07-26 21:06:38 +0200
commit5e795d90a1e47616e0c7a2e39381c13ccf7fd6dd (patch)
treeb11a992a90fc82a23357ef9588aead07862b29a0 /src/lib/openjp3d
parent2be20ce7d9996e960d79f3ad6ec439a9895849ed (diff)
Spelling fixes (patch by ka7, #890, rebased on top of master)
Diffstat (limited to 'src/lib/openjp3d')
-rw-r--r--src/lib/openjp3d/event.h2
-rw-r--r--src/lib/openjp3d/jp3d.c2
-rw-r--r--src/lib/openjp3d/jp3d.h8
-rw-r--r--src/lib/openjp3d/t1.h4
-rw-r--r--src/lib/openjp3d/tcd.h8
5 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/openjp3d/event.h b/src/lib/openjp3d/event.h
index 67d3c6a5..e7523585 100644
--- a/src/lib/openjp3d/event.h
+++ b/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, ...);
diff --git a/src/lib/openjp3d/jp3d.c b/src/lib/openjp3d/jp3d.c
index 8d9a73db..fbc8c013 100644
--- a/src/lib/openjp3d/jp3d.c
+++ b/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)
diff --git a/src/lib/openjp3d/jp3d.h b/src/lib/openjp3d/jp3d.h
index 6bd5c86f..3ad46df6 100644
--- a/src/lib/openjp3d/jp3d.h
+++ b/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;
diff --git a/src/lib/openjp3d/t1.h b/src/lib/openjp3d/t1.h
index f2c61e0a..a027382f 100644
--- a/src/lib/openjp3d/t1.h
+++ b/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
diff --git a/src/lib/openjp3d/tcd.h b/src/lib/openjp3d/tcd.h
index 4c57494a..a94c54fc 100644
--- a/src/lib/openjp3d/tcd.h
+++ b/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;