mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 03:29:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: shadervariables: make parsing of floats locale-independent

Browse source 
Floating point numbers are written differently in different
locales, e.g. in many countries 1/2 = 0,5 instead of 0.5, and
strtod will not be able to parse "0.5" correctly in such a
locale.
This commit is contained in:
Tim-Philipp Müller 2014-11-23 21:43:20 +00:00
parent 59085936b8
commit 1a613c5d4e
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -741,7 +741,7 @@ parsevalue (char *value, char *_saveptr, struct gst_gl_shadervariable_desc *ret)
return _saveptr + j; return _saveptr + j;
} }
ret->value = (void *) g_malloc (sizeof (float)); ret->value = (void *) g_malloc (sizeof (float));
*((float *) ret->value) = (float) strtod (value, NULL); *((float *) ret->value) = (float) g_ascii_strtod (value, NULL);
} else { } else {
ret->value = g_malloc (sizeof (float) * ret->count); ret->value = g_malloc (sizeof (float) * ret->count);
@ -762,7 +762,7 @@ parsevalue (char *value, char *_saveptr, struct gst_gl_shadervariable_desc *ret)
return _saveptr + (saveptr - t) + j; return _saveptr + (saveptr - t) + j;
} }
((float *) ret->value)[i] = (float) strtod (t, NULL); ((float *) ret->value)[i] = (float) g_ascii_strtod (t, NULL);
t = strtok_r (0, ",", &saveptr); t = strtok_r (0, ",", &saveptr);
} }
} }
@ -925,7 +925,7 @@ vec_parsevalue (int n, char *value, char *_saveptr,
return _saveptr + (saveptr - t) + j; return _saveptr + (saveptr - t) + j;
} }
((float *) ret->value)[i] = (float) strtod (t, NULL); ((float *) ret->value)[i] = (float) g_ascii_strtod (t, NULL);
t = strtok_r (0, ",", &saveptr); t = strtok_r (0, ",", &saveptr);
} }
@ -975,7 +975,7 @@ vec_parsevalue (int n, char *value, char *_saveptr,
return _saveptr + (t - value) + j; return _saveptr + (t - value) + j;
} }
((float *) ret->value)[k * n + i] = (float) strtod (t, NULL); ((float *) ret->value)[k * n + i] = (float) g_ascii_strtod (t, NULL);
t = strtok_r (0, ",", &saveptr); t = strtok_r (0, ",", &saveptr);
if (i < (n - 1) && !t) if (i < (n - 1) && !t)
return _saveptr + (saveptr - value); return _saveptr + (saveptr - value);
@ -1424,7 +1424,7 @@ mat_parsevalue (int n, int m, char *value, char *_saveptr,
return _saveptr + (saveptr - t) + j; return _saveptr + (saveptr - t) + j;
} }
((float *) ret->value)[i] = (float) strtod (t, NULL); ((float *) ret->value)[i] = (float) g_ascii_strtod (t, NULL);
t = strtok_r (0, ",", &saveptr); t = strtok_r (0, ",", &saveptr);
} }
@ -1474,7 +1474,8 @@ mat_parsevalue (int n, int m, char *value, char *_saveptr,
return _saveptr + (t - value) + j; return _saveptr + (t - value) + j;
} }
((float *) ret->value)[k * n * m + i] = (float) strtod (t, NULL); ((float *) ret->value)[k * n * m + i] =
(float) g_ascii_strtod (t, NULL);
t = strtok_r (0, ",", &saveptr); t = strtok_r (0, ",", &saveptr);
if (i < (n * m - 1) && !t) if (i < (n * m - 1) && !t)
return _saveptr + (saveptr - value); return _saveptr + (saveptr - value);