X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fxpdf%2FGString.cc;h=7653fd06e3e6b1dd2d1ed30f6321dba2e069a22b;hb=38c19185b95fb1c520088809254ab915db31ff5c;hp=7b8f271840752d8252cfcd355faccc7028881b25;hpb=fc554a43712b76d16b41ec77dd311b4a78b1ef6b;p=swftools.git

diff --git a/pdf2swf/xpdf/GString.cc b/pdf2swf/xpdf/GString.cc
index 7b8f271..7653fd0 100644
--- a/pdf2swf/xpdf/GString.cc
+++ b/pdf2swf/xpdf/GString.cc
@@ -4,11 +4,13 @@
 //
 // Simple variable-length string type.
 //
-// Copyright 1996 Derek B. Noonburg
+// Copyright 1996-2003 Glyph & Cog, LLC
 //
 //========================================================================
 
-#ifdef __GNUC__
+#include <aconf.h>
+
+#ifdef USE_GCC_PRAGMAS
 #pragma implementation
 #endif
 
@@ -45,18 +47,25 @@ GString::GString() {
   s[0] = '\0';
 }
 
-GString::GString(const char *s1) {
-  int n = strlen(s1);
+GString::GString(const char *sA) {
+  int n = strlen(sA);
 
   s = NULL;
   resize(length = n);
-  memcpy(s, s1, n + 1);
+  memcpy(s, sA, n + 1);
 }
 
-GString::GString(const char *s1, int length1) {
+GString::GString(const char *sA, int lengthA) {
   s = NULL;
-  resize(length = length1);
-  memcpy(s, s1, length * sizeof(char));
+  resize(length = lengthA);
+  memcpy(s, sA, length * sizeof(char));
+  s[length] = '\0';
+}
+
+GString::GString(GString *str, int idx, int lengthA) {
+  s = NULL;
+  resize(length = lengthA);
+  memcpy(s, str->getCString() + idx, length);
   s[length] = '\0';
 }
 
@@ -137,10 +146,10 @@ GString *GString::append(const char *str) {
   return this;
 }
 
-GString *GString::append(const char *str, int length1) {
-  resize(length + length1);
-  memcpy(s + length, str, length1);
-  length += length1;
+GString *GString::append(const char *str, int lengthA) {
+  resize(length + lengthA);
+  memcpy(s + length, str, lengthA);
+  length += lengthA;
   s[length] = '\0';
   return this;
 }
@@ -180,14 +189,14 @@ GString *GString::insert(int i, const char *str) {
   return this;
 }
 
-GString *GString::insert(int i, const char *str, int length1) {
+GString *GString::insert(int i, const char *str, int lengthA) {
   int j;
 
-  resize(length + length1);
+  resize(length + lengthA);
   for (j = length; j >= i; --j)
-    s[j+length1] = s[j];
-  memcpy(s+i, str, length1);
-  length += length1;
+    s[j+lengthA] = s[j];
+  memcpy(s+i, str, lengthA);
+  length += lengthA;
   return this;
 }
 
@@ -195,8 +204,12 @@ GString *GString::del(int i, int n) {
   int j;
 
   if (n > 0) {
-    for (j = i; j <= length - n; ++j)
+    if (i + n > length) {
+      n = length - i;
+    }
+    for (j = i; j <= length - n; ++j) {
       s[j] = s[j + n];
+    }
     resize(length -= n);
   }
   return this;