|
|
|
|
Index: src/color.c
|
|
|
|
|
--- src/color.c.orig 2014-05-13 20:26:40.000000000 +0200
|
|
|
|
|
+++ src/color.c 2015-01-14 23:02:12.726500096 +0100
|
|
|
|
|
@@ -62,7 +62,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
-init_color()
|
|
|
|
|
+gnuplot_init_color()
|
|
|
|
|
{
|
|
|
|
|
/* initialize global palette */
|
|
|
|
|
sm_palette.colorFormulae = 37; /* const */
|
|
|
|
|
Index: src/color.h
|
|
|
|
|
--- src/color.h.orig 2013-10-22 00:31:59.000000000 +0200
|
|
|
|
|
+++ src/color.h 2015-01-14 23:02:12.726500096 +0100
|
|
|
|
|
@@ -217,7 +217,7 @@
|
|
|
|
|
/* ROUTINES */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-void init_color __PROTO((void)); /* call once to initialize variables */
|
|
|
|
|
+void gnuplot_init_color __PROTO((void)); /* call once to initialize variables */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Index: src/set.c
|
|
|
|
|
--- src/set.c.orig 2014-11-23 19:29:17.000000000 +0100
|
|
|
|
|
+++ src/set.c 2015-01-14 23:02:12.736361894 +0100
|
|
|
|
|
@@ -3101,7 +3101,7 @@
|
|
|
|
|
free_at(sm_palette.Afunc.at);
|
|
|
|
|
free_at(sm_palette.Bfunc.at);
|
|
|
|
|
free_at(sm_palette.Cfunc.at);
|
|
|
|
|
- init_color();
|
|
|
|
|
+ gnuplot_init_color();
|
|
|
|
|
pm3d_last_set_palette_mode = SMPAL_COLOR_MODE_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Index: term/lua.trm
|
|
|
|
|
--- term/lua.trm.orig 2014-10-29 04:28:24.000000000 +0100
|
|
|
|
|
+++ term/lua.trm 2015-01-14 23:13:07.266385682 +0100
|
|
|
|
|
@@ -251,7 +251,7 @@
|
|
|
|
|
msg = luaL_checkstring(L, 1);
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
- t_num = luaL_checkint(L, 1);
|
|
|
|
|
+ t_num = luaL_checkinteger(L, 1);
|
|
|
|
|
msg = luaL_checkstring(L, 2);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
@@ -285,7 +285,7 @@
|
|
|
|
|
msg = luaL_checkstring(L, 1);
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
- t_num = luaL_checkint(L, 1);
|
|
|
|
|
+ t_num = luaL_checkinteger(L, 1);
|
|
|
|
|
msg = luaL_checkstring(L, 2);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
