[poppler] XPDF 3.02 merged in work branch

[Jeff Muizelaar]

On Fri, Apr 06, 2007 at 04:30:11PM +0200, Albert Astals Cid wrote:
> Ok, so i finally did a merge of xpdf3.02 in my xpdf302merge branch.
> 
> What still needs to be done:
>  * Make DCTStream and FlateStream classes work, Jeff?

I'll take a look.

>  * Merge Annot [1], Julien?
>  * Make HtmlOutputDev work again, volunteers?
>  * Test and make CairoOutputDev work again, Jeff?

It looks to basically work. I'll look more later.

>  * Test all the frontends, i guess Pino and me will test the qt* ones,
>    volunteers for the glib one?

Enough of the glib frontend works for the test suite to work.

> 
> Let's make this work so we can then merge on Julien's work on writing forms 
> are release 0.6 !!!
> 
> To switch to that branch, cvs up -r xpdf302merge
> 

Here are some fixes to problems I've found so far:

diff -u -r1.14.2.1 Gfx.cc
--- poppler/Gfx.cc	6 Apr 2007 14:22:23 -0000	1.14.2.1
+++ poppler/Gfx.cc	6 Apr 2007 16:25:53 -0000
@@ -1456,8 +1456,8 @@
     //error(getPos(), "No path in closepath/stroke");
     return;
   }
+  state->closePath();
   if (state->isPath()) {
-    state->closePath();
     if (state->getStrokeColorSpace()->getMode() == csPattern) {
       doPatternStroke();
     } else {

This hunk reverts a change made in the merge that clobbered this change that
I made:
http://cvsweb.freedesktop.org/poppler/poppler/poppler/Gfx.cc?revision=1.11&view=markup&pathrev=xpdf302merge

@@ -3953,7 +3953,6 @@
 	break;
       }
       dict.dictAdd(key, &obj);
-      gfree(key);
     }
     parser->getObj(&obj);
   }

This hunk removes this change:
http://cvsweb.freedesktop.org/poppler/poppler/poppler/Gfx.cc?revision=1.8&view=markup&pathrev=xpdf302merge

It doesn't seem necessary anymore. Want to coment Albert?

With the above changes the public testsuite passes for
CairoOutputDev and TextOutputDev. I've haven't looked at the
changed output caused by changes to PSOutputDev yet. I also haven't run
the testsuite on my private collection. Doing so, should be interesting.

-Jeff