From e9001c9fac4e65c950275e7bfaaaa9b421a552ab Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Fri, 29 Apr 2022 18:16:27 -0700 Subject: [PATCH] Move where paperinit() is called h/t to upstream developer of libpaper! (https://sourceforge.net/p/tuxpaint/bugs/250/) --- docs/AUTHORS.txt | 4 +++- docs/CHANGES.txt | 4 ++++ src/postscript_print.c | 6 ++---- src/tuxpaint.c | 4 +++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt index bb4cea0bf..c5ad400fb 100644 --- a/docs/AUTHORS.txt +++ b/docs/AUTHORS.txt @@ -6,7 +6,7 @@ Copyright (c) 2002-2021 Various contributors (see below, and CHANGES.txt) http://www.tuxpaint.org/ -June 17, 2002 - December 1, 2021 +June 17, 2002 - April 29, 2022 * Design and Coding: @@ -191,6 +191,8 @@ June 17, 2002 - December 1, 2021 * Neko cat brushes based on XNeko by Masayuki Koba + * Dog brushes based on Oneko by Tatsuya Kato + * Real Rainbow colors/alpha based on: http://www.flickr.com/photos/nicholas_t/281820290/ photo by Flickr user "Nicholas_T" diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 1a51a6902..a16739d1f 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -208,6 +208,10 @@ http://www.tuxpaint.org/ Bill Kendrick and TOYAMA Shin-ichi + * Adjust where libpaper gets init'd. + Reuben Thomas + (https://sourceforge.net/p/tuxpaint/bugs/250/) + * Ports & Building: ----------------- * Windows diff --git a/src/postscript_print.c b/src/postscript_print.c index d2b3bdfbe..802e5e944 100644 --- a/src/postscript_print.c +++ b/src/postscript_print.c @@ -6,7 +6,7 @@ (for non-Windows, non-BeOS platforms, e.g. Linux and macOS) (moved from tuxpaint.c in 0.9.17) - Copyright (c) 2009 by Bill Kendrick and others + Copyright (c) 2022 by Bill Kendrick and others bill@newbreedsoftware.com http://www.tuxpaint.org/ @@ -36,7 +36,7 @@ implied warranty. - June 24, 2007 - January 29, 2009 + June 24, 2007 - April 29, 2022 $Id$ */ @@ -102,8 +102,6 @@ int do_ps_save(FILE * fi, /* Determine paper size: */ - paperinit(); // FIXME: Should we do this at startup? -bjk 2007.06.25 - if (pprsize == NULL) { /* User did not request a specific paper size (on command-line or diff --git a/src/tuxpaint.c b/src/tuxpaint.c index a3975b053..873740dfd 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - June 14, 2002 - April 22, 2022 + June 14, 2002 - April 29, 2022 */ #include "platform.h" @@ -25876,6 +25876,8 @@ static void setup_config(char *argv[]) /* FIXME: most of this is not required before starting the font scanner */ #ifdef PAPER_H + paperinit(); + if (tmpcfg_cmd.papersize && !strcmp(tmpcfg_cmd.papersize, "help")) show_available_papersizes(0); #endif