about summary refs log tree commit diff
path: root/converter/other
diff options
context:
space:
mode:
Diffstat (limited to 'converter/other')
-rw-r--r--converter/other/fiasco/codec/approx.c4
-rw-r--r--converter/other/fiasco/codec/subdivide.c2
-rw-r--r--converter/other/fiasco/codec/wfa.h2
-rw-r--r--converter/other/fiasco/input/read.c2
-rw-r--r--converter/other/fiasco/lib/arith.c4
-rw-r--r--converter/other/fiasco/lib/misc.c2
-rw-r--r--converter/other/infotopam.c2
-rw-r--r--converter/other/jbig/jbig.c2
-rw-r--r--converter/other/jpeg2000/libjasper/base/jas_stream.c2
-rw-r--r--converter/other/jpeg2000/libjasper/jpc/jpc_bs.h2
-rw-r--r--converter/other/jpeg2000/libjasper/jpc/jpc_cs.h2
-rw-r--r--converter/other/jpeg2000/libjasper/jpc/jpc_dec.h2
-rw-r--r--converter/other/jpeg2000/libjasper/jpc/jpc_t2cod.h4
-rw-r--r--converter/other/jpegtopnm.c2
-rw-r--r--converter/other/pamtopnm.c4
-rw-r--r--converter/other/pnmtopng.c2
-rw-r--r--converter/other/sunicontopnm.c2
-rw-r--r--converter/other/xwdtopnm.c4
18 files changed, 23 insertions, 23 deletions
diff --git a/converter/other/fiasco/codec/approx.c b/converter/other/fiasco/codec/approx.c
index 72e38cbf..5072fae3 100644
--- a/converter/other/fiasco/codec/approx.c
+++ b/converter/other/fiasco/codec/approx.c
@@ -294,7 +294,7 @@ static real_t ip_domain_ortho_vector [MAXSTATES][MAXEDGES];
 static real_t rem_denominator [MAXSTATES];     
 static real_t rem_numerator [MAXSTATES];
 /*
- *  At step n of the orthogonalization the comparitive value
+ *  At step n of the orthogonalization the comparative value
  *  (numerator_i / denominator_i):= <b, o_n>^2 / ||o_n|| ,
  *  is computed for every domain i,
  *  where o_n := s_i - \sum(k = 0, ... , n-1) {(<s_i, o_k> / ||o_k||^2) o_k}
@@ -670,7 +670,7 @@ orthogonalize (unsigned index, unsigned n, unsigned level, real_t min_norm,
     *  for (i = 0, ... , wfa->states)  
     *  <s_i, o_n> := <s_i, v_n> -
     *      \sum (k = 0, ... , n - 1){ <v_n, o_k> <s_i, o_k> / ||o_k||^2}
-    *  Moreover the denominator and numerator parts of the comparitive
+    *  Moreover the denominator and numerator parts of the comparative
     *  value are updated.
     */
    for (domain = 0; domain_blocks [domain] >= 0; domain++) 
diff --git a/converter/other/fiasco/codec/subdivide.c b/converter/other/fiasco/codec/subdivide.c
index f845d859..059aa477 100644
--- a/converter/other/fiasco/codec/subdivide.c
+++ b/converter/other/fiasco/codec/subdivide.c
@@ -289,7 +289,7 @@ subdivide (real_t max_costs, unsigned band, int y_state, range_t *range,
 			  : rrange.y;
 	 
 	 /* 
-	  *  If neccessary compute the inner products of the new states
+	  *  If necessary compute the inner products of the new states
 	  *  (generated during the recursive approximation of child [0])
 	  */
 	 if (label && rrange.level <= c->options.lc_max_level)
diff --git a/converter/other/fiasco/codec/wfa.h b/converter/other/fiasco/codec/wfa.h
index 8b9793f2..0b96ba8c 100644
--- a/converter/other/fiasco/codec/wfa.h
+++ b/converter/other/fiasco/codec/wfa.h
@@ -122,7 +122,7 @@ typedef struct wfa
    real_t	*final_distribution;    /* one pixel images */
    byte_t	*level_of_state;	/* level of the image part which is
 					   represented by the current state */
-   byte_t	*domain_type;		/* Bit_0==1: auxilliary state
+   byte_t	*domain_type;		/* Bit_0==1: auxiliary state
 					   Bit_1==1: used for Y compr */
    mv_t		(*mv_tree)[MAXLABELS];	/* motion vectors */
    word_t	(*tree)[MAXLABELS];	/* bintree partitioning */
diff --git a/converter/other/fiasco/input/read.c b/converter/other/fiasco/input/read.c
index 23f92070..9690a6c5 100644
--- a/converter/other/fiasco/input/read.c
+++ b/converter/other/fiasco/input/read.c
@@ -277,7 +277,7 @@ read_basis (const char *filename, wfa_t *wfa)
     *   string		|MAGIC Number "Wfa"
     *	int		|Number of basis states 'N'
     *	bool_t-array[N]	|use vector in linear combinations,
-    *			|0: don't use vector (auxilliary state)
+    *			|0: don't use vector (auxiliary state)
     *			|1: use vector in linear combinations
     *	float-array[N]	|final distribution of every state
     *
diff --git a/converter/other/fiasco/lib/arith.c b/converter/other/fiasco/lib/arith.c
index e3745bf7..dc35d1d1 100644
--- a/converter/other/fiasco/lib/arith.c
+++ b/converter/other/fiasco/lib/arith.c
@@ -90,7 +90,7 @@ encode_symbol (unsigned symbol, arith_t *arith, model_t *model)
  *  The current state of the arithmetic coder is given by 'arith'.
  *  Output bits are appended to the stream 'output'.
  *
- *  The model is updated after encoding the symbol (if neccessary the
+ *  The model is updated after encoding the symbol (if necessary the
  *  symbol counts are rescaled).
  *  
  *  Return value:
@@ -354,7 +354,7 @@ decode_symbol (arith_t *arith, model_t *model)
  *  Decode the next symbol - the state of the arithmetic decoder
  *  is given in 'arith'. Read refinement bits from the stream 'input'
  *  and use the given probability 'model'. Update the probability model after
- *  deconding the symbol (if neccessary also rescale the symbol counts).
+ *  deconding the symbol (if necessary also rescale the symbol counts).
  *  
  *  Return value:
  *	decoded symbol
diff --git a/converter/other/fiasco/lib/misc.c b/converter/other/fiasco/lib/misc.c
index e0e41447..dd9f0bb2 100644
--- a/converter/other/fiasco/lib/misc.c
+++ b/converter/other/fiasco/lib/misc.c
@@ -1,5 +1,5 @@
 /*
- *  misc.c:		Some usefull functions, that don't fit in one of 
+ *  misc.c:		Some useful functions, that don't fit in one of 
  *			the other files and that are needed by at least
  *			two modules. 
  *
diff --git a/converter/other/infotopam.c b/converter/other/infotopam.c
index 0504a147..f2e35827 100644
--- a/converter/other/infotopam.c
+++ b/converter/other/infotopam.c
@@ -114,7 +114,7 @@ typedef struct DiskObject_ { /* 78 bytes (including Gadget struct) */
     unsigned char version[2];       /* Object version number */
     unsigned char gadget[44];       /* Copy of in memory gadget (44 by */
     unsigned char type;             /* ??? */
-    unsigned char pad;              /* Pad it out to the next word boundry */
+    unsigned char pad;              /* Pad it out to the next word boundary */
     unsigned char pDefaultTool[4];  /* Pointer  to default tool */
     unsigned char ppToolTypes[4];   /* Pointer pointer to tool types */
     unsigned char currentX[4];      /* Current X position (?) */
diff --git a/converter/other/jbig/jbig.c b/converter/other/jbig/jbig.c
index ebd7c08f..90295d8b 100644
--- a/converter/other/jbig/jbig.c
+++ b/converter/other/jbig/jbig.c
@@ -2330,7 +2330,7 @@ static size_t decode_pscd(struct jbg_dec_state *s, unsigned char *data,
  * cases the remaining len - *cnt bytes of the previous block will
  * have to passed to this function again (if len > *cnt). In case of
  * any other return value than JBG_EOK, JBG_EOK_INTR or JBG_EAGAIN, a
- * serious problem has occured and the only function you should call
+ * serious problem has occurred and the only function you should call
  * is jbg_dec_free() in order to remove the mess (and probably
  * jbg_strerror() in order to find out what to tell the user).
  */
diff --git a/converter/other/jpeg2000/libjasper/base/jas_stream.c b/converter/other/jpeg2000/libjasper/base/jas_stream.c
index 19dc7c11..7af161d2 100644
--- a/converter/other/jpeg2000/libjasper/base/jas_stream.c
+++ b/converter/other/jpeg2000/libjasper/base/jas_stream.c
@@ -902,7 +902,7 @@ int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n)
 	while (all || m > 0) {
 		if ((c = jas_stream_getc_macro(in)) == EOF) {
 			/* The next character of input could not be read. */
-			/* Return with an error if an I/O error occured
+			/* Return with an error if an I/O error occurred
 			  (not including EOF) or if an explicit copy count
 			  was specified. */
 			return (!all || jas_stream_error(in)) ? (-1) : 0;
diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_bs.h b/converter/other/jpeg2000/libjasper/jpc/jpc_bs.h
index f515972b..edb0a2df 100644
--- a/converter/other/jpeg2000/libjasper/jpc/jpc_bs.h
+++ b/converter/other/jpeg2000/libjasper/jpc/jpc_bs.h
@@ -149,7 +149,7 @@
 #define	JPC_BITSTREAM_NOCLOSE	0x01
 /* End of file has been reached while reading. */
 #define	JPC_BITSTREAM_EOF	0x02
-/* An I/O error has occured. */
+/* An I/O error has occurred. */
 #define	JPC_BITSTREAM_ERR	0x04
 
 /******************************************************************************\
diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_cs.h b/converter/other/jpeg2000/libjasper/jpc/jpc_cs.h
index 07a046d1..4bff677c 100644
--- a/converter/other/jpeg2000/libjasper/jpc/jpc_cs.h
+++ b/converter/other/jpeg2000/libjasper/jpc/jpc_cs.h
@@ -188,7 +188,7 @@ typedef struct {
 	/* The tile number. */
 	uint_fast16_t tileno;
 
-	/* The combined length of the marker segment and its auxilary data
+	/* The combined length of the marker segment and its auxiliary data
 	  (i.e., packet data). */
 	uint_fast32_t len;
 
diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_dec.h b/converter/other/jpeg2000/libjasper/jpc/jpc_dec.h
index 5231048d..02c5553d 100644
--- a/converter/other/jpeg2000/libjasper/jpc/jpc_dec.h
+++ b/converter/other/jpeg2000/libjasper/jpc/jpc_dec.h
@@ -175,7 +175,7 @@ typedef struct {
 	/* The number of streams in this list. */
 	int numstreams;
 
-	/* The maximum number of streams that can be accomodated without
+	/* The maximum number of streams that can be accommodated without
 	  growing the streams array. */
 	int maxstreams;
 
diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_t2cod.h b/converter/other/jpeg2000/libjasper/jpc/jpc_t2cod.h
index 05f41b9e..82dafcce 100644
--- a/converter/other/jpeg2000/libjasper/jpc/jpc_t2cod.h
+++ b/converter/other/jpeg2000/libjasper/jpc/jpc_t2cod.h
@@ -136,7 +136,7 @@ typedef struct {
 	/* The number of progression changes. */
 	int numpchgs;
 
-	/* The maximum number of progression changes that can be accomodated
+	/* The maximum number of progression changes that can be accommodated
 	  without growing the progression change array. */
 	int maxpchgs;
 
@@ -253,7 +253,7 @@ typedef struct {
 	/* The progression change list. */
 	jpc_pchglist_t *pchglist;
 
-	/* The progression to use in the absense of explicit specification. */
+	/* The progression to use in the absence of explicit specification. */
 	jpc_pchg_t defaultpchg;
 
 	/* The current progression change number. */
diff --git a/converter/other/jpegtopnm.c b/converter/other/jpegtopnm.c
index 790abff2..cbac0a09 100644
--- a/converter/other/jpegtopnm.c
+++ b/converter/other/jpegtopnm.c
@@ -22,7 +22,7 @@
     Extend pamtoppm to convert this to ppm using the standard
     transformation.
 
-    See if additional decompressor options effects signficant speedup.
+    See if additional decompressor options effects significant speedup.
     grayscale output of color image, downscaling, color quantization, and
     dithering are possibilities.  Djpeg's man page says they make it faster.
 
diff --git a/converter/other/pamtopnm.c b/converter/other/pamtopnm.c
index 8bb45192..ba655b1e 100644
--- a/converter/other/pamtopnm.c
+++ b/converter/other/pamtopnm.c
@@ -69,11 +69,11 @@ validateTupleType(struct pam const inpam,
 /*----------------------------------------------------------------------------
    Make sure the image has a tuple type we know how to convert to PNM.
 
-   We're quite liberal, trying to accomodate all sorts of future
+   We're quite liberal, trying to accommodate all sorts of future
    twists on the formats.  If the tuple type _starts with_
    BLACKANDWHITE, GRAYSCALE, or RGB, and has at least as many planes
    as we'd need to convert to PBM, PGM, or PPM, respectively, we
-   accept it.  We thus accomodate variations on these formats that add
+   accept it.  We thus accommodate variations on these formats that add
    planes and add to the right end of the tuple type to explain them.
 
    If Callers specified 'assumeTupleType', we're even more liberal.
diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c
index 4b18bdf3..3e41e64d 100644
--- a/converter/other/pnmtopng.c
+++ b/converter/other/pnmtopng.c
@@ -1643,7 +1643,7 @@ makeOneColorTransparentInPalette(xel            const transColor,
         *transSizeP = 1;
         if (verbose) {
             pixel const p = palette_pnm[0];
-            pm_message("Making all occurences of color (%u, %u, %u) "
+            pm_message("Making all occurrences of color (%u, %u, %u) "
                        "transparent.",
                        PPM_GETR(p), PPM_GETG(p), PPM_GETB(p));
         }
diff --git a/converter/other/sunicontopnm.c b/converter/other/sunicontopnm.c
index 005b4491..ad5aa0f8 100644
--- a/converter/other/sunicontopnm.c
+++ b/converter/other/sunicontopnm.c
@@ -13,7 +13,7 @@
 /*
   Most icon images are monochrome: Depth=1
   Depth=8 images are extremely rare.  At least some of these are color
-  images but we can't tell the pallete color order.
+  images but we can't tell the palette color order.
   Output will be in pgm.  Convert to ppm with pgmtoppm or pamlookup
   if necessary.
 */
diff --git a/converter/other/xwdtopnm.c b/converter/other/xwdtopnm.c
index f96b2fe4..d49a2b09 100644
--- a/converter/other/xwdtopnm.c
+++ b/converter/other/xwdtopnm.c
@@ -837,7 +837,7 @@ typedef struct {
 
            'nBitsLeft' tells how many bits are in the buffer now.  It's
            zero when nothing has ever been read from the file.  Only
-           the least signficant 'nBitsLeft' bits are meaningful.
+           the least significant 'nBitsLeft' bits are meaningful.
 
            The numeric value of the member is the number whose pure
            binary representation is the bit string in the buffer.
@@ -974,7 +974,7 @@ readItem(pixelReader * const rdrP) {
 
 static unsigned long const lsbmask[] = {
 /*----------------------------------------------------------------------------
-   lsbmask[i] is the mask you use to select the i least signficant bits
+   lsbmask[i] is the mask you use to select the i least significant bits
    of a bit string.
 -----------------------------------------------------------------------------*/
     0x00000000,