summarylogtreecommitdiffstats
path: root/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
diff options
context:
space:
mode:
Diffstat (limited to '0003-Apply-subpixel-rendering-in-Cairo-Backend.patch')
-rw-r--r--0003-Apply-subpixel-rendering-in-Cairo-Backend.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
index a7bb1a72ce5e..0f7f2d341b9f 100644
--- a/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
+++ b/0003-Apply-subpixel-rendering-in-Cairo-Backend.patch
@@ -1,4 +1,4 @@
-From 525a5ce46ce45f3125b2b9e502e7ac680f2672d7 Mon Sep 17 00:00:00 2001
+From 93573105c0c73cee4acb451bcb9e99a34ce2daea Mon Sep 17 00:00:00 2001
From: Paul Gideon Dann <pdgiddie@gmail.com>
Date: Tue, 9 Aug 2016 15:02:53 +0100
Subject: [PATCH 3/4] Apply subpixel rendering in Cairo Backend
@@ -74,10 +74,10 @@ index 78d24bb5..d482ceb5 100644
g_timer_stop (timer);
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
-index 8b5b4da0..709b760e 100644
+index 319edc50..71752304 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
-@@ -2447,3 +2447,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage *page,
+@@ -2438,3 +2438,13 @@ poppler_page_get_text_attributes_for_area (PopplerPage *page,
return g_list_reverse(attributes);
}
@@ -104,7 +104,7 @@ index f99f0920..8ff914f4 100644
/* A rectangle on a page, with coordinates in PDF points. */
#define POPPLER_TYPE_RECTANGLE (poppler_rectangle_get_type ())
diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
-index bcfa0954..aa05fe12 100644
+index 1f637cf5..3de0a45e 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -124,7 +124,7 @@ CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
@@ -135,7 +135,7 @@ index bcfa0954..aa05fe12 100644
if (cairo_font_face_set_user_data (l->font_face,
&_ft_cairo_key,
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
-index cbfd0bdd..b10b7e32 100644
+index eac8ed09..b842818f 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -206,6 +206,13 @@ void CairoOutputDev::setCairo(cairo_t *c)
@@ -152,7 +152,7 @@ index cbfd0bdd..b10b7e32 100644
/* save the initial matrix so that we can use it for type3 fonts. */
//XXX: is this sufficient? could we miss changes to the matrix somehow?
cairo_get_matrix(cairo, &orig_matrix);
-@@ -1432,6 +1439,7 @@ void CairoOutputDev::drawChar(GfxState *state, double x, double y,
+@@ -1431,6 +1438,7 @@ void CairoOutputDev::drawChar(GfxState *state, double x, double y,
void CairoOutputDev::endString(GfxState *state)
{
int render;
@@ -160,7 +160,7 @@ index cbfd0bdd..b10b7e32 100644
if (!currentFont)
return;
-@@ -1449,6 +1457,18 @@ void CairoOutputDev::endString(GfxState *state)
+@@ -1448,6 +1456,18 @@ void CairoOutputDev::endString(GfxState *state)
goto finish;
}
@@ -179,7 +179,7 @@ index cbfd0bdd..b10b7e32 100644
if (!(render & 1)) {
LOG (printf ("fill string\n"));
cairo_set_source (cairo, fill_pattern);
-@@ -1499,6 +1519,10 @@ void CairoOutputDev::endString(GfxState *state)
+@@ -1498,6 +1518,10 @@ void CairoOutputDev::endString(GfxState *state)
}
finish:
@@ -191,10 +191,10 @@ index cbfd0bdd..b10b7e32 100644
glyphs = nullptr;
if (use_show_text_glyphs) {
diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
-index ec2b4b35..8fecd682 100644
+index 58c36fcb..1aea6090 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
-@@ -4604,6 +4604,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
+@@ -4602,6 +4602,47 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) {
error(errSyntaxError, getPos(), "Bad image parameters");
}
@@ -257,7 +257,7 @@ index e8ff605f..f615d789 100644
void drawForm(Object *str, Dict *resDict, const double *matrix, const double *bbox,
diff --git a/poppler/Page.cc b/poppler/Page.cc
-index d137ec4b..5950b964 100644
+index 87621ca2..87039190 100644
--- a/poppler/Page.cc
+++ b/poppler/Page.cc
@@ -336,6 +336,19 @@ Dict *Page::getResourceDictCopy(XRef *xrefA) {
@@ -278,8 +278,8 @@ index d137ec4b..5950b964 100644
+}
+
void Page::replaceXRef(XRef *xrefA) {
- Object obj1;
Dict *pageDict = pageObj.getDict()->copy(xrefA);
+ xref = xrefA;
diff --git a/poppler/Page.h b/poppler/Page.h
index 01f056f9..d6547a79 100644
--- a/poppler/Page.h
@@ -295,5 +295,5 @@ index 01f056f9..d6547a79 100644
Object getAnnotsObject(XRef *xrefA = nullptr) { return annotsObj.fetch(xrefA ? xrefA : xref); }
// Add a new annotation to the page
--
-2.24.0
+2.24.1