rpms/poppler/F-10 pdftops-large-image.patch, 1.1, 1.2 poppler.spec, 1.77, 1.78

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/poppler/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv681

Modified Files:
	pdftops-large-image.patch poppler.spec 
Log Message:
fix the patch


pdftops-large-image.patch:

Index: pdftops-large-image.patch
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-10/pdftops-large-image.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdftops-large-image.patch	4 Jan 2009 05:15:29 -0000	1.1
+++ pdftops-large-image.patch	4 Jan 2009 05:55:23 -0000	1.2
@@ -1,8 +1,6 @@
-diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
-index 014036b..52495d7 100644
---- a/poppler/PSOutputDev.cc
-+++ b/poppler/PSOutputDev.cc
-@@ -2610,6 +2610,7 @@ void PSOutputDev::setupImage(Ref id, Stream *str) {
+--- poppler-0.8.7/poppler/PSOutputDev.cc	2008-06-01 16:35:25.000000000 +0200
++++ poppler-0.8.7.new/poppler/PSOutputDev.cc	2009-01-02 14:20:25.000000000 +0100
+@@ -2591,6 +2591,7 @@
    GooString *s;
    int c;
    int size, line, col, i;
@@ -10,7 +8,7 @@
  
    // check if image is already setup
    for (i = 0; i < imgIDLen; ++i) {
-@@ -2696,56 +2697,72 @@ void PSOutputDev::setupImage(Ref id, Stream *str) {
+@@ -2677,56 +2678,72 @@
    if (useRLE) {
      ++size;
    }
@@ -120,25 +118,25 @@
    str->close();
  
    delete str;
-@@ -4382,7 +4399,7 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
-       // make sure the image is setup, it sometimes is not like on bug #17645
-       setupImage(ref->getRef(), str);
+@@ -4361,7 +4378,7 @@
+       delete str;
+     } else {
        // set up to use the array already created by setupImages()
 -      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
 +      writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen());
      }
    }
  
-@@ -4845,7 +4862,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
-       // make sure the image is setup, it sometimes is not like on bug #17645
-       setupImage(ref->getRef(), str);
+@@ -4822,7 +4839,7 @@
+       delete str2;
+     } else {
        // set up to use the array already created by setupImages()
 -      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
 +      writePSFmt("ImData_{0:d}_{1:d} 0 0\n",ref->getRefNum(), ref->getRefGen());
      }
    }
  
-@@ -4899,7 +4916,12 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
+@@ -4876,7 +4893,12 @@
  
    // data source
    if (mode == psModeForm || inType3Char || preload) {
@@ -152,7 +150,7 @@
    } else {
      writePS("  /DataSource currentfile\n");
    }
-@@ -4938,6 +4960,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
+@@ -4915,6 +4937,7 @@
      writePSFmt(">>\n{0:s}\n", colorMap ? "image" : "imagemask");
  
      // get rid of the array and index
@@ -160,16 +158,16 @@
      writePS("pop pop\n");
  
    } else {
-@@ -5115,7 +5138,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
-       // make sure the image is setup, it sometimes is not like on bug #17645
-       setupImage(ref->getRef(), str);
+@@ -5090,7 +5113,7 @@
+       delete str2;
+     } else {
        // set up to use the array already created by setupImages()
 -      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
 +      writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen());
      }
    }
  
-@@ -5186,7 +5209,12 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
+@@ -5161,7 +5184,12 @@
  
    // data source
    if (mode == psModeForm || inType3Char || preload) {
@@ -183,7 +181,7 @@
    } else {
      writePS("  /DataSource currentfile\n");
    }
-@@ -5322,6 +5350,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
+@@ -5297,6 +5325,7 @@
  
    // get rid of the array and index
    if (mode == psModeForm || inType3Char || preload) {


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-10/poppler.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- poppler.spec	4 Jan 2009 05:15:29 -0000	1.77
+++ poppler.spec	4 Jan 2009 05:55:23 -0000	1.78
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.8.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -198,7 +198,7 @@
 %{_mandir}/man1/*
 
 %changelog
-* Sun Jan  4 2009 Matthias Clasen  <mclasen at redhat.com> - 0.8.7-3
+* Sun Jan  4 2009 Matthias Clasen  <mclasen at redhat.com> - 0.8.7-4
 - Fix a problem with large images
 
 * Tue Sep 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-2