Revision: 2871
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2871&view=rev
Author:   hofman
Date:     2007-09-09 14:47:05 -0700 (Sun, 09 Sep 2007)

Log Message:
-----------
Don't scan newlines when they are skipped.

Modified Paths:
--------------
    trunk/SKFDFParser.m

Modified: trunk/SKFDFParser.m
===================================================================
--- trunk/SKFDFParser.m 2007-09-09 21:26:07 UTC (rev 2870)
+++ trunk/SKFDFParser.m 2007-09-09 21:47:05 UTC (rev 2871)
@@ -135,9 +135,7 @@
                         while ([scanner scanFDFComment:NULL]);
                         if ([scanner scanString:@"stream" intoString:NULL]) {
                             object = @"";
-                            [scanner scanString:@"\n" intoString:NULL] || 
[scanner scanString:@"\r\n" intoString:NULL];
-                            
-                            if ([scanner scanUpToString:@"endstream" 
intoString:&object]) {
+                            if ([scanner scanUpToString:@"endstream" 
intoString:&object] && [scanner scanString:@"endstream" intoString:NULL]) {
                                 int end = [object length];
                                 unichar ch = end ? [object 
characterAtIndex:end - 1] : 0;
                                 if ([[NSCharacterSet newlineCharacterSet] 
characterIsMember:ch]) {
@@ -147,7 +145,6 @@
                                     object = [object substringToIndex:end];
                                 }
                             }
-                            [scanner scanString:@"endstream" intoString:NULL];
                         }
                         [fdfDict setObject:object forKey:[SKIndirectObject 
indirectObjectWithNumber:objNumber generation:genNumber]];
                         while ([scanner scanFDFComment:NULL]);


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to