diff --git a/paps-fix-tab-width.patch b/paps-fix-tab-width.patch index 7924e11..a1011ee 100644 --- a/paps-fix-tab-width.patch +++ b/paps-fix-tab-width.patch @@ -1,16 +1,9 @@ -From 0b53e86359211b18eb4bb38270324f303920a363 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH -Date: Fri, 21 Sep 2012 16:16:38 +0900 -Subject: [PATCH] Fix tab width issue when enabling CPI - +@@ -, +, @@ --- src/libpaps.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) - -diff --git a/src/libpaps.c b/src/libpaps.c -index 1b80257..29d64b0 100644 ---- a/src/libpaps.c -+++ b/src/libpaps.c +--- a/src/libpaps.c ++++ a/src/libpaps.c @@ -251,7 +251,6 @@ gchar *paps_layout_line_to_postscript_strdup(paps_t *paps_, { paps_private_t *paps = (paps_private_t*)paps_; @@ -70,9 +63,9 @@ index 1b80257..29d64b0 100644 - } + if (paps->cpi > 0.0L) + { -+ int n = geometry.width / avg_width; ++ double n = ((double)geometry.width) / avg_width; + -+ x_pos += ((double)n) * (1 / paps->cpi * 72.0); ++ x_pos += n * (1 / paps->cpi * 72.0); + } + else + { @@ -82,5 +75,3 @@ index 1b80257..29d64b0 100644 if (glyphs->glyphs[glyph_idx].glyph == PANGO_GLYPH_EMPTY) continue; -- -1.7.11.4 - diff --git a/paps.spec b/paps.spec index cfeea06..8baca15 100644 --- a/paps.spec +++ b/paps.spec @@ -1,6 +1,6 @@ Name: paps Version: 0.6.8 -Release: 25%{?dist} +Release: 26%{?dist} License: LGPLv2+ URL: http://paps.sourceforge.net/ @@ -119,6 +119,9 @@ install -p -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cups %{_libdir}/libpaps.so %changelog +* Wed Jul 31 2013 Akira TAGOH - 0.6.8-26 +- Fix the width calculation with CPI enabled. (#990228) + * Thu Apr 18 2013 Akira TAGOH - 0.6.8-25 - Rebuilt for aarch64 support. (#926309)