Fix inadvertent "TQ" changes.

(cherry picked from commit ca4b0c6d6aef469eede468b405ea89e119da3626)

4 files changed, 21 insertions, 21 deletions

diff --git a/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp
index 350d792d..9d5b726d 100644
--- a/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/BSEncodeByteStream.cpp
@@ -104,7 +104,7 @@ static const int OVERFLOW=32;
 
 // Sorting tresholds
 static const int RANKSORT_THRESH=10;
-static const int TQUICKSORT_STACK=512;
+static const int QUICKSORT_STACK=512;
 static const int PRESORT_THRESH=10;
 static const int PRESORT_DEPTH=8;
 static const int RADIX_THRESH=32768;
@@ -283,8 +283,8 @@ void
 _BSort::quicksort3r(int lo, int hi, int depth)
 {
   /* Initialize stack */
-  int slo[TQUICKSORT_STACK];
-  int shi[TQUICKSORT_STACK];
+  int slo[QUICKSORT_STACK];
+  int shi[QUICKSORT_STACK];
   int sp = 1;
   slo[0] = lo;
   shi[0] = hi;
@@ -342,7 +342,7 @@ _BSort::quicksort3r(int lo, int hi, int depth)
           vswap(hi-tmp+1, h+1, tmp, posn);
           h1 = hi - (h1-h);
           // -- process segments
-          ASSERT(sp+2<TQUICKSORT_STACK);
+          ASSERT(sp+2<QUICKSORT_STACK);
           // ----- middle segment (=?) [l1, h1]
           for(int i=l1;i<=h1;i++) 
             rank[posn[i]] = h1;
@@ -437,9 +437,9 @@ void
 _BSort::quicksort3d(int lo, int hi, int depth)
 {
   /* Initialize stack */
-  int slo[TQUICKSORT_STACK];
-  int shi[TQUICKSORT_STACK];
-  int sd[TQUICKSORT_STACK];
+  int slo[QUICKSORT_STACK];
+  int shi[QUICKSORT_STACK];
+  int sd[QUICKSORT_STACK];
   int sp = 1;
   slo[0] = lo;
   shi[0] = hi;
@@ -518,7 +518,7 @@ _BSort::quicksort3d(int lo, int hi, int depth)
           vswap(hi-tmp+1, h+1, tmp, posn);
           h1 = hi - (h1-h);
           // -- process segments
-          ASSERT(sp+3<TQUICKSORT_STACK);
+          ASSERT(sp+3<QUICKSORT_STACK);
           // ----- middle segment (=?) [l1, h1]
           l = l1; h = h1;
           if (med==0) // special case for marker [slow]
diff --git a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
index 054d4e09..5a8092a0 100644
--- a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
@@ -166,7 +166,7 @@ JB2Image::encode(const GP<ByteStream> &gbs) const
 #define MATCHED_REFINE_IMAGE_ONLY       (6)
 #define MATCHED_COPY                    (7)
 #define NON_MARK_DATA                   (8)
-#define RETQUIRED_DICT_OR_RESET          (9)
+#define REQUIRED_DICT_OR_RESET          (9)
 #define PRESERVED_COMMENT               (10)
 #define END_OF_DATA                     (11)
 
@@ -364,7 +364,7 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Dict> &gjim)
       int nshape = jim.get_shape_count();
       init_library(jim);
       // Code headers.
-      int rectype = RETQUIRED_DICT_OR_RESET;
+      int rectype = REQUIRED_DICT_OR_RESET;
       if (jim.get_inherited_shape_count() > 0)
         code_record(rectype, gjim, 0);
       rectype = START_OF_DATA;
@@ -388,7 +388,7 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Dict> &gjim)
 	  // Check numcoder status
 	  if (cur_ncell > CELLCHUNK) 
 	    {
-	      rectype = RETQUIRED_DICT_OR_RESET;
+	      rectype = REQUIRED_DICT_OR_RESET;
 	      code_record(rectype, 0, 0);	      
 	    }
         }
@@ -440,7 +440,7 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim)
             }
         }
       // Code headers.
-      int rectype = RETQUIRED_DICT_OR_RESET;
+      int rectype = REQUIRED_DICT_OR_RESET;
       if (jim.get_inherited_shape_count() > 0)
         code_record(rectype, gjim, 0, 0);
       rectype = START_OF_DATA;
@@ -507,7 +507,7 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim)
 	  // Check numcoder status
 	  if (cur_ncell > CELLCHUNK) 
 	    {
-	      rectype = RETQUIRED_DICT_OR_RESET;
+	      rectype = REQUIRED_DICT_OR_RESET;
 	      code_record(rectype, 0, 0);
 	    }
         }
@@ -546,7 +546,7 @@ JB2Dict::JB2Codec::Encode::encode_libonly_shape(
       // Check numcoder status
       if (cur_ncell > CELLCHUNK) 
 	{
-	  rectype = RETQUIRED_DICT_OR_RESET;
+	  rectype = REQUIRED_DICT_OR_RESET;
 	  code_record(rectype, 0, 0);
 	}
     }
diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp
index bbc06623..7aad9261 100644
--- a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp
@@ -354,7 +354,7 @@ JB2Image::decode(const GP<ByteStream> &gbs, JB2DecoderCallback *cb, void *arg)
 #define MATCHED_REFINE_IMAGE_ONLY       (6)
 #define MATCHED_COPY                    (7)
 #define NON_MARK_DATA                   (8)
-#define RETQUIRED_DICT_OR_RESET          (9)
+#define REQUIRED_DICT_OR_RESET          (9)
 #define PRESERVED_COMMENT               (10)
 #define END_OF_DATA                     (11)
 
@@ -999,7 +999,7 @@ JB2Dict::JB2Codec::code_record(
         code_comment(jim.comment);
         break;
       }
-    case RETQUIRED_DICT_OR_RESET:
+    case REQUIRED_DICT_OR_RESET:
       {
         if (! gotstartrecordp)
         {
@@ -1240,7 +1240,7 @@ JB2Dict::JB2Codec::code_record(
         code_comment(jim.comment);
         break;
       }
-    case RETQUIRED_DICT_OR_RESET:
+    case REQUIRED_DICT_OR_RESET:
       {
         if(!gjim)
         {
diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.h b/kviewshell/plugins/djvu/libdjvu/JB2Image.h
index 6733e9f5..a8ea8aae 100644
--- a/kviewshell/plugins/djvu/libdjvu/JB2Image.h
+++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.h
@@ -501,7 +501,7 @@ JB2Image::get_blit(int blitno) const
     These extensions are described below by reference to the ICFDD
     proposal dated August 1999.  Both extension make use of the unused
     record type value #9# (cf. ICFDD page 24) which has been renamed
-    #RETQUIRED_DICT_OR_RESET#.
+    #REQUIRED_DICT_OR_RESET#.
 
     {\bf Shared Shape Dictionaries} --- This extension provides
     support for sharing symbol definitions between the pages of a
@@ -515,7 +515,7 @@ JB2Image::get_blit(int blitno) const
     by the following records.  The first record usually is a ``Start
     Of Image'' record describing the size of the image.
 
-    Starting with version 21, a #RETQUIRED_DICT_OR_RESET# (9) record
+    Starting with version 21, a #REQUIRED_DICT_OR_RESET# (9) record
     type can appear {\em before} the #START_OF_DATA# (0) record.  The
     record type field is followed by a single number arithmetically
     encoded (cf. ICFDD page 26) using a sixteenth context (cf. ICFDD
@@ -548,7 +548,7 @@ JB2Image::get_blit(int blitno) const
     contexts. These contexts are normally allocated when they are used
     for the first time (cf. ICFDD informative note, page 27).
 
-    Starting with version 21, a #RETQUIRED_DICT_OR_RESET# (9) record
+    Starting with version 21, a #REQUIRED_DICT_OR_RESET# (9) record
     type can appear {\em after} the #START_OF_DATA# (0) record.  The
     decoder should proceed with the next record after {\em clearing
     all binary contexts used for coding numbers}.  This operation
@@ -556,7 +556,7 @@ JB2Image::get_blit(int blitno) const
     numbers can be deallocated.
   
     Starting with version 21, the JB2 encoder should insert a
-    #RETQUIRED_DICT_OR_RESET# record type whenever the number of these
+    #REQUIRED_DICT_OR_RESET# record type whenever the number of these
     allocated binary contexts exceeds #20000#.  Only very large
     documents ever reach such a large number of allocated binary
     contexts (e.g large maps).  Hardware implementation however can