Changeset 8691 for trunk/gsdl/src/mgpp/text/TextGet.cpp

Timestamp:

2004-11-29T15:04:28+13:00 (20 years ago)

Author:

kjdon

Message:

Added the changes from Emanuel Dejanu (Simple Words) - mostly efficiency changes. For example, changing i++ to ++i, delete xxx to delete []xxx, some stuff to do with UCArrays...

File:

• trunk/gsdl/src/mgpp/text/TextGet.cpp (modified) (24 diffs)

trunk/gsdl/src/mgpp/text/TextGet.cpp

@@ -20 +20 @@
  **************************************************************************/
 
+// is important to be first, so we escape the truncation warning on VC++
+#include "TextGet.h"
 // need this to avoid bizarre compiler problems under VC++ 6.0
 #if defined (__WIN32__) && !defined (GSDL_USE_IOS_H)
@@ -25 +27 @@
 #endif
 
-#include "TextGet.h"
 #include "mg_files.h"
 #include "netorder.h"
@@ -49 +50 @@
   memset (ad, '\0', sizeof (*ad));
 
-  for (i = 0; i <= 1; i++)
+  for (i = 0; i <= 1; ++i)
     {
       int j;
@@ -77 +78 @@
 
       pos = ad->word_data[i];
-      for (j = 0; j < (int)ad->afh[i].num_frags; j++)
+      for (j = 0; j < (int)ad->afh[i].num_frags; ++j)
     {
       ad->words[i][j] = pos;
@@ -93 +94 @@
           ad->blk_end[i][num] = ad->blk_start[i][num] +
         (ad->blk_end[i][num - 1] - ad->blk_start[i][num - 1]) * 2;
-          num++;
+          ++num;
         }
     }
@@ -115 +116 @@
   lookback = cd.cdh.lookback;
 
-  for (i = cfh->hd.mincodelen; i <= cfh->hd.maxcodelen; i++) {
+  for (i = cfh->hd.mincodelen; i <= cfh->hd.maxcodelen; ++i) {
     ptrs_reqd += (cfh->hd.lencount[i] + ((1 << lookback) - 1)) >> lookback;
     mem_reqd += cfh->huff_words_size[i];
@@ -135 +136 @@
   values[0] = vals;
   values[0][0] = next_word[0];
-  for (i = 1; i <= cfh->hd.maxcodelen; i++)
+  for (i = 1; i <= cfh->hd.maxcodelen; ++i)
     {
       int next_start = (values[i - 1] - vals) +
@@ -146 +147 @@
   memset (num_set, '\0', sizeof (num_set));
 
-  for (i = 0; i < cfh->hd.num_codes; i++)
+  for (i = 0; i < cfh->hd.num_codes; ++i)
     {
       register int val, copy;
@@ -175 +176 @@
     }
       memcpy (last_word[len], word, *word + 1);
-      num_set[len]++;
+      ++num_set[len];
     }
   if (cfh->hd.clens)
-    delete cfh->hd.clens;
+    delete []cfh->hd.clens;
   cfh->hd.clens = NULL;
   return values;
@@ -196 +197 @@
     return 3;
   if (hd->clens)
-    delete hd->clens;
+    delete []hd->clens;
   hd->clens = NULL;
   if (type == chars)
@@ -239 +240 @@
     return false;
 
-  for (which = 0; which < 2; which++)
+  for (which = 0; which < 2; ++which)
     switch (cd.cdh.dict_type)
       {
@@ -353 +354 @@
   fread (fixup, fixup_mem, sizeof (u_char), text_fast_comp_dict);
 
-  for (p = (u_long *) cd; (u_long) p < (u_long) end; p++)
+  for (p = (u_long *) cd; (u_long) p < (u_long) end; ++p)
     if (IS_FIXUP (p))
       {
@@ -364 +365 @@
   NTOHUL(cd->cdh.dict_type);
   NTOHUL(cd->cdh.novel_method);
-  for (i = 0; i < TEXT_PARAMS; i++)
+  for (i = 0; i < TEXT_PARAMS; ++i)
     NTOHUL(cd->cdh.params[i]);
   NTOHUL(cd->cdh.num_words[0]);
@@ -372 +373 @@
   NTOHUL(cd->cdh.lookback);
   /* cfh */
-  for (i = 0; i <= 1; i++)
+  for (i = 0; i <= 1; ++i)
     {
       int j;
@@ -379 +380 @@
       NTOHSI(cd->cfh[i]->hd.mincodelen);
       NTOHSI(cd->cfh[i]->hd.maxcodelen);
-      for (j = 0; j < MAX_HUFFCODE_LEN + 1; j++)
+      for (j = 0; j < MAX_HUFFCODE_LEN + 1; ++j)
     {
       NTOHSI(cd->cfh[i]->hd.lencount[j]);
@@ -385 +386 @@
     }
       NTOHUL(cd->cfh[i]->uncompressed_size);
-      for (j = 0; j < MAX_HUFFCODE_LEN + 1; j++)
+      for (j = 0; j < MAX_HUFFCODE_LEN + 1; ++j)
     NTOHUL(cd->cfh[i]->huff_words_size[j]);
     }
@@ -392 +393 @@
   if (cd->cdh.novel_method == MG_NOVEL_DELTA ||
       cd->cdh.novel_method == MG_NOVEL_HYBRID)
-    for (i = 0; i <= 1; i++)
+    for (i = 0; i <= 1; ++i)
       {
     int j;
@@ -398 +399 @@
     NTOHUL(cd->ad->afh[i].num_frags);
     NTOHUL(cd->ad->afh[i].mem_for_frags);
-    for (j = 0; j < 33; j++)
+    for (j = 0; j < 33; ++j)
       {
         NTOHSI(cd->ad->blk_start[i][j]);
@@ -406 +407 @@
   NTOHSI(cd->fast_loaded);
 
-  delete fixup;
+  delete []fixup;
 
   // the whole fast comp dict is a bit of a hack so I don't
@@ -584 +585 @@
   unsigned long bits = 0;
 
+  if (docText.capacity() < docText.size() + num_bits + 1) {
+    docText.reserve(docText.size() + num_bits + 1);
+  }
   // keep decoding bits until enough bits have been decoded
   while (bits < num_bits) {
@@ -616 +620 @@
       len = buffer.huff_decode(cd.lens_huff[which]->min_code,
                    cd.lens_vals[which], &bits);
-      for (i = 0; i < len; i++) {
+      for (i = 0; i < len; ++i) {
         c = buffer.huff_decode(cd.chars_huff[which]->min_code,
                    cd.chars_vals[which], &bits);
@@ -633 +637 @@
           {
         idx = buffer.delta_decode (&bits);
-        idx--;
+        --idx;
           }
           break;
@@ -640 +644 @@
         int k;
         k = buffer.gamma_decode (&bits);
-        k--;
+        --k;
         idx = buffer.binary_decode(ad->blk_end[which][k] -
                        ad->blk_start[which][k] + 1, 
@@ -650 +654 @@
       base = ad->words[which][idx];
       len = *base++;
-      for (; len; len--)
+      for (; len; --len)
         {
           docText.push_back (*base++);