From c126eea11c4ee39cbe9c0c76f920626b618b6ee9 Mon Sep 17 00:00:00 2001 From: Ralph Little Date: Sun, 1 Sep 2019 17:03:44 -0700 Subject: [PATCH] Apply debian upstream patch 0135-fix_pdf_floats Original patch commentary: Description: Fix floats in PDF and PostScript Set LC_NUMERIC to POSIX before printing floats when building PostScript or PDF output. Author: Julien BLACHE Forwarded: yes ------------ Looks like float printing format is affected by the current locale. Ensures that we always get POSIX formatting of floats. --- src/xsane-save.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/xsane-save.c b/src/xsane-save.c index f14df05..63550cc 100644 --- a/src/xsane-save.c +++ b/src/xsane-save.c @@ -26,6 +26,8 @@ #include "xsane-back-gtk.h" #include "xsane-front-gtk.h" #include "xsane-save.h" +#include +#include #include #include @@ -2425,6 +2427,7 @@ static void xsane_save_ps_create_image_header(FILE *outfile, int flatedecode) { int depth; + char *save_locale; depth = image_info->depth; @@ -2442,8 +2445,15 @@ static void xsane_save_ps_create_image_header(FILE *outfile, fprintf(outfile, "%d rotate\n", degree); fprintf(outfile, "%d %d translate\n", position_left, position_bottom); + + save_locale = strdup(setlocale(LC_NUMERIC, NULL)); + setlocale(LC_NUMERIC, "POSIX"); + fprintf(outfile, "%f %f scale\n", width, height); + setlocale(LC_NUMERIC, save_locale); + free(save_locale); + fprintf(outfile, "<<\n"); fprintf(outfile, " /ImageType 1\n"); fprintf(outfile, " /Width %d\n", image_info->image_width); @@ -3921,6 +3931,7 @@ static void xsane_save_pdf_create_page_header(FILE *outfile, struct pdf_xref *xr int position_left, position_bottom, box_left, box_bottom, box_right, box_top, depth; int left, bottom; float rad; + char *save_locale; DBG(DBG_proc, "xsane_save_pdf_create_page_header\n"); @@ -4035,8 +4046,16 @@ static void xsane_save_pdf_create_page_header(FILE *outfile, struct pdf_xref *xr fprintf(outfile, "q\n"); fprintf(outfile, "1 0 0 1 %d %d cm\n", position_left, position_bottom); /* translate */ + + save_locale = strdup(setlocale(LC_NUMERIC, NULL)); + setlocale(LC_NUMERIC, "POSIX"); + fprintf(outfile, "%f %f -%f %f 0 0 cm\n", cos(rad), sin(rad), sin(rad), cos(rad)); /* rotate */ fprintf(outfile, "%f 0 0 %f 0 0 cm\n", width, height); /* scale */ + + setlocale(LC_NUMERIC, save_locale); + free(save_locale); + fprintf(outfile, "BI\n"); fprintf(outfile, " /W %d\n", image_info->image_width); fprintf(outfile, " /H %d\n", image_info->image_height); -- 2.22.0 href='/guix/commit/gnu/packages/gnustep.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs....This commit was obtained by running: ./pre-inst-env guix style without any additional argument. Ludovic Courtès 2020-08-04gnu: wmnd: Update to 0.4.18....* gnu/packages/gnustep.scm (wmnd): Update to 0.4.18. Kei Kebreau 2020-07-17gnu: windowmaker: Update to 0.95.9....* gnu/packages/gnustep.scm (windowmaker): Update to 0.95.9. [source]: Update URI. [home-page]: Use HTTPS URL. Kei Kebreau 2020-05-20gnu: wmbattery: Update to 2.54....* gnu/packages/gnustep.scm (wmbattery): Update to 2.54. [native-inputs]: Remove autoconf & automake. Tobias Geerinckx-Rice 2020-03-04Merge branch 'master' into core-updatesMarius Bakke 2020-02-18gnu: Use HTTPS for www.dockapps.net home pages....* gnu/packages/gnustep.scm (wmbattery, wmcpuload, wmclock)[home-page]: Use HTTPS. Tobias Geerinckx-Rice le. Efraim Flashner 2019-12-19gnu: httpfs2: Don't use NAME in source URI....* gnu/packages/file-systems.scm (httpfs2)[source]: Hard-code NAME. Tobias Geerinckx-Rice 2019-12-08gnu: glusterfs: Update to 7.0...* gnu/packages/file-systems.scm (glusterfs): Update to 7.0. [source]: Update URL. [arguments]: Add "PYTHON=" and"--enable-cmocka" configure flags. Remove 'replace-config.sub and 'fix-lex phases. Add 'autogen. [native-inputs]: Add libtirpc, rpcsvc-proto, autoconf, automake, and libtool. [inputs]: Add fuse, libaio, and rdma-core. Remove lvm2 and sqlite. * gnu/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Co-authored-by: Ludovic Courtès <ludo@gnu.org> Andrew Miloradovsky 2019-10-10gnu: apfs-fuse: Fix build....* gnu/packages/file-systems.scm (apfs-fuse)[arguments]: Install the LICENSE file with the default 'install-license-files' phase. Leo Famulari 2019-04-16gnu: apfs-fuse: Fix ’file system’ spelling....* gnu/packages/file-systems.scm (apfs-fuse)[synopsis]: Fix spelling. Tobias Geerinckx-Rice