add many new tests to exercise C api

git-svn-id: svn+q:///qpdf/trunk@727 71b93d88-0707-0410-a8cf-f5a4172ac649

255 files changed, 903 insertions, 27 deletions

diff --git a/TODO b/TODO
index d352e7ae..80d5f407 100644
--- a/TODO
+++ b/TODO
@@ -18,8 +18,6 @@
    files...ideally we should provide the object number currently being
    read
 
- * Have --check report the version number of the PDF file
-
  * See if it is possible to support rewriting a file in place or at
    least to detect and block this
 
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh
index 08f82efb..1a5ed649 100644
--- a/include/qpdf/QPDF.hh
+++ b/include/qpdf/QPDF.hh
@@ -39,7 +39,10 @@ class QPDF
     // lifetime.  This method must be called before any methods that
     // potentially ask for information about the PDF file are called.
     // Prior to calling this, the only methods that are allowed are
-    // those that set parameters.
+    // those that set parameters.  If the input file is not
+    // encrypted,either a null password or an empty password can be
+    // used.  If the file is encrypted, either the user password or
+    // the owner password may be supplied.
     DLL_EXPORT
     void processFile(char const* filename, char const* password = 0);
 
diff --git a/libqpdf/qpdf-c.cc b/libqpdf/qpdf-c.cc
index 4e60c525..d7f8d40f 100644
--- a/libqpdf/qpdf-c.cc
+++ b/libqpdf/qpdf-c.cc
@@ -83,11 +83,11 @@ QPDF_BOOL qpdf_more_warnings(qpdf_data qpdf)
 DLL_EXPORT
 char const* qpdf_next_error(qpdf_data qpdf)
 {
-    QTC::TC("qpdf", "qpdf-c called qpdf_next_error");
     if (qpdf_more_errors(qpdf))
     {
 	qpdf->tmp_string = qpdf->error;
 	qpdf->error.clear();
+	QTC::TC("qpdf", "qpdf-c qpdf_next_error returned error");
 	return qpdf->tmp_string.c_str();
     }
     else
@@ -99,11 +99,11 @@ char const* qpdf_next_error(qpdf_data qpdf)
 DLL_EXPORT
 char const* qpdf_next_warning(qpdf_data qpdf)
 {
-    QTC::TC("qpdf", "qpdf-c called qpdf_next_warning");
     if (qpdf_more_warnings(qpdf))
     {
 	qpdf->tmp_string = qpdf->warnings.front();
 	qpdf->warnings.pop_front();
+	QTC::TC("qpdf", "qpdf-c qpdf_next_warning returned warning");
 	return qpdf->tmp_string.c_str();
     }
     else
diff --git a/qpdf/qpdf-ctest.c b/qpdf/qpdf-ctest.c
index 1a25d22a..23947b6b 100644
--- a/qpdf/qpdf-ctest.c
+++ b/qpdf/qpdf-ctest.c
@@ -1,6 +1,84 @@
 #include <qpdf/qpdf-c.h>
+#include <stdio.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 
-int main()
+static qpdf_data qpdf = 0;
+
+static void report_errors()
+{
+    while (qpdf_more_warnings(qpdf))
+    {
+	printf("warning: %s\n", qpdf_next_warning(qpdf));
+    }
+    while (qpdf_more_errors(qpdf))
+    {
+	printf("error: %s\n", qpdf_next_error(qpdf));
+    }
+}
+
+static void test01(char const* infile,
+		   char const* password,
+		   char const* outfile)
+{
+    qpdf_read(qpdf, infile, password);
+    printf("version: %s\n", qpdf_get_pdf_version(qpdf));
+    printf("linearized: %d\n", qpdf_is_linearized(qpdf));
+    printf("encrypted: %d\n", qpdf_is_encrypted(qpdf));
+    if (qpdf_is_encrypted(qpdf))
+    {
+	printf("user password: %s\n", qpdf_get_user_password(qpdf));
+    }
+    report_errors();
+}
+
+int main(int argc, char* argv[])
 {
+    char* whoami = 0;
+    char* p = 0;
+    int n = 0;
+    char const* infile;
+    char const* password;
+    char const* outfile;
+    void (*fn)(char const*, char const*, char const*) = 0;
+
+    if ((p = strrchr(argv[0], '/')) != NULL)
+    {
+	whoami = p + 1;
+    }
+    else if ((p = strrchr(argv[0], '\\')) != NULL)
+    {
+	whoami = p + 1;
+    }
+    else
+    {
+	whoami = argv[0];
+    }
+    if (argc != 5)
+    {
+	fprintf(stderr, "usage: %s n infile password outfile\n", whoami);
+	exit(2);
+    }
+
+    n = atoi(argv[1]);
+    infile = argv[2];
+    password = argv[3];
+    outfile = argv[4];
+
+    fn = ((n == 1) ? test01 :
+	  0);
+
+    if (fn == 0)
+    {
+	fprintf(stderr, "%s: invalid test number %d\n", whoami, n);
+	exit(2);
+    }
+
+    qpdf = qpdf_init();
+    fn(infile, password, outfile);
+    qpdf_cleanup(&qpdf);
+    assert(qpdf == 0);
+
     return 0;
 }
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index 40a83a87..451cdeb6 100644
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@@ -858,6 +858,8 @@ int main(int argc, char* argv[])
 		std::cout << "checking " << infilename << std::endl;
 		try
 		{
+		    std::cout << "PDF Version: " << pdf.getPDFVersion()
+			      << std::endl;
 		    ::show_encryption(pdf);
 		    if (pdf.isLinearized())
 		    {
diff --git a/qpdf/qpdf.testcov b/qpdf/qpdf.testcov
index f0bd8688..c0ca04a1 100644
--- a/qpdf/qpdf.testcov
+++ b/qpdf/qpdf.testcov
@@ -122,8 +122,8 @@ qpdf-c called qpdf_init 0
 qpdf-c called qpdf_cleanup 0
 qpdf-c called qpdf_more_errors 0
 qpdf-c called qpdf_more_warnings 0
-qpdf-c called qpdf_next_error 0
-qpdf-c called qpdf_next_warning 0
+qpdf-c qpdf_next_error returned error 0
+qpdf-c qpdf_next_warning returned warning 0
 qpdf-c called qpdf_set_suppress_warnings 0
 qpdf-c called qpdf_set_ignore_xref_streams 0
 qpdf-c called qpdf_set_attempt_recovery 0
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test
index 508f1dd0..53cb08f5 100644
--- a/qpdf/qtest/qpdf.test
+++ b/qpdf/qtest/qpdf.test
@@ -159,7 +159,7 @@ for (my $i = 1; $i <= scalar(@badfiles); ++$i)
 show_ntests();
 # ----------
 $td->notify("--- Recovery Tests ---");
-$n_tests += @badfiles + 7;
+$n_tests += @badfiles + 8;
 
 # Recovery tests.  These are mostly after-the-fact -- when recovery
 # was implemented, some degree of recovery was possible on many of the
@@ -226,6 +226,12 @@ $td->runtest("run check on damaged file",
 	     {$td->FILE => "append-page-content-damaged-check.out",
 	      $td->EXIT_STATUS => 3},
 	     $td->NORMALIZE_NEWLINES);
+$td->runtest("check with C API",
+	     {$td->COMMAND =>
+		  "qpdf-ctest 1 append-page-content-damaged.pdf '' ''"},
+	     {$td->FILE => "append-page-content-damaged-c-check.out",
+	      $td->EXIT_STATUS => 0},
+	     $td->NORMALIZE_NEWLINES);
 
 show_ntests();
 # ----------
@@ -346,7 +352,7 @@ for (my $n = 16; $n <= 19; ++$n)
 show_ntests();
 # ----------
 $td->notify("--- Specific File Tests ---");
-$n_tests += 3;
+$n_tests += 4;
 $n_compare_pdfs += 1;
 
 # Special PDF files that caused problems at some point
@@ -356,11 +362,13 @@ $n_compare_pdfs += 1;
 # happen to test boundary conditions in the LZW decoder.
 $td->runtest("old and complex",
 	     {$td->COMMAND => "qpdf --check old-and-complex.pdf"},
-	     {$td->STRING => +("checking old-and-complex.pdf\n" .
-			       "File is not encrypted\n" .
-			       "File is not linearized\n" .
-			       "No errors found\n"),
-			       $td->EXIT_STATUS => 0},
+	     {$td->FILE => "old-and-complex-check.out",
+	      $td->EXIT_STATUS => 0},
+	     $td->NORMALIZE_NEWLINES);
+$td->runtest("old and complex (C API)",
+	     {$td->COMMAND => "qpdf-ctest 1 old-and-complex.pdf '' ''"},
+	     {$td->FILE => "old-and-complex-c-check.out",
+	      $td->EXIT_STATUS => 0},
 	     $td->NORMALIZE_NEWLINES);
 
 $td->runtest("convert to qdf",
@@ -534,19 +542,13 @@ check_pdf("linearized and modified",
 
 $td->runtest("check linearized and modified",
 	     {$td->COMMAND => "qpdf --check lin-delete-and-reuse.pdf"},
-	     {$td->STRING => +("checking lin-delete-and-reuse.pdf\n" .
-			       "File is not encrypted\n" .
-			       "File is not linearized\n" .
-			       "No errors found\n"),
-			       $td->EXIT_STATUS => 0},
+	     {$td->FILE => "lin-delete-and-reuse-check.out",
+	      $td->EXIT_STATUS => 0},
 	     $td->NORMALIZE_NEWLINES);
 $td->runtest("check multiple modifications",
 	     {$td->COMMAND => "qpdf --check multiple-mods.pdf"},
-	     {$td->STRING => +("checking multiple-mods.pdf\n" .
-			       "File is not encrypted\n" .
-			       "File is not linearized\n" .
-			       "No errors found\n"),
-			       $td->EXIT_STATUS => 0},
+	     {$td->FILE => "multiple-mods-check.out",
+	      $td->EXIT_STATUS => 0},
 	     $td->NORMALIZE_NEWLINES);
 
 foreach my $base (@to_linearize)
@@ -812,7 +814,7 @@ my @flags = (["-qdf",						# 1
 	      "no arguments"],
 	     );
 
-$n_tests += (@files * @flags  * 2 * 2);
+$n_tests += (@files * @flags  * 2 * 3);
 $n_compare_pdfs += (@files * @flags * 2);
 $n_acroread += (@files * @flags * 2);
 
@@ -825,6 +827,7 @@ foreach my $file (@files)
 	my $n = 0;
 	my $oflags = "--object-streams=$o";
 	my $odescrip = "os:" . substr($o, 0, 1);
+	my $osuf = ($o eq 'generate' ? "-ogen" : "");
 	foreach my $d (@flags)
 	{
 	    my ($flags, $fdescrip) = @$d;
@@ -838,7 +841,13 @@ foreach my $file (@files)
 
 	    $td->runtest("check status",
 			 {$td->COMMAND => "qpdf --check a.pdf"},
-			 {$td->FILE => "$base.$n.check",
+			 {$td->FILE => "$base.$n$osuf.check",
+			  $td->EXIT_STATUS => 0},
+			 $td->NORMALIZE_NEWLINES);
+
+	    $td->runtest("check with C API",
+			 {$td->COMMAND => [qw(qpdf-ctest 1 a.pdf), "", ""]},
+			 {$td->FILE => "$base.$n$osuf.c-check",
 			  $td->EXIT_STATUS => 0},
 			 $td->NORMALIZE_NEWLINES);
 
diff --git a/qpdf/qtest/qpdf/U25A0.1-ogen.c-check b/qpdf/qtest/qpdf/U25A0.1-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.1-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.1-ogen.check b/qpdf/qtest/qpdf/U25A0.1-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.1-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.1.c-check b/qpdf/qtest/qpdf/U25A0.1.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.1.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.1.check b/qpdf/qtest/qpdf/U25A0.1.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/U25A0.1.check
+++ b/qpdf/qtest/qpdf/U25A0.1.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.10-ogen.c-check b/qpdf/qtest/qpdf/U25A0.10-ogen.c-check
new file mode 100644
index 00000000..d0e2e2aa
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.10-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/U25A0.10-ogen.check b/qpdf/qtest/qpdf/U25A0.10-ogen.check
new file mode 100644
index 00000000..fa130173
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.10-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -4
+User password = 
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.10.c-check b/qpdf/qtest/qpdf/U25A0.10.c-check
new file mode 100644
index 00000000..7d98e913
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.10.c-check
@@ -0,0 +1,4 @@
+version: 1.4
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/U25A0.10.check b/qpdf/qtest/qpdf/U25A0.10.check
index 0e0ed996..390434bc 100644
--- a/qpdf/qtest/qpdf/U25A0.10.check
+++ b/qpdf/qtest/qpdf/U25A0.10.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.4
 P = -4
 User password = 
 File is not linearized
diff --git a/qpdf/qtest/qpdf/U25A0.11-ogen.c-check b/qpdf/qtest/qpdf/U25A0.11-ogen.c-check
new file mode 100644
index 00000000..d21a7d2d
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.11-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/U25A0.11-ogen.check b/qpdf/qtest/qpdf/U25A0.11-ogen.check
new file mode 100644
index 00000000..c31b668c
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.11-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -4
+User password = 
+File is linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.11.c-check b/qpdf/qtest/qpdf/U25A0.11.c-check
new file mode 100644
index 00000000..ac26e200
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.11.c-check
@@ -0,0 +1,4 @@
+version: 1.4
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/U25A0.11.check b/qpdf/qtest/qpdf/U25A0.11.check
index 327d847a..e233cd3b 100644
--- a/qpdf/qtest/qpdf/U25A0.11.check
+++ b/qpdf/qtest/qpdf/U25A0.11.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.4
 P = -4
 User password = 
 File is linearized
diff --git a/qpdf/qtest/qpdf/U25A0.12-ogen.c-check b/qpdf/qtest/qpdf/U25A0.12-ogen.c-check
new file mode 100644
index 00000000..d0e2e2aa
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.12-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/U25A0.12-ogen.check b/qpdf/qtest/qpdf/U25A0.12-ogen.check
new file mode 100644
index 00000000..64d811d5
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.12-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -60
+User password = 
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.12.c-check b/qpdf/qtest/qpdf/U25A0.12.c-check
new file mode 100644
index 00000000..6ba46805
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.12.c-check
@@ -0,0 +1,4 @@
+version: 1.3
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/U25A0.12.check b/qpdf/qtest/qpdf/U25A0.12.check
index 48b8e821..9b269b15 100644
--- a/qpdf/qtest/qpdf/U25A0.12.check
+++ b/qpdf/qtest/qpdf/U25A0.12.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 P = -60
 User password = 
 File is not linearized
diff --git a/qpdf/qtest/qpdf/U25A0.2-ogen.c-check b/qpdf/qtest/qpdf/U25A0.2-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.2-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.2-ogen.check b/qpdf/qtest/qpdf/U25A0.2-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.2-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.2.c-check b/qpdf/qtest/qpdf/U25A0.2.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.2.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.2.check b/qpdf/qtest/qpdf/U25A0.2.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/U25A0.2.check
+++ b/qpdf/qtest/qpdf/U25A0.2.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.3-ogen.c-check b/qpdf/qtest/qpdf/U25A0.3-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.3-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.3-ogen.check b/qpdf/qtest/qpdf/U25A0.3-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.3-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.3.c-check b/qpdf/qtest/qpdf/U25A0.3.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.3.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.3.check b/qpdf/qtest/qpdf/U25A0.3.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/U25A0.3.check
+++ b/qpdf/qtest/qpdf/U25A0.3.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.4-ogen.c-check b/qpdf/qtest/qpdf/U25A0.4-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.4-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.4-ogen.check b/qpdf/qtest/qpdf/U25A0.4-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.4-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.4.c-check b/qpdf/qtest/qpdf/U25A0.4.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.4.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.4.check b/qpdf/qtest/qpdf/U25A0.4.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/U25A0.4.check
+++ b/qpdf/qtest/qpdf/U25A0.4.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.5-ogen.c-check b/qpdf/qtest/qpdf/U25A0.5-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.5-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.5-ogen.check b/qpdf/qtest/qpdf/U25A0.5-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.5-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.5.c-check b/qpdf/qtest/qpdf/U25A0.5.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.5.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.5.check b/qpdf/qtest/qpdf/U25A0.5.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/U25A0.5.check
+++ b/qpdf/qtest/qpdf/U25A0.5.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.6-ogen.c-check b/qpdf/qtest/qpdf/U25A0.6-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.6-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.6-ogen.check b/qpdf/qtest/qpdf/U25A0.6-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.6-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.6.c-check b/qpdf/qtest/qpdf/U25A0.6.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.6.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.6.check b/qpdf/qtest/qpdf/U25A0.6.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/U25A0.6.check
+++ b/qpdf/qtest/qpdf/U25A0.6.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.7-ogen.c-check b/qpdf/qtest/qpdf/U25A0.7-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.7-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.7-ogen.check b/qpdf/qtest/qpdf/U25A0.7-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.7-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.7.c-check b/qpdf/qtest/qpdf/U25A0.7.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.7.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.7.check b/qpdf/qtest/qpdf/U25A0.7.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/U25A0.7.check
+++ b/qpdf/qtest/qpdf/U25A0.7.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.8-ogen.c-check b/qpdf/qtest/qpdf/U25A0.8-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.8-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.8-ogen.check b/qpdf/qtest/qpdf/U25A0.8-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.8-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.8.c-check b/qpdf/qtest/qpdf/U25A0.8.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.8.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/U25A0.8.check b/qpdf/qtest/qpdf/U25A0.8.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/U25A0.8.check
+++ b/qpdf/qtest/qpdf/U25A0.8.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.9-ogen.c-check b/qpdf/qtest/qpdf/U25A0.9-ogen.c-check
new file mode 100644
index 00000000..d21a7d2d
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.9-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/U25A0.9-ogen.check b/qpdf/qtest/qpdf/U25A0.9-ogen.check
new file mode 100644
index 00000000..5bc7ceb7
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.9-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -60
+User password = 
+File is linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/U25A0.9.c-check b/qpdf/qtest/qpdf/U25A0.9.c-check
new file mode 100644
index 00000000..345b56d8
--- /dev/null
+++ b/qpdf/qtest/qpdf/U25A0.9.c-check
@@ -0,0 +1,4 @@
+version: 1.3
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/U25A0.9.check b/qpdf/qtest/qpdf/U25A0.9.check
index 547c43d5..e45e12d6 100644
--- a/qpdf/qtest/qpdf/U25A0.9.check
+++ b/qpdf/qtest/qpdf/U25A0.9.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 P = -60
 User password = 
 File is linearized
diff --git a/qpdf/qtest/qpdf/append-page-content-damaged-c-check.out b/qpdf/qtest/qpdf/append-page-content-damaged-c-check.out
new file mode 100644
index 00000000..892f61e4
--- /dev/null
+++ b/qpdf/qtest/qpdf/append-page-content-damaged-c-check.out
@@ -0,0 +1,9 @@
+WARNING: append-page-content-damaged.pdf: offset 0: file is damaged
+WARNING: append-page-content-damaged.pdf: can't find startxref
+WARNING: Attempting to reconstruct cross-reference table
+version: 1.3
+linearized: 0
+encrypted: 0
+warning: append-page-content-damaged.pdf: offset 0: file is damaged
+warning: append-page-content-damaged.pdf: can't find startxref
+warning: Attempting to reconstruct cross-reference table
diff --git a/qpdf/qtest/qpdf/append-page-content-damaged-check.out b/qpdf/qtest/qpdf/append-page-content-damaged-check.out
index 884de3a5..a50b32e6 100644
--- a/qpdf/qtest/qpdf/append-page-content-damaged-check.out
+++ b/qpdf/qtest/qpdf/append-page-content-damaged-check.out
@@ -2,5 +2,6 @@ WARNING: append-page-content-damaged.pdf: offset 0: file is damaged
 WARNING: append-page-content-damaged.pdf: can't find startxref
 WARNING: Attempting to reconstruct cross-reference table
 checking append-page-content-damaged.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
diff --git a/qpdf/qtest/qpdf/damaged-stream.out b/qpdf/qtest/qpdf/damaged-stream.out
index a5ac0c4c..002c89e6 100644
--- a/qpdf/qtest/qpdf/damaged-stream.out
+++ b/qpdf/qtest/qpdf/damaged-stream.out
@@ -1,4 +1,5 @@
 checking damaged-stream.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 WARNING: damaged-stream.pdf: offset 426: error decoding stream data for object 5 0: LZWDecoder: bad code received
diff --git a/qpdf/qtest/qpdf/fax-decode-parms.out b/qpdf/qtest/qpdf/fax-decode-parms.out
index 78c65c18..1fb36688 100644
--- a/qpdf/qtest/qpdf/fax-decode-parms.out
+++ b/qpdf/qtest/qpdf/fax-decode-parms.out
@@ -1,4 +1,5 @@
 checking fax-decode-parms.pdf
+PDF Version: 1.4
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.1-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.1-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.1-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.1-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.1-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.1-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.1.c-check b/qpdf/qtest/qpdf/hybrid-xref.1.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.1.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.1.check b/qpdf/qtest/qpdf/hybrid-xref.1.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.1.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.1.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.10-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.10-ogen.c-check
new file mode 100644
index 00000000..d0e2e2aa
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.10-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/hybrid-xref.10-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.10-ogen.check
new file mode 100644
index 00000000..fa130173
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.10-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -4
+User password = 
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.10.c-check b/qpdf/qtest/qpdf/hybrid-xref.10.c-check
new file mode 100644
index 00000000..d0e2e2aa
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.10.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/hybrid-xref.10.check b/qpdf/qtest/qpdf/hybrid-xref.10.check
index 0e0ed996..fa130173 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.10.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.10.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 P = -4
 User password = 
 File is not linearized
diff --git a/qpdf/qtest/qpdf/hybrid-xref.11-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.11-ogen.c-check
new file mode 100644
index 00000000..d21a7d2d
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.11-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/hybrid-xref.11-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.11-ogen.check
new file mode 100644
index 00000000..c31b668c
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.11-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -4
+User password = 
+File is linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.11.c-check b/qpdf/qtest/qpdf/hybrid-xref.11.c-check
new file mode 100644
index 00000000..d21a7d2d
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.11.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/hybrid-xref.11.check b/qpdf/qtest/qpdf/hybrid-xref.11.check
index 327d847a..c31b668c 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.11.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.11.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 P = -4
 User password = 
 File is linearized
diff --git a/qpdf/qtest/qpdf/hybrid-xref.12-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.12-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.12-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.12-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.12-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.12-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.12.c-check b/qpdf/qtest/qpdf/hybrid-xref.12.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.12.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.12.check b/qpdf/qtest/qpdf/hybrid-xref.12.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.12.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.12.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.2-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.2-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.2-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.2-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.2-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.2-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.2.c-check b/qpdf/qtest/qpdf/hybrid-xref.2.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.2.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.2.check b/qpdf/qtest/qpdf/hybrid-xref.2.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.2.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.2.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.3-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.3-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.3-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.3-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.3-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.3-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.3.c-check b/qpdf/qtest/qpdf/hybrid-xref.3.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.3.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.3.check b/qpdf/qtest/qpdf/hybrid-xref.3.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.3.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.3.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.4-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.4-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.4-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.4-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.4-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.4-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.4.c-check b/qpdf/qtest/qpdf/hybrid-xref.4.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.4.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.4.check b/qpdf/qtest/qpdf/hybrid-xref.4.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.4.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.4.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.5-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.5-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.5-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.5-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.5-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.5-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.5.c-check b/qpdf/qtest/qpdf/hybrid-xref.5.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.5.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.5.check b/qpdf/qtest/qpdf/hybrid-xref.5.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.5.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.5.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.6-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.6-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.6-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.6-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.6-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.6-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.6.c-check b/qpdf/qtest/qpdf/hybrid-xref.6.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.6.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.6.check b/qpdf/qtest/qpdf/hybrid-xref.6.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.6.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.6.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.7-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.7-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.7-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.7-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.7-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.7-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.7.c-check b/qpdf/qtest/qpdf/hybrid-xref.7.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.7.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.7.check b/qpdf/qtest/qpdf/hybrid-xref.7.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.7.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.7.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.8-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.8-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.8-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.8-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.8-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.8-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.8.c-check b/qpdf/qtest/qpdf/hybrid-xref.8.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.8.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.8.check b/qpdf/qtest/qpdf/hybrid-xref.8.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.8.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.8.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.9-ogen.c-check b/qpdf/qtest/qpdf/hybrid-xref.9-ogen.c-check
new file mode 100644
index 00000000..0ab13380
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.9-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 1
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.9-ogen.check b/qpdf/qtest/qpdf/hybrid-xref.9-ogen.check
new file mode 100644
index 00000000..2ccb68bc
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.9-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/hybrid-xref.9.c-check b/qpdf/qtest/qpdf/hybrid-xref.9.c-check
new file mode 100644
index 00000000..0ab13380
--- /dev/null
+++ b/qpdf/qtest/qpdf/hybrid-xref.9.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 1
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/hybrid-xref.9.check b/qpdf/qtest/qpdf/hybrid-xref.9.check
index 37ea00cf..2ccb68bc 100644
--- a/qpdf/qtest/qpdf/hybrid-xref.9.check
+++ b/qpdf/qtest/qpdf/hybrid-xref.9.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.1-ogen.c-check b/qpdf/qtest/qpdf/inline-images.1-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.1-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.1-ogen.check b/qpdf/qtest/qpdf/inline-images.1-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.1-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.1.c-check b/qpdf/qtest/qpdf/inline-images.1.c-check
new file mode 100644
index 00000000..ca9fbd3a
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.1.c-check
@@ -0,0 +1,3 @@
+version: 1.2
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.1.check b/qpdf/qtest/qpdf/inline-images.1.check
index 7284dd2a..0f727a01 100644
--- a/qpdf/qtest/qpdf/inline-images.1.check
+++ b/qpdf/qtest/qpdf/inline-images.1.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.2
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.10-ogen.c-check b/qpdf/qtest/qpdf/inline-images.10-ogen.c-check
new file mode 100644
index 00000000..d0e2e2aa
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.10-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/inline-images.10-ogen.check b/qpdf/qtest/qpdf/inline-images.10-ogen.check
new file mode 100644
index 00000000..fa130173
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.10-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -4
+User password = 
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.10.c-check b/qpdf/qtest/qpdf/inline-images.10.c-check
new file mode 100644
index 00000000..7d98e913
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.10.c-check
@@ -0,0 +1,4 @@
+version: 1.4
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/inline-images.10.check b/qpdf/qtest/qpdf/inline-images.10.check
index 0e0ed996..390434bc 100644
--- a/qpdf/qtest/qpdf/inline-images.10.check
+++ b/qpdf/qtest/qpdf/inline-images.10.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.4
 P = -4
 User password = 
 File is not linearized
diff --git a/qpdf/qtest/qpdf/inline-images.11-ogen.c-check b/qpdf/qtest/qpdf/inline-images.11-ogen.c-check
new file mode 100644
index 00000000..d21a7d2d
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.11-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/inline-images.11-ogen.check b/qpdf/qtest/qpdf/inline-images.11-ogen.check
new file mode 100644
index 00000000..c31b668c
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.11-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -4
+User password = 
+File is linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.11.c-check b/qpdf/qtest/qpdf/inline-images.11.c-check
new file mode 100644
index 00000000..ac26e200
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.11.c-check
@@ -0,0 +1,4 @@
+version: 1.4
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/inline-images.11.check b/qpdf/qtest/qpdf/inline-images.11.check
index 327d847a..e233cd3b 100644
--- a/qpdf/qtest/qpdf/inline-images.11.check
+++ b/qpdf/qtest/qpdf/inline-images.11.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.4
 P = -4
 User password = 
 File is linearized
diff --git a/qpdf/qtest/qpdf/inline-images.12-ogen.c-check b/qpdf/qtest/qpdf/inline-images.12-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.12-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.12-ogen.check b/qpdf/qtest/qpdf/inline-images.12-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.12-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.12.c-check b/qpdf/qtest/qpdf/inline-images.12.c-check
new file mode 100644
index 00000000..ca9fbd3a
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.12.c-check
@@ -0,0 +1,3 @@
+version: 1.2
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.12.check b/qpdf/qtest/qpdf/inline-images.12.check
index 7284dd2a..0f727a01 100644
--- a/qpdf/qtest/qpdf/inline-images.12.check
+++ b/qpdf/qtest/qpdf/inline-images.12.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.2
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.2-ogen.c-check b/qpdf/qtest/qpdf/inline-images.2-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.2-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.2-ogen.check b/qpdf/qtest/qpdf/inline-images.2-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.2-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.2.c-check b/qpdf/qtest/qpdf/inline-images.2.c-check
new file mode 100644
index 00000000..ca9fbd3a
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.2.c-check
@@ -0,0 +1,3 @@
+version: 1.2
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.2.check b/qpdf/qtest/qpdf/inline-images.2.check
index 7284dd2a..0f727a01 100644
--- a/qpdf/qtest/qpdf/inline-images.2.check
+++ b/qpdf/qtest/qpdf/inline-images.2.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.2
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.3-ogen.c-check b/qpdf/qtest/qpdf/inline-images.3-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.3-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.3-ogen.check b/qpdf/qtest/qpdf/inline-images.3-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.3-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.3.c-check b/qpdf/qtest/qpdf/inline-images.3.c-check
new file mode 100644
index 00000000..ca9fbd3a
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.3.c-check
@@ -0,0 +1,3 @@
+version: 1.2
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.3.check b/qpdf/qtest/qpdf/inline-images.3.check
index 7284dd2a..0f727a01 100644
--- a/qpdf/qtest/qpdf/inline-images.3.check
+++ b/qpdf/qtest/qpdf/inline-images.3.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.2
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.4-ogen.c-check b/qpdf/qtest/qpdf/inline-images.4-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.4-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.4-ogen.check b/qpdf/qtest/qpdf/inline-images.4-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.4-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.4.c-check b/qpdf/qtest/qpdf/inline-images.4.c-check
new file mode 100644
index 00000000..ca9fbd3a
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.4.c-check
@@ -0,0 +1,3 @@
+version: 1.2
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.4.check b/qpdf/qtest/qpdf/inline-images.4.check
index 7284dd2a..0f727a01 100644
--- a/qpdf/qtest/qpdf/inline-images.4.check
+++ b/qpdf/qtest/qpdf/inline-images.4.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.2
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.5-ogen.c-check b/qpdf/qtest/qpdf/inline-images.5-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.5-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.5-ogen.check b/qpdf/qtest/qpdf/inline-images.5-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.5-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.5.c-check b/qpdf/qtest/qpdf/inline-images.5.c-check
new file mode 100644
index 00000000..ca9fbd3a
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.5.c-check
@@ -0,0 +1,3 @@
+version: 1.2
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.5.check b/qpdf/qtest/qpdf/inline-images.5.check
index 7284dd2a..0f727a01 100644
--- a/qpdf/qtest/qpdf/inline-images.5.check
+++ b/qpdf/qtest/qpdf/inline-images.5.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.2
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.6-ogen.c-check b/qpdf/qtest/qpdf/inline-images.6-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.6-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.6-ogen.check b/qpdf/qtest/qpdf/inline-images.6-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.6-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.6.c-check b/qpdf/qtest/qpdf/inline-images.6.c-check
new file mode 100644
index 00000000..ca9fbd3a
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.6.c-check
@@ -0,0 +1,3 @@
+version: 1.2
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.6.check b/qpdf/qtest/qpdf/inline-images.6.check
index 7284dd2a..0f727a01 100644
--- a/qpdf/qtest/qpdf/inline-images.6.check
+++ b/qpdf/qtest/qpdf/inline-images.6.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.2
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.7-ogen.c-check b/qpdf/qtest/qpdf/inline-images.7-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.7-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.7-ogen.check b/qpdf/qtest/qpdf/inline-images.7-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.7-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.7.c-check b/qpdf/qtest/qpdf/inline-images.7.c-check
new file mode 100644
index 00000000..ca9fbd3a
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.7.c-check
@@ -0,0 +1,3 @@
+version: 1.2
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.7.check b/qpdf/qtest/qpdf/inline-images.7.check
index 7284dd2a..0f727a01 100644
--- a/qpdf/qtest/qpdf/inline-images.7.check
+++ b/qpdf/qtest/qpdf/inline-images.7.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.2
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.8-ogen.c-check b/qpdf/qtest/qpdf/inline-images.8-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.8-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.8-ogen.check b/qpdf/qtest/qpdf/inline-images.8-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.8-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.8.c-check b/qpdf/qtest/qpdf/inline-images.8.c-check
new file mode 100644
index 00000000..ca9fbd3a
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.8.c-check
@@ -0,0 +1,3 @@
+version: 1.2
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.8.check b/qpdf/qtest/qpdf/inline-images.8.check
index 7284dd2a..0f727a01 100644
--- a/qpdf/qtest/qpdf/inline-images.8.check
+++ b/qpdf/qtest/qpdf/inline-images.8.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.2
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.9-ogen.c-check b/qpdf/qtest/qpdf/inline-images.9-ogen.c-check
new file mode 100644
index 00000000..0ab13380
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.9-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 1
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.9-ogen.check b/qpdf/qtest/qpdf/inline-images.9-ogen.check
new file mode 100644
index 00000000..2ccb68bc
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.9-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/inline-images.9.c-check b/qpdf/qtest/qpdf/inline-images.9.c-check
new file mode 100644
index 00000000..4ebb050f
--- /dev/null
+++ b/qpdf/qtest/qpdf/inline-images.9.c-check
@@ -0,0 +1,3 @@
+version: 1.2
+linearized: 1
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/inline-images.9.check b/qpdf/qtest/qpdf/inline-images.9.check
index 37ea00cf..4b2540f1 100644
--- a/qpdf/qtest/qpdf/inline-images.9.check
+++ b/qpdf/qtest/qpdf/inline-images.9.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.2
 File is not encrypted
 File is linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/lin-delete-and-reuse-check.out b/qpdf/qtest/qpdf/lin-delete-and-reuse-check.out
new file mode 100644
index 00000000..43ebbd49
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-delete-and-reuse-check.out
@@ -0,0 +1,5 @@
+checking lin-delete-and-reuse.pdf
+PDF Version: 1.3
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.1-ogen.c-check b/qpdf/qtest/qpdf/lin-special.1-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.1-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.1-ogen.check b/qpdf/qtest/qpdf/lin-special.1-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.1-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.1.c-check b/qpdf/qtest/qpdf/lin-special.1.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.1.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.1.check b/qpdf/qtest/qpdf/lin-special.1.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/lin-special.1.check
+++ b/qpdf/qtest/qpdf/lin-special.1.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.10-ogen.c-check b/qpdf/qtest/qpdf/lin-special.10-ogen.c-check
new file mode 100644
index 00000000..d0e2e2aa
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.10-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/lin-special.10-ogen.check b/qpdf/qtest/qpdf/lin-special.10-ogen.check
new file mode 100644
index 00000000..fa130173
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.10-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -4
+User password = 
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.10.c-check b/qpdf/qtest/qpdf/lin-special.10.c-check
new file mode 100644
index 00000000..7d98e913
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.10.c-check
@@ -0,0 +1,4 @@
+version: 1.4
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/lin-special.10.check b/qpdf/qtest/qpdf/lin-special.10.check
index 0e0ed996..390434bc 100644
--- a/qpdf/qtest/qpdf/lin-special.10.check
+++ b/qpdf/qtest/qpdf/lin-special.10.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.4
 P = -4
 User password = 
 File is not linearized
diff --git a/qpdf/qtest/qpdf/lin-special.11-ogen.c-check b/qpdf/qtest/qpdf/lin-special.11-ogen.c-check
new file mode 100644
index 00000000..d21a7d2d
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.11-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/lin-special.11-ogen.check b/qpdf/qtest/qpdf/lin-special.11-ogen.check
new file mode 100644
index 00000000..c31b668c
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.11-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -4
+User password = 
+File is linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.11.c-check b/qpdf/qtest/qpdf/lin-special.11.c-check
new file mode 100644
index 00000000..ac26e200
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.11.c-check
@@ -0,0 +1,4 @@
+version: 1.4
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/lin-special.11.check b/qpdf/qtest/qpdf/lin-special.11.check
index 327d847a..e233cd3b 100644
--- a/qpdf/qtest/qpdf/lin-special.11.check
+++ b/qpdf/qtest/qpdf/lin-special.11.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.4
 P = -4
 User password = 
 File is linearized
diff --git a/qpdf/qtest/qpdf/lin-special.12-ogen.c-check b/qpdf/qtest/qpdf/lin-special.12-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.12-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.12-ogen.check b/qpdf/qtest/qpdf/lin-special.12-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.12-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.12.c-check b/qpdf/qtest/qpdf/lin-special.12.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.12.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.12.check b/qpdf/qtest/qpdf/lin-special.12.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/lin-special.12.check
+++ b/qpdf/qtest/qpdf/lin-special.12.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.2-ogen.c-check b/qpdf/qtest/qpdf/lin-special.2-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.2-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.2-ogen.check b/qpdf/qtest/qpdf/lin-special.2-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.2-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.2.c-check b/qpdf/qtest/qpdf/lin-special.2.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.2.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.2.check b/qpdf/qtest/qpdf/lin-special.2.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/lin-special.2.check
+++ b/qpdf/qtest/qpdf/lin-special.2.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.3-ogen.c-check b/qpdf/qtest/qpdf/lin-special.3-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.3-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.3-ogen.check b/qpdf/qtest/qpdf/lin-special.3-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.3-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.3.c-check b/qpdf/qtest/qpdf/lin-special.3.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.3.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.3.check b/qpdf/qtest/qpdf/lin-special.3.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/lin-special.3.check
+++ b/qpdf/qtest/qpdf/lin-special.3.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.4-ogen.c-check b/qpdf/qtest/qpdf/lin-special.4-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.4-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.4-ogen.check b/qpdf/qtest/qpdf/lin-special.4-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.4-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.4.c-check b/qpdf/qtest/qpdf/lin-special.4.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.4.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.4.check b/qpdf/qtest/qpdf/lin-special.4.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/lin-special.4.check
+++ b/qpdf/qtest/qpdf/lin-special.4.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.5-ogen.c-check b/qpdf/qtest/qpdf/lin-special.5-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.5-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.5-ogen.check b/qpdf/qtest/qpdf/lin-special.5-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.5-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.5.c-check b/qpdf/qtest/qpdf/lin-special.5.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.5.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.5.check b/qpdf/qtest/qpdf/lin-special.5.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/lin-special.5.check
+++ b/qpdf/qtest/qpdf/lin-special.5.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.6-ogen.c-check b/qpdf/qtest/qpdf/lin-special.6-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.6-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.6-ogen.check b/qpdf/qtest/qpdf/lin-special.6-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.6-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.6.c-check b/qpdf/qtest/qpdf/lin-special.6.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.6.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.6.check b/qpdf/qtest/qpdf/lin-special.6.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/lin-special.6.check
+++ b/qpdf/qtest/qpdf/lin-special.6.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.7-ogen.c-check b/qpdf/qtest/qpdf/lin-special.7-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.7-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.7-ogen.check b/qpdf/qtest/qpdf/lin-special.7-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.7-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.7.c-check b/qpdf/qtest/qpdf/lin-special.7.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.7.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.7.check b/qpdf/qtest/qpdf/lin-special.7.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/lin-special.7.check
+++ b/qpdf/qtest/qpdf/lin-special.7.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.8-ogen.c-check b/qpdf/qtest/qpdf/lin-special.8-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.8-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.8-ogen.check b/qpdf/qtest/qpdf/lin-special.8-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.8-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.8.c-check b/qpdf/qtest/qpdf/lin-special.8.c-check
new file mode 100644
index 00000000..757cc85d
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.8.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.8.check b/qpdf/qtest/qpdf/lin-special.8.check
index 7284dd2a..acf612b7 100644
--- a/qpdf/qtest/qpdf/lin-special.8.check
+++ b/qpdf/qtest/qpdf/lin-special.8.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.9-ogen.c-check b/qpdf/qtest/qpdf/lin-special.9-ogen.c-check
new file mode 100644
index 00000000..0ab13380
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.9-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 1
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.9-ogen.check b/qpdf/qtest/qpdf/lin-special.9-ogen.check
new file mode 100644
index 00000000..2ccb68bc
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.9-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/lin-special.9.c-check b/qpdf/qtest/qpdf/lin-special.9.c-check
new file mode 100644
index 00000000..e76056b4
--- /dev/null
+++ b/qpdf/qtest/qpdf/lin-special.9.c-check
@@ -0,0 +1,3 @@
+version: 1.3
+linearized: 1
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/lin-special.9.check b/qpdf/qtest/qpdf/lin-special.9.check
index 37ea00cf..c2063a41 100644
--- a/qpdf/qtest/qpdf/lin-special.9.check
+++ b/qpdf/qtest/qpdf/lin-special.9.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.3
 File is not encrypted
 File is linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/multiple-mods-check.out b/qpdf/qtest/qpdf/multiple-mods-check.out
new file mode 100644
index 00000000..d56405e7
--- /dev/null
+++ b/qpdf/qtest/qpdf/multiple-mods-check.out
@@ -0,0 +1,5 @@
+checking multiple-mods.pdf
+PDF Version: 1.3
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.1-ogen.c-check b/qpdf/qtest/qpdf/object-stream.1-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.1-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.1-ogen.check b/qpdf/qtest/qpdf/object-stream.1-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.1-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.1.c-check b/qpdf/qtest/qpdf/object-stream.1.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.1.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.1.check b/qpdf/qtest/qpdf/object-stream.1.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/object-stream.1.check
+++ b/qpdf/qtest/qpdf/object-stream.1.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.10-ogen.c-check b/qpdf/qtest/qpdf/object-stream.10-ogen.c-check
new file mode 100644
index 00000000..d0e2e2aa
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.10-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/object-stream.10-ogen.check b/qpdf/qtest/qpdf/object-stream.10-ogen.check
new file mode 100644
index 00000000..fa130173
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.10-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -4
+User password = 
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.10.c-check b/qpdf/qtest/qpdf/object-stream.10.c-check
new file mode 100644
index 00000000..d0e2e2aa
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.10.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 0
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/object-stream.10.check b/qpdf/qtest/qpdf/object-stream.10.check
index 0e0ed996..fa130173 100644
--- a/qpdf/qtest/qpdf/object-stream.10.check
+++ b/qpdf/qtest/qpdf/object-stream.10.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 P = -4
 User password = 
 File is not linearized
diff --git a/qpdf/qtest/qpdf/object-stream.11-ogen.c-check b/qpdf/qtest/qpdf/object-stream.11-ogen.c-check
new file mode 100644
index 00000000..d21a7d2d
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.11-ogen.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/object-stream.11-ogen.check b/qpdf/qtest/qpdf/object-stream.11-ogen.check
new file mode 100644
index 00000000..c31b668c
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.11-ogen.check
@@ -0,0 +1,6 @@
+checking a.pdf
+PDF Version: 1.5
+P = -4
+User password = 
+File is linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.11.c-check b/qpdf/qtest/qpdf/object-stream.11.c-check
new file mode 100644
index 00000000..d21a7d2d
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.11.c-check
@@ -0,0 +1,4 @@
+version: 1.5
+linearized: 1
+encrypted: 1
+user password: 
diff --git a/qpdf/qtest/qpdf/object-stream.11.check b/qpdf/qtest/qpdf/object-stream.11.check
index 327d847a..c31b668c 100644
--- a/qpdf/qtest/qpdf/object-stream.11.check
+++ b/qpdf/qtest/qpdf/object-stream.11.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 P = -4
 User password = 
 File is linearized
diff --git a/qpdf/qtest/qpdf/object-stream.12-ogen.c-check b/qpdf/qtest/qpdf/object-stream.12-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.12-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.12-ogen.check b/qpdf/qtest/qpdf/object-stream.12-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.12-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.12.c-check b/qpdf/qtest/qpdf/object-stream.12.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.12.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.12.check b/qpdf/qtest/qpdf/object-stream.12.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/object-stream.12.check
+++ b/qpdf/qtest/qpdf/object-stream.12.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.2-ogen.c-check b/qpdf/qtest/qpdf/object-stream.2-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.2-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.2-ogen.check b/qpdf/qtest/qpdf/object-stream.2-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.2-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.2.c-check b/qpdf/qtest/qpdf/object-stream.2.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.2.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.2.check b/qpdf/qtest/qpdf/object-stream.2.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/object-stream.2.check
+++ b/qpdf/qtest/qpdf/object-stream.2.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.3-ogen.c-check b/qpdf/qtest/qpdf/object-stream.3-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.3-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.3-ogen.check b/qpdf/qtest/qpdf/object-stream.3-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.3-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.3.c-check b/qpdf/qtest/qpdf/object-stream.3.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.3.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.3.check b/qpdf/qtest/qpdf/object-stream.3.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/object-stream.3.check
+++ b/qpdf/qtest/qpdf/object-stream.3.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.4-ogen.c-check b/qpdf/qtest/qpdf/object-stream.4-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.4-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.4-ogen.check b/qpdf/qtest/qpdf/object-stream.4-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.4-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.4.c-check b/qpdf/qtest/qpdf/object-stream.4.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.4.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.4.check b/qpdf/qtest/qpdf/object-stream.4.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/object-stream.4.check
+++ b/qpdf/qtest/qpdf/object-stream.4.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.5-ogen.c-check b/qpdf/qtest/qpdf/object-stream.5-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.5-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.5-ogen.check b/qpdf/qtest/qpdf/object-stream.5-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.5-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.5.c-check b/qpdf/qtest/qpdf/object-stream.5.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.5.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.5.check b/qpdf/qtest/qpdf/object-stream.5.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/object-stream.5.check
+++ b/qpdf/qtest/qpdf/object-stream.5.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.6-ogen.c-check b/qpdf/qtest/qpdf/object-stream.6-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.6-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.6-ogen.check b/qpdf/qtest/qpdf/object-stream.6-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.6-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.6.c-check b/qpdf/qtest/qpdf/object-stream.6.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.6.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.6.check b/qpdf/qtest/qpdf/object-stream.6.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/object-stream.6.check
+++ b/qpdf/qtest/qpdf/object-stream.6.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.7-ogen.c-check b/qpdf/qtest/qpdf/object-stream.7-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.7-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.7-ogen.check b/qpdf/qtest/qpdf/object-stream.7-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.7-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.7.c-check b/qpdf/qtest/qpdf/object-stream.7.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.7.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.7.check b/qpdf/qtest/qpdf/object-stream.7.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/object-stream.7.check
+++ b/qpdf/qtest/qpdf/object-stream.7.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.8-ogen.c-check b/qpdf/qtest/qpdf/object-stream.8-ogen.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.8-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.8-ogen.check b/qpdf/qtest/qpdf/object-stream.8-ogen.check
new file mode 100644
index 00000000..ac80765b
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.8-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is not linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.8.c-check b/qpdf/qtest/qpdf/object-stream.8.c-check
new file mode 100644
index 00000000..7fc743a9
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.8.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.8.check b/qpdf/qtest/qpdf/object-stream.8.check
index 7284dd2a..ac80765b 100644
--- a/qpdf/qtest/qpdf/object-stream.8.check
+++ b/qpdf/qtest/qpdf/object-stream.8.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is not linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.9-ogen.c-check b/qpdf/qtest/qpdf/object-stream.9-ogen.c-check
new file mode 100644
index 00000000..0ab13380
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.9-ogen.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 1
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.9-ogen.check b/qpdf/qtest/qpdf/object-stream.9-ogen.check
new file mode 100644
index 00000000..2ccb68bc
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.9-ogen.check
@@ -0,0 +1,5 @@
+checking a.pdf
+PDF Version: 1.5
+File is not encrypted
+File is linearized
+No errors found
diff --git a/qpdf/qtest/qpdf/object-stream.9.c-check b/qpdf/qtest/qpdf/object-stream.9.c-check
new file mode 100644
index 00000000..0ab13380
--- /dev/null
+++ b/qpdf/qtest/qpdf/object-stream.9.c-check
@@ -0,0 +1,3 @@
+version: 1.5
+linearized: 1
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/object-stream.9.check b/qpdf/qtest/qpdf/object-stream.9.check
index 37ea00cf..2ccb68bc 100644
--- a/qpdf/qtest/qpdf/object-stream.9.check
+++ b/qpdf/qtest/qpdf/object-stream.9.check
@@ -1,4 +1,5 @@
 checking a.pdf
+PDF Version: 1.5
 File is not encrypted
 File is linearized
 No errors found
diff --git a/qpdf/qtest/qpdf/old-and-complex-c-check.out b/qpdf/qtest/qpdf/old-and-complex-c-check.out
new file mode 100644
index 00000000..f55decbc
--- /dev/null
+++ b/qpdf/qtest/qpdf/old-and-complex-c-check.out
@@ -0,0 +1,3 @@
+version: 1.1
+linearized: 0
+encrypted: 0
diff --git a/qpdf/qtest/qpdf/old-and-complex-check.out b/qpdf/qtest/qpdf/old-and-complex-check.out
new file mode 100644
index 00000000..cf2bfc83
--- /dev/null
+++ b/qpdf/qtest/qpdf/old-and-complex-check.out
@@ -0,0 +1,5 @@
+checking old-and-complex.pdf
+PDF Version: 1.1
+File is not encrypted
+File is not linearized
+No errors found