Commit d6cacd4
Ethan Merritt
code cleanup
1 parent 40a0e89 commit d6cacd4
4 files changed
Lines changed: 21 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,10 @@ | |||
| 1 | + 2005-05-22 Ethan Merritt <merritt@u.washington.edu> | ||
| 2 | + | ||
| 3 | + * term/gd.trm term/mif.trm term/pdf.trm: Code cleanup - remove static | ||
| 4 | + initializers from the TERM_PROTO code block. ggi.trm has these also, | ||
| 5 | + but I can't test for correctness after a change so I don't want to | ||
| 6 | + change it. Remove obsolete comments. | ||
| 7 | + | ||
| 1 | 8 | 2005-05-20 Hans-Bernhard Broeker <broeker@physik.rwth-aachen.de> | |
| 2 | 9 | ||
| 3 | 10 | * src/util.c (PRINT_MESSAGE_TO_STDERR): New macro: invokes printf | |
@@ -14,7 +21,6 @@ | |||
| 14 | 21 | * history.c: Make routines for GNU readline compatible to those of | |
| 15 | 22 | gnuplot readline. | |
| 16 | 23 | ||
| 17 | - | ||
| 18 | 24 | 2005-05-19 Ethan Merritt <merritt@u.washington.edu> | |
| 19 | 25 | ||
| 20 | 26 | * src/datafile.c (df_readline) src/gadgets.h src/save.c (save_set_all) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | /* Hello, Emacs, this is -*-C-*- | |
| 2 | - * $Id: gd.trm,v 1.66 2005/04/03 22:41:55 sfeam Exp $ | ||
| 2 | + * $Id: gd.trm,v 1.68 2005/04/29 17:03:36 sfeam Exp $ | ||
| 3 | 3 | * based on gif.trm,v 1.26.2.1 2000/05/01 00:17:20 joze | |
| 4 | 4 | */ | |
| 5 | 5 | ||
@@ -157,16 +157,9 @@ extern gdFontPtr gdFontMediumBold; /* 7x13 */ | |||
| 157 | 157 | extern gdFontPtr gdFontGiant; /* 9x15 */ | |
| 158 | 158 | extern gdFontPtr gdFontTiny; /* 5x8 */ | |
| 159 | 159 | ||
| 160 | - | ||
| 161 | 160 | #define GREG_XMAX 640 | |
| 162 | 161 | #define GREG_YMAX 480 | |
| 163 | 162 | ||
| 164 | - | ||
| 165 | - static int PNG_XMAX = GREG_XMAX; | ||
| 166 | - static int PNG_YMAX = GREG_YMAX; | ||
| 167 | - static const int PNG_POINT_SCALE = 3; | ||
| 168 | - static int PNG_ps = 3; | ||
| 169 | - | ||
| 170 | 163 | /* This will be the default font */ | |
| 171 | 164 | # define gdfont gdFontMediumBold | |
| 172 | 165 | # define PNG_VCHAR 13 | |
@@ -244,6 +237,11 @@ enum PNG_id { | |||
| 244 | 237 | #endif | |
| 245 | 238 | #define Y(y) (png_state.height - (y)) | |
| 246 | 239 | ||
| 240 | + static int PNG_XMAX = GREG_XMAX; | ||
| 241 | + static int PNG_YMAX = GREG_YMAX; | ||
| 242 | + static const int PNG_POINT_SCALE = 3; | ||
| 243 | + static int PNG_ps = 3; | ||
| 244 | + | ||
| 247 | 245 | static struct gen_table PNG_opts[] = | |
| 248 | 246 | { | |
| 249 | 247 | { "trans$parent", PNG_TRANSPARENT }, | |
@@ -1703,16 +1701,14 @@ ENHGD_put_text(unsigned int x, unsigned int y, const char *str) | |||
| 1703 | 1701 | return; | |
| 1704 | 1702 | } | |
| 1705 | 1703 | ||
| 1706 | - /* flush any pending graphics (all the XShow routines do this...) */ | ||
| 1707 | - | ||
| 1708 | 1704 | if (!strlen(str)) | |
| 1709 | 1705 | return; | |
| 1710 | 1706 | ||
| 1711 | 1707 | /* if there are no magic characters, we should just be able | |
| 1712 | 1708 | * punt the string to PNG_put_text() | |
| 1713 | 1709 | */ | |
| 1714 | 1710 | if (!strpbrk(str, "{}^_@&~")) { | |
| 1715 | - /* do something to ensure default font is selected */ | ||
| 1711 | + /* FIXME: do something to ensure default font is selected */ | ||
| 1716 | 1712 | PNG_put_text(x,y,str); | |
| 1717 | 1713 | return; | |
| 1718 | 1714 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | /* Hello, Emacs, this is -*-C-*- | |
| 2 | - * $Id: mif.trm,v 1.27 2004/07/01 17:10:33 broeker Exp $ | ||
| 2 | + * $Id: mif.trm,v 1.28 2005/03/03 04:09:51 sfeam Exp $ | ||
| 3 | 3 | */ | |
| 4 | 4 | ||
| 5 | 5 | /* GNUPLOT -- mif.trm */ | |
@@ -138,6 +138,11 @@ static void put_mif_line __PROTO((void)); | |||
| 138 | 138 | static void MIF_set_font __PROTO((const char *)); | |
| 139 | 139 | static void mif_put_point __PROTO((unsigned int x, unsigned int y, int np)); | |
| 140 | 140 | ||
| 141 | + #endif | ||
| 142 | + | ||
| 143 | + #ifndef TERM_PROTO_ONLY | ||
| 144 | + #ifdef TERM_BODY | ||
| 145 | + | ||
| 141 | 146 | #ifndef cfree | |
| 142 | 147 | # define cfree free | |
| 143 | 148 | #endif | |
@@ -236,12 +241,6 @@ static struct mpt mpt[POINT_TYPES + 1] = | |||
| 236 | 241 | /* diamond is offset 0, dot is offset -1 */ | |
| 237 | 242 | static struct mpt *mif_point = &(mpt[1]); | |
| 238 | 243 | ||
| 239 | - #endif | ||
| 240 | - | ||
| 241 | - | ||
| 242 | - #ifndef TERM_PROTO_ONLY | ||
| 243 | - #ifdef TERM_BODY | ||
| 244 | - | ||
| 245 | 244 | ||
| 246 | 245 | /** Declaration of routine/s for internal use **/ | |
| 247 | 246 | static int insert_mif_line __PROTO((double fx, double fy)); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | /* Hello, Emacs, this is -*-C-*- | |
| 2 | - * $Id: pdf.trm,v 1.50 2005/03/09 18:26:44 sfeam Exp $ | ||
| 2 | + * $Id: pdf.trm,v 1.51 2005/04/29 16:36:07 sfeam Exp $ | ||
| 3 | 3 | */ | |
| 4 | 4 | ||
| 5 | 5 | /*------------------------------ | |
@@ -1476,8 +1476,6 @@ ENHPDF_put_text(unsigned int x, unsigned int y, const char *str) | |||
| 1476 | 1476 | return; | |
| 1477 | 1477 | } | |
| 1478 | 1478 | ||
| 1479 | - /* flush any pending graphics (all the XShow routines do this...) */ | ||
| 1480 | - | ||
| 1481 | 1479 | if (!str || !strlen(str)) | |
| 1482 | 1480 | return; | |
| 1483 | 1481 | ||
0 commit comments