notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move where paperinit() is called

Browse source 
h/t to upstream developer of libpaper!
(https://sourceforge.net/p/tuxpaint/bugs/250/)
This commit is contained in:
Bill Kendrick 2022-04-29 18:16:27 -07:00
parent 7505ffe340
commit e9001c9fac
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/AUTHORS.txt
View file

@ -6,7 +6,7 @@ Copyright (c) 2002-2021
Various contributors (see below, and CHANGES.txt) Various contributors (see below, and CHANGES.txt)
http://www.tuxpaint.org/ http://www.tuxpaint.org/
June 17, 2002 - December 1, 2021 June 17, 2002 - April 29, 2022
* Design and Coding: * Design and Coding:
@ -191,6 +191,8 @@ June 17, 2002 - December 1, 2021
* Neko cat brushes based on XNeko by Masayuki Koba * Neko cat brushes based on XNeko by Masayuki Koba
* Dog brushes based on Oneko by Tatsuya Kato
* Real Rainbow colors/alpha based on: * Real Rainbow colors/alpha based on:
http://www.flickr.com/photos/nicholas_t/281820290/ http://www.flickr.com/photos/nicholas_t/281820290/
photo by Flickr user "Nicholas_T" photo by Flickr user "Nicholas_T"

4
docs/CHANGES.txt
View file

@ -208,6 +208,10 @@ http://www.tuxpaint.org/
Bill Kendrick <bill@newbreedsoftware.com> and Bill Kendrick <bill@newbreedsoftware.com> and
TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* Adjust where libpaper gets init'd.
Reuben Thomas <https://sourceforge.net/u/rrt/>
(https://sourceforge.net/p/tuxpaint/bugs/250/)
* Ports & Building: * Ports & Building:
----------------- -----------------
* Windows * Windows

6
src/postscript_print.c
View file

@ -6,7 +6,7 @@
(for non-Windows, non-BeOS platforms, e.g. Linux and macOS) (for non-Windows, non-BeOS platforms, e.g. Linux and macOS)
(moved from tuxpaint.c in 0.9.17) (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 bill@newbreedsoftware.com
http://www.tuxpaint.org/ http://www.tuxpaint.org/
@ -36,7 +36,7 @@
implied warranty. implied warranty.
June 24, 2007 - January 29, 2009 June 24, 2007 - April 29, 2022
$Id$ $Id$
*/ */
@ -102,8 +102,6 @@ int do_ps_save(FILE * fi,
/* Determine paper size: */ /* Determine paper size: */
paperinit(); // FIXME: Should we do this at startup? -bjk 2007.06.25
if (pprsize == NULL) if (pprsize == NULL)
{ {
/* User did not request a specific paper size (on command-line or /* User did not request a specific paper size (on command-line or

4
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - April 22, 2022 June 14, 2002 - April 29, 2022
*/ */
#include "platform.h" #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 */ /* FIXME: most of this is not required before starting the font scanner */
#ifdef PAPER_H #ifdef PAPER_H
paperinit();
if (tmpcfg_cmd.papersize && !strcmp(tmpcfg_cmd.papersize, "help")) if (tmpcfg_cmd.papersize && !strcmp(tmpcfg_cmd.papersize, "help"))
show_available_papersizes(0); show_available_papersizes(0);
#endif #endif