From e13d2a4609481d158c20ae041bb60cc2ec3562ee Mon Sep 17 00:00:00 2001 From: Chris Nighswonger Date: Tue, 2 Dec 2014 12:08:04 -0500 Subject: [PATCH] [PASSED QA] Bug 13406: Removing depricated code included in PDF::Reuse 1. Upgrade PDF::Reuse to 0.35_04. [1] 2. Run Koha's non-DB dependent test suite. You should notice some non-fatal warnings about the redefinition of one or two subs in PDF::Reuse. This should not affect the functionality of the tools for the end user. 3. Verify the functionality of the related tools. 4. Apply the attached patch. 5. Re-run Koha's non-DB dependent test suite. You should note no warnings related to PDF::Reuse. 6. Re-verify the functionality of the related tools. [1] http://search.cpan.org/CPAN/authors/id/C/CN/CNIGHS/PDF-Reuse-0.35_04.tar.gz Signed-off-by: Mark Tompsett Signed-off-by: Chris http://bugs.koha-community.org/show_bug.cgi?id=13407 Signed-off-by: Katrin Fischer --- C4/Creators/PDF.pm | 92 +----------------------------------------------------- 1 file changed, 1 insertion(+), 91 deletions(-) diff --git a/C4/Creators/PDF.pm b/C4/Creators/PDF.pm index 738c34f..253c53f 100644 --- a/C4/Creators/PDF.pm +++ b/C4/Creators/PDF.pm @@ -170,97 +170,7 @@ sub AltJpeg { sub Jpeg { my $self = shift; my ($imageData, $width, $height, $imageFormat) = @_; - return prJpegBlob($imageData, $width, $height, $imageFormat); -} - -# FIXME: This magick foo is an absolute hack until the maintainer of PDF::Reuse releases the next version which will include these features - -sub prAltJpeg -{ my ($iData, $iWidth, $iHeight, $iFormat,$aiData, $aiWidth, $aiHeight, $aiFormat) = @_; - my ($namnet, $utrad); - if (! $PDF::Reuse::pos) # If no output is active, it is no use to continue - { return; - } - prJpegBlob($aiData, $aiWidth, $aiHeight, $aiFormat); - my $altObjNr = $PDF::Reuse::objNr; - $PDF::Reuse::imageNr++; - $namnet = 'Ig' . $PDF::Reuse::imageNr; - $PDF::Reuse::objNr++; - $PDF::Reuse::objekt[$PDF::Reuse::objNr] = $PDF::Reuse::pos; - $utrad = "$PDF::Reuse::objNr 0 obj\n" . - "[ << /Image $altObjNr 0 R\n" . - "/DefaultForPrinting true\n" . - ">>\n" . - "]\n" . - "endobj\n"; - $PDF::Reuse::pos += syswrite *PDF::Reuse::UTFIL, $utrad; - if ($PDF::Reuse::runfil) - { $PDF::Reuse::log .= "Jpeg~AltImage\n"; - } - $PDF::Reuse::objRef{$namnet} = $PDF::Reuse::objNr; - $namnet = prJpegBlob($iData, $iWidth, $iHeight, $iFormat, $PDF::Reuse::objNr); - if (! $PDF::Reuse::pos) - { errLog("No output file, you have to call prFile first"); - } - return $namnet; -} - -sub prJpegBlob -{ my ($iData, $iWidth, $iHeight, $iFormat, $altArrayObjNr) = @_; - my ($iLangd, $namnet, $utrad); - if (! $PDF::Reuse::pos) # If no output is active, it is no use to continue - { return; - } - my $checkidOld = $PDF::Reuse::checkId; - if (!$iFormat) - { my ($iFile, $checkId) = findGet($iData, $checkidOld); - if ($iFile) - { $iLangd = (stat($iFile))[7]; - $PDF::Reuse::imageNr++; - $namnet = 'Ig' . $PDF::Reuse::imageNr; - $PDF::Reuse::objNr++; - $PDF::Reuse::objekt[$PDF::Reuse::objNr] = $PDF::Reuse::pos; - open (my $fh, '<', "$iFile") || errLog("Couldn't open $iFile, $!, aborts"); - binmode $fh; - my $iStream; - sysread $fh, $iStream, $iLangd; - $utrad = "$PDF::Reuse::objNr 0 obj\n<>stream\n$iStream\nendstream\nendobj\n"; - close $fh; - $PDF::Reuse::pos += syswrite $PDF::Reuse::UTFIL, $utrad; - if ($PDF::Reuse::runfil) - { $PDF::Reuse::log .= "Cid~$PDF::Reuse::checkId\n"; - $PDF::Reuse::log .= "Jpeg~$iFile~$iWidth~$iHeight\n"; - } - $PDF::Reuse::objRef{$namnet} = $PDF::Reuse::objNr; - } - undef $checkId; - } - elsif ($iFormat == 1) - { my $iBlob = $iData; - $iLangd = length($iBlob); - $PDF::Reuse::imageNr++; - $namnet = 'Ig' . $PDF::Reuse::imageNr; - $PDF::Reuse::objNr++; - $PDF::Reuse::objekt[$PDF::Reuse::objNr] = $PDF::Reuse::pos; - $utrad = "$PDF::Reuse::objNr 0 obj\n<>stream\n$iBlob\nendstream\nendobj\n"; - $PDF::Reuse::pos += syswrite *PDF::Reuse::UTFIL, $utrad; - if ($PDF::Reuse::runfil) - { $PDF::Reuse::log .= "Jpeg~Blob~$iWidth~$iHeight\n"; - } - $PDF::Reuse::objRef{$namnet} = $PDF::Reuse::objNr; - } - if (! $PDF::Reuse::pos) - { errLog("No output file, you have to call prFile first"); - } - return $namnet; + return prJpeg($imageData, $width, $height, $imageFormat); } sub Js { -- 1.9.1