From d296f1d337dabfeae5191955fdadb874965dbbe9 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 10 Aug 2011 12:13:27 -0500
Subject: rename the following methods: tqparent parent tqmask mask

---
 tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c      | 2 +-
 tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c     | 2 +-
 tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h        | 2 +-
 tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c    | 2 +-
 tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h    | 4 ++--
 tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c     | 2 +-
 tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc   | 4 ++--
 tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'tqtinterface/qt4/src/3rdparty/libjpeg')

diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c
index aec9cf8..f235250 100644
--- a/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c
+++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c
@@ -310,7 +310,7 @@ emit_bits (working_state * state, unsigned int code, int size)
   if (size == 0)
     ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE);
 
-  put_buffer &= (((INT32) 1)<<size) - 1; /* tqmask off any extra bits in code */
+  put_buffer &= (((INT32) 1)<<size) - 1; /* mask off any extra bits in code */
   
   put_bits += size;		/* new number of bits in buffer */
   
diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c
index 5567f88..07f9178 100644
--- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c
+++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c
@@ -239,7 +239,7 @@ emit_bits (phuff_entropy_ptr entropy, unsigned int code, int size)
   if (entropy->gather_statistics)
     return;			/* do nothing if we're only getting stats */
 
-  put_buffer &= (((INT32) 1)<<size) - 1; /* tqmask off any extra bits in code */
+  put_buffer &= (((INT32) 1)<<size) - 1; /* mask off any extra bits in code */
   
   put_bits += size;		/* new number of bits in buffer */
   
diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h
index 24e4c5c..e11fafa 100644
--- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h
+++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h
@@ -68,7 +68,7 @@ typedef FAST_FLOAT FLOAT_MULT_TYPE; /* preferred floating type */
  * Each IDCT routine is responsible for range-limiting its results and
  * converting them to unsigned form (0..MAXJSAMPLE).  The raw outputs could
  * be quite far out of range if the input data is corrupt, so a bulletproof
- * range-limiting step is required.  We use a tqmask-and-table-lookup method
+ * range-limiting step is required.  We use a mask-and-table-lookup method
  * to do the combined operations quickly.  See the comments with
  * prepare_range_limit_table (in jdmaster.c) for more info.
  */
diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c
index 9219b1c..9c4901a 100644
--- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c
+++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c
@@ -224,7 +224,7 @@ jpeg_calc_output_dimensions (j_decompress_ptr cinfo)
  *		x = range_limit[x & MASK];
  * where MASK is 2 bits wider than legal sample data, ie 10 bits for 8-bit
  * samples.  Under normal circumstances this is more than enough range and
- * a correct output will be generated; with bogus input data the tqmask will
+ * a correct output will be generated; with bogus input data the mask will
  * cause wraparound, and we will safely generate a bogus-but-in-range output.
  * For the post-IDCT step, we want to convert the data from signed to unsigned
  * representation by adding CENTERJSAMPLE at the same time that we limit it.
diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h
index c2b38a7..a2cae21 100644
--- a/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h
+++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h
@@ -27,7 +27,7 @@
  * Maximum number of components (color channels) allowed in JPEG image.
  * To meet the letter of the JPEG spec, set this to 255.  However, darn
  * few applications need more than 4 channels (maybe 5 for CMYK + alpha
- * tqmask).  We recommend 10 as a reasonable compromise; use 4 if you are
+ * mask).  We recommend 10 as a reasonable compromise; use 4 if you are
  * really short on memory.  (Each allowed component costs a hundred or so
  * bytes of storage, whether actually used in an image or not.)
  */
@@ -51,7 +51,7 @@
 
 #if BITS_IN_JSAMPLE == 8
 /* JSAMPLE should be the smallest type that will hold the values 0..255.
- * You can use a signed char by having GETJSAMPLE tqmask it with 0xFF.
+ * You can use a signed char by having GETJSAMPLE mask it with 0xFF.
  */
 
 #ifdef HAVE_UNSIGNED_CHAR
diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c
index fd173cf..0befadf 100644
--- a/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c
+++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c
@@ -71,7 +71,7 @@
 #define ODITHER_SIZE  16	/* dimension of dither matrix */
 /* NB: if ODITHER_SIZE is not a power of 2, ODITHER_MASK uses will break */
 #define ODITHER_CELLS (ODITHER_SIZE*ODITHER_SIZE)	/* # cells in matrix */
-#define ODITHER_MASK  (ODITHER_SIZE-1) /* tqmask for wrapping around counters */
+#define ODITHER_MASK  (ODITHER_SIZE-1) /* mask for wrapping around counters */
 
 typedef int ODITHER_MATRIX[ODITHER_SIZE][ODITHER_SIZE];
 typedef int (*ODITHER_MATRIX_PTR)[ODITHER_SIZE];
diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc
index bcd97d1..b50e716 100644
--- a/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc
+++ b/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc
@@ -1712,7 +1712,7 @@ reason for using progressive JPEG.
 
 The IJG encoder library generates progressive JPEG files when given a
 suitable "scan script" defining how to divide the data into scans.
-Creation of progressive JPEG files is otherwise transtqparent to the encoder.
+Creation of progressive JPEG files is otherwise transparent to the encoder.
 Progressive JPEG files can also be read transparently by the decoder library.
 If the decoding application simply uses the library as defined above, it
 will receive a final decoded image without any indication that the file was
@@ -1759,7 +1759,7 @@ Progressive decompression:
 When buffered-image mode is not used, the decoder library will read all of
 a multi-scan file during jpeg_start_decompress(), so that it can provide a
 final decoded image.  (Here "multi-scan" means either progressive or
-multi-scan sequential.)  This makes multi-scan files transtqparent to the
+multi-scan sequential.)  This makes multi-scan files transparent to the
 decoding application.  However, existing applications that used suspending
 input with version 5 of the IJG library will need to be modified to check
 for a suspension return from jpeg_start_decompress().
diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc
index 6440b8e..16b4270 100644
--- a/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc
+++ b/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc
@@ -582,7 +582,7 @@ The basic element type JSAMPLE will typically be one of unsigned char,
 (signed) char, or short.  Short will be used if samples wider than 8 bits are
 to be supported (this is a compile-time option).  Otherwise, unsigned char is
 used if possible.  If the compiler only supports signed chars, then it is
-necessary to tqmask off the value when reading.  Thus, all reads of JSAMPLE
+necessary to mask off the value when reading.  Thus, all reads of JSAMPLE
 values must be coded as "GETJSAMPLE(value)", where the macro will be defined
 as "((value) & 0xFF)" on signed-char machines and "((int) (value))" elsewhere.
 
-- 
cgit v1.2.1