[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kpdf/annotations/kdegraphics/kpdf/xpdf/fofi
From:       Enrico Ros <rosenric () dei ! unipd ! it>
Date:       2005-07-27 22:16:21
Message-ID: 1122502581.193013.8764.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 439365 by eros:

Merging trunk changes (now 3.5) till 2005-07-27.
patch_139 (http://tinyurl.com/8j5nb)


 M  +6 -10     FoFiType1.cc  


--- branches/kpdf/annotations/kdegraphics/kpdf/xpdf/fofi/FoFiType1.cc #439364:439365
@@ -186,17 +186,13 @@
 	      }
 	    }
 	  }
-	} else {
-	  p = strtok(buf, " \t\n\r");
-	  if (p)
-	  {
-	    if (!strcmp(p, "def")) break;
-	    if (!strcmp(p, "readonly")) break;
-	    // the spec does not says this but i'm mantaining old xpdf behaviour that \
                accepts "foo def" as end of the encoding array
-	    p = strtok(buf, " \t\n\r");
-	    if (p && !strcmp(p, "def")) break;
-	  }
 	}
+	
+	// Any line that begins with "def" or contains " def"
+	// terminates the encoding array.
+	if (!strcmp (p, "def") || strstr (buf, " def"))
+	  break;
+	
 	line = line1;
       }
       //~ check for getinterval/putinterval junk


[prev in list] [next in list] [prev in thread] [next in thread]