FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

remove option EXTENDED_COLOR_SPECS · gnuplot/gnuplot@da537b8 · GitHub

  1. gnuplot
  2. gnuplot

Repository navigation

Commit da537b8

Browse files
Ethan A Merritt
committed
remove option EXTENDED_COLOR_SPECS
This was only used by the vgagl terminal. It required supporting two parallel color assignment paths for pm3d, one of which was only needed for vgagl but was used by all terminals if vgagl was configured in. Due to bitrot this second path no longer works (probably) or at least does not know about newer color options. Removing this configuration option breaks vgagl.trm. That is fixable at the cost of losing support for gradient-filled quadrangles, which no other terminal has anyhow.
1 parent a504a0e commit da537b8

12 files changed

Lines changed: 12 additions & 116 deletions

File tree

‎ChangeLog‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2018-07-12 Ethan A Merritt <merritt@u.washington.edu>
2+
3+
* configure.ac src/color.c src/color.h src/pm3d.c:
4+
5+
Remove support for compile option EXTENDED_COLOR_SPECS.
6+
This was used only by vgagl.trm but required maintaining a separate
7+
code path for coloring pm3d quadrangles for all terminals. This
8+
alternative code path did not know about new pm3d color options and
9+
may no longer work at all. Removing the conditional code breaks
10+
vgagl.trm, which can be fixed later.
11+
112
2018-06-09 Ethan A Merritt <merritt@u.washington.edu>
213

314
* src/gadgets.c (draw_clip_arrow) term/lua.trm term/lua/gnuplot-tikz.lua

‎NEWS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Changes not in 5.2
2626
* CHANGE apply trange to sampling on pseudofile '+'
2727
* CHANGE move tgif terminal to "legacy" status; build only if configured
2828
* CHANGE imaginary values from the using spec of a 2D plot are treated as NaN
29+
* CHANGE remove compile option EXTENDED_COLOR_SPECS used only by vgagl.trm
2930
* FIX allow mixed use of in-key plot titles and manually placed titles
3031
* FIX open/close path for polygons
3132

‎config/config.cyg‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
/* Define to support boxed labels */
2929
#define EAM_BOXED_TEXT 1
3030

31-
/* Define if color information should be passed for each vertex. */
32-
/* #undef EXTENDED_COLOR_SPECS */
33-
3431
/* Define if you want to supply pre-existing X11 windows. */
3532
/* #undef EXTERNAL_X11_WINDOW */
3633

‎config/config.dj2‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
/* Define to support boxed labels */
3131
#define EAM_BOXED_TEXT 1
3232

33-
/* Define if color information should be passed for each vertex. */
34-
/* #undef EXTENDED_COLOR_SPECS */
35-
3633
/* Define if you want to supply pre-existing X11 windows. */
3734
/* #undef EXTERNAL_X11_WINDOW */
3835

‎config/config.mgw‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
/* Define to support boxed labels */
3030
#define EAM_BOXED_TEXT 1
3131

32-
/* Define if color information should be passed for each vertex. */
33-
/* #undef EXTENDED_COLOR_SPECS */
34-
3532
/* Define if you want to supply pre-existing X11 windows. */
3633
/* #undef EXTERNAL_X11_WINDOW */
3734

‎config/config.nt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
/* Define to support boxed labels */
3131
#define EAM_BOXED_TEXT 1
3232

33-
/* Define if color information should be passed for each vertex. */
34-
/* #undef EXTENDED_COLOR_SPECS */
35-
3633
/* Define if you want to supply pre-existing X11 windows. */
3734
/* #undef EXTERNAL_X11_WINDOW */
3835

‎config/config.os2‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
/* Define to support boxed labels */
3030
#define EAM_BOXED_TEXT 1
3131

32-
/* Define if color information should be passed for each vertex. */
33-
/* #undef EXTENDED_COLOR_SPECS */
34-
3532
/* Define if you want to supply pre-existing X11 windows. */
3633
#define EXTERNAL_X11_WINDOW 1
3734

‎config/config.oww‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
/* Define to support boxed labels */
3030
#define EAM_BOXED_TEXT 1
3131

32-
/* Define if color information should be passed for each vertex. */
33-
/* #undef EXTENDED_COLOR_SPECS */
34-
3532
/* Define if you want to supply pre-existing X11 windows. */
3633
/* #undef EXTERNAL_X11_WINDOW */
3734

‎configure.ac‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -800,8 +800,6 @@ if test "$with_linux_vga" = yes; then
800800
[dnl success! If we're here, all checks for
801801
dnl the vgagl terminal driver succeeded.
802802
AC_DEFINE(THREEDKIT,1,[ Define if the 3dkit libray is present. ])
803-
AC_DEFINE(EXTENDED_COLOR_SPECS,1,
804-
[ Define if color information should be passed for each vertex. ])
805803
VGAGLLIB="-l3dkit -lvgagl"
806804
with_vgagl=yes
807805
],dnl <-- 3dkit.h found

‎src/color.c‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -232,19 +232,12 @@ ifilled_quadrangle(gpiPoint* icorners)
232232
* This is the only routine which supportes extended
233233
* color specs currently.
234234
*/
235-
#ifdef EXTENDED_COLOR_SPECS
236-
void
237-
filled_quadrangle(gpdPoint * corners, gpiPoint * icorners)
238-
#else
239235
void
240236
filled_quadrangle(gpdPoint * corners)
241-
#endif
242237
{
243238
int i;
244239
double x, y;
245-
#ifndef EXTENDED_COLOR_SPECS
246240
gpiPoint icorners[4];
247-
#endif
248241
for (i = 0; i < 4; i++) {
249242
map3d_xy_double(corners[i].x, corners[i].y, corners[i].z, &x, &y);
250243
icorners[i].x = x;
@@ -273,11 +266,6 @@ filled_polygon_common(int points, struct coordinate * coords, TBOOLEAN fixed, do
273266
icorners[i].x = x;
274267
icorners[i].y = y;
275268
}
276-
#ifdef EXTENDED_COLOR_SPECS
277-
if ((term->flags & TERM_EXTENDED_COLOR)) {
278-
icorners[0].spec.gray = -1; /* force solid color */
279-
}
280-
#endif
281269
if (default_fillstyle.fillstyle == FS_EMPTY)
282270
icorners->style = FS_OPAQUE;
283271
else
@@ -414,10 +402,6 @@ draw_inside_color_smooth_box_bitmap()
414402
corners[0].x = corners[3].x = xy;
415403
corners[1].x = corners[2].x = GPMIN(xy_to,xy2+1);
416404
}
417-
#ifdef EXTENDED_COLOR_SPECS
418-
if ((term->flags & TERM_EXTENDED_COLOR))
419-
corners[0].spec.gray = -1; /* force solid color */
420-
#endif
421405
/* print the rectangle with the given colour */
422406
if (default_fillstyle.fillstyle == FS_EMPTY)
423407
corners->style = FS_OPAQUE;

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL