mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

glshadervariables: also trim \r as well as \n

Browse source
This commit is contained in:
Matthew Waters 2014-11-24 02:52:24 +11:00 committed by Tim-Philipp Müller
parent 00506bf183
commit 97607a0d50
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/gl/gstglshadervariables.c
View file

@ -184,7 +184,7 @@ gst_gl_shadervariables_parse (GstGLShader * shader, char *variables,
return 0; return 0;
p0 = variables; p0 = variables;
trimright (p0, " \t\n"); trimright (p0, " \t\r\n");
lim = variables + strlen (variables); lim = variables + strlen (variables);
e = strchr (p0, ';'); e = strchr (p0, ';');
while (p0 < lim) { while (p0 < lim) {
@ -201,13 +201,13 @@ gst_gl_shadervariables_parse (GstGLShader * shader, char *variables,
e[1] = e1; e[1] = e1;
trimright (p, " \t"); trimright (p, " \t");
trimleft (p, " \t\n"); trimleft (p, " \t\r\n");
t = strtok_r (p, " \t", &saveptr); t = strtok_r (p, " \t", &saveptr);
if (!t) if (!t)
goto parse_error; goto parse_error;
trimleft (t, " \t"); trimleft (t, " \t");
trimright (t, " \t\n"); trimright (t, " \t\r\n");
if (t[0]) { if (t[0]) {
@ -318,7 +318,7 @@ parse_error:
t = p = p0; t = p = p0;
} else { } else {
e[1] = 0; e[1] = 0;
trimleft (p0, " \t\n"); trimleft (p0, " \t\r\n");
GST_ERROR ("\n%s", p0); GST_ERROR ("\n%s", p0);
e[1] = e1; e[1] = e1;
} }