Assume newline after stream to be in line with spec

NicolaVerbeeck · Sep 6, 2023 · 92cb3fb · 92cb3fb
1 parent 89235ce
commit 92cb3fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/lib/src/parser/pdf_object_parser.dart b/lib/src/parser/pdf_object_parser.dart
@@ -254,7 +254,7 @@ class PDFObjectParser {
   }
 
   Future<PDFStreamObject?> _parseStream(PDFDictionary dictionary) async {
-    final line = await ReaderHelper.readWordTrimmed(_buffer);
+    final line = await ReaderHelper.readLine(_buffer);
     if ('tartxref' == line) return null;
     assert('tream' == line);
 

diff --git a/lib/src/utils/reader_helper.dart b/lib/src/utils/reader_helper.dart
@@ -33,12 +33,6 @@ abstract class ReaderHelper {
       }
       word.writeCharCode(await tokenStream.consumeToken());
     }
-    // Trim the end
-    try {
-      await skipUntilFirstNonWhitespace(tokenStream);
-    } on EOFException {
-      // Ignore
-    }
     return word.toString();
   }
 

diff --git a/test/parser/pdf_stream_parser.dart b/test/parser/pdf_stream_parser.dart
@@ -6,7 +6,8 @@ void streamParserTests() {
   group('Stream parser tests', () {
     test('Test empty stream', () async {
       final stream =
-          await createParserFromString('<</Length 0>>stream endstream').parse();
+          await createParserFromString('<</Length 0>>stream\nendstream')
+              .parse();
       expect(stream, isA<PDFStreamObject>());
 
       stream as PDFStreamObject;
@@ -23,7 +24,7 @@ void streamParserTests() {
           .thenAnswer((invocation) async => const PDFIndirectObject(
               objectId: 1, generationNumber: 0, object: PDFNumber(0)));
       final stream = await createParserFromString(
-        '<</Length 1 0 R>>stream endstream',
+        '<</Length 1 0 R>>stream\nendstream',
         mockParser,
       ).parse();
       expect(stream, isA<PDFStreamObject>());
@@ -38,7 +39,7 @@ void streamParserTests() {
     });
     test('Test stream with data', () async {
       final stream =
-          await createParserFromString('<</Length 3>>stream abcendstream')
+          await createParserFromString('<</Length 3>>stream\nabcendstream')
               .parse();
       expect(stream, isA<PDFStreamObject>());