[groff] 01/01: * src/devices/gropdf/gropdf.pl: Fixes to importing pdf versions > 1.4.

[Deri James]

deri pushed a commit to branch master
in repository groff.

commit 9064999adde2250851d8b66205f8eccad6c502b9
Author: Deri James <deri@chuzzlewit.myzen.co.uk>
AuthorDate: Tue Nov 16 11:53:07 2021 +0000

    * src/devices/gropdf/gropdf.pl: Fixes to importing
    pdf versions > 1.4.
---
 ChangeLog                    | 5 +++++
 src/devices/gropdf/gropdf.pl | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 48a0429..e20bd70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-11-16  Deri James  <deri@chuzzlewit.myzen.co.uk>
+
+       * src/devices/gropdf/gropdf.pl: Fixes to importing pdf versions
+       > 1.4.
+
 2021-11-13  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/preproc/tbl/table.cpp (table::do_vspan): Fix code style
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index ac333a8..d09a937 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -1652,6 +1652,7 @@ sub LoadPDF
            }
        }
 
+       s/%.*?$//;
        $pdftxt.=$_.' ';
     }
 
@@ -1673,7 +1674,7 @@ sub LoadPDF
            $pdf->[$curobj]->{OBJ}=ParsePDFObj(\@pdfwds);
             my $o=$pdf->[$curobj];
 
-            if (ref($o->{obj}) eq "HASH" and exists($o->{OBJ}->{Type}) and 
$o->{OBJ}->{Type} eq '/ObjStm')
+            if (ref($o->{OBJ}) eq 'HASH' and exists($o->{OBJ}->{Type}) and 
$o->{OBJ}->{Type} eq '/ObjStm')
             {
                 LoadStream($o,$pdf);
                 my $pos=$o->{OBJ}->{First};
@@ -1691,7 +1692,7 @@ sub LoadPDF
                 $pdf->[$curobj]=undef;
             }
 
-            $root=$curobj if ref($o->{obj}) eq "HASH" and 
exists($pdf->[$curobj]->{OBJ}->{Type}) and $pdf->[$curobj]->{OBJ}->{Type} eq 
'/XRef';
+            $root=$curobj if ref($o->{OBJ}) eq 'HASH' and 
exists($o->{OBJ}->{Type}) and $o->{OBJ}->{Type} eq '/XRef';
        }
        elsif ($wd eq 'trailer' and !exists($pdf->[0]->{OBJ}))
        {