From 431d91760901bce6afc3d29d27fe4c751ddcbe22 Mon Sep 17 00:00:00 2001 From: Chris Nighswonger Date: Thu, 4 Feb 2010 14:47:30 -0500 Subject: [PATCH] Bugfix: Implimentation of JpegBlob and AltJpeg methods Implimentation of JpegBlob and AltJpeg methods in C4::Creators::PDF Signed-off-by: Galen Charlton --- C4/Creators/PDF.pm | 92 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/C4/Creators/PDF.pm b/C4/Creators/PDF.pm index 1421a2b697..7ffb30395f 100644 --- a/C4/Creators/PDF.pm +++ b/C4/Creators/PDF.pm @@ -144,7 +144,97 @@ sub AltJpeg { sub Jpeg { my $self = shift; my ($imageData, $width, $height, $imageFormat) = @_; - return prJpeg($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 undef; + } + 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 undef; + } + 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 (BILDFIL, "<$iFile") || errLog("Couldn't open $iFile, $!, aborts"); + binmode BILDFIL; + my $iStream; + sysread BILDFIL, $iStream, $iLangd; + $utrad = "$PDF::Reuse::objNr 0 obj\n<>stream\n$iStream\nendstream\nendobj\n"; + close BILDFIL; + $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; } sub Js { -- 2.39.5