[poppler] glib/poppler-page.cc poppler/CairoOutputDev.cc

[Carlos Garcia Campos]

 glib/poppler-page.cc      |    2 +-
 poppler/CairoOutputDev.cc |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 16812829a7d4816717731318b1aa1bc3ab5e3935
Author: Jason Crain <jason at aquaticape.us>
Date:   Mon Aug 27 22:42:11 2012 -0500

    Update fill and stroke color in CairoOutputDev::startPage
    
    Keep fill_color and stroke_color from falling out of sync with
    fill_pattern and stroke_pattern.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=54526

diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index 84ceb7e..b88c70b 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -344,7 +344,7 @@ _poppler_page_render (PopplerPage      *page,
 
 
   if (!printing && page->text == NULL) {
-    page->text = new TextPage(gFalse);
+    page->text = new TextPage (gFalse);
     output_dev->setTextPage (page->text);
   }
   /* NOTE: instead of passing -1 we should/could use cairo_clip_extents()
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 456f826..2772bd1 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -242,7 +242,9 @@ void CairoOutputDev::startPage(int pageNum, GfxState *state) {
   cairo_pattern_destroy(stroke_pattern);
 
   fill_pattern = cairo_pattern_create_rgb(0., 0., 0.);
+  fill_color.r = fill_color.g = fill_color.b = 0;
   stroke_pattern = cairo_pattern_reference(fill_pattern);
+  stroke_color.r = stroke_color.g = stroke_color.b = 0;
 
   if (text)
     text->startPage(state);