Changeset 860 for trunk/gsdl/src/mgpp/text/Terms.cpp

Timestamp:

2000-01-18T16:53:24+13:00 (24 years ago)

Author:

rjmcnab

Message:

Fixed a couple of bugs and made building silent if needed.

File:

• trunk/gsdl/src/mgpp/text/Terms.cpp (modified) (3 diffs)

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

@@ -318 +318 @@
   unsigned long outI = 0;
 
-  // increase comFragDataI until resulting range is positive
-  if (startRange < 0) {
-    while (comFragDataI < comFragDataSize &&
-       ((signed long)comFragData.fragNums[comFragDataI]+startRange < 0)) {
-      comFragDataI++;
-    }
-  }
-  
   while (fragDataI < fragDataSize &&
      comFragDataI < comFragDataSize) {
-    unsigned long fragNum = fragData.fragNums[fragDataI];
-    unsigned long comFragNum = comFragData.fragNums[comFragDataI];
+    signed long fragNum = (signed long)fragData.fragNums[fragDataI];
+    signed long comFragNum = (signed long)comFragData.fragNums[comFragDataI];
     
     // go to the right fragment limit (for the com frag)
     if (fragLimits != NULL) {
       while (fragLimitI+1 < fragLimitSize &&
-         comFragNum > (*fragLimits)[fragLimitI+1].rangeStart) {
+         comFragNum > (signed long)(*fragLimits)[fragLimitI+1].rangeStart) {
     fragLimitI++;
       }
@@ -340 +332 @@
 
     if (fragNum <= comFragNum+startRange ||
-    (fragLimits!=NULL && fragNum<=(*fragLimits)[fragLimitI].rangeStart)) {
+    (fragLimits!=NULL &&
+     fragNum<=(signed long)(*fragLimits)[fragLimitI].rangeStart)) {
       fragDataI++;
       
     } else if (fragNum > comFragNum+endRange ||
-           (fragLimits!=NULL && fragNum>(*fragLimits)[fragLimitI].rangeEnd)) {
+           (fragLimits!=NULL &&
+        fragNum>(signed long)(*fragLimits)[fragLimitI].rangeEnd)) {
       comFragDataI++;
       
@@ -357 +351 @@
       fragDataI++;
       comFragDataI++;
-      comFragDataI++;
+      outI++;
     }
   }