diff options
author | Michael Niedermayer | 2012-09-06 16:14:34 +0200 |
---|---|---|
committer | Michael Niedermayer | 2012-09-06 16:14:34 +0200 |
commit | 2bb62455c899cdccbdc2a6ad33f9582008ed9f05 (patch) | |
tree | be695858ce63db54ec4aedab5596bf2ba072f65f /compat/strtod.c | |
parent | 376b16d7cc8a0953bc2054a6ccc778d75b7b1c5b (diff) |
Revert "lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime."
This reverts commit ba537202801d71711f1ef9306a6248dd2d426fa0.
A better implementation has been commited by the same author to qatar
Conflicts:
configure
Found-by: jamal <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/strtod.c')
-rw-r--r-- | compat/strtod.c | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/compat/strtod.c b/compat/strtod.c deleted file mode 100644 index 149d18aa92..0000000000 --- a/compat/strtod.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * C99-compatible strtod() implementation - * Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com> - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <ctype.h> -#include <limits.h> - -#include "libavutil/avstring.h" -#include "libavutil/mathematics.h" -#include "strtod.h" - -static char *check_nan_suffix(char *s) -{ - char *start = s; - - if (*s++ != '(') - return start; - - while ((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') || - (*s >= '0' && *s <= '9') || *s == '_') - s++; - - return *s == ')' ? s + 1 : start; -} - -#undef strtod -double avpriv_strtod(char *restrict nptr, char **restrict endptr) -{ - char *end; - double res; - - /* Skip leading spaces */ - while (isspace(*nptr)) - nptr++; - - if (!av_strncasecmp(nptr, "infinity", 8)) { - end = nptr + 8; - res = INFINITY; - } else if (!av_strncasecmp(nptr, "inf", 3)) { - end = nptr + 3; - res = INFINITY; - } else if (!av_strncasecmp(nptr, "+infinity", 9)) { - end = nptr + 9; - res = INFINITY; - } else if (!av_strncasecmp(nptr, "+inf", 4)) { - end = nptr + 4; - res = INFINITY; - } else if (!av_strncasecmp(nptr, "-infinity", 9)) { - end = nptr + 9; - res = -INFINITY; - } else if (!av_strncasecmp(nptr, "-inf", 4)) { - end = nptr + 4; - res = -INFINITY; - } else if (!av_strncasecmp(nptr, "nan", 3)) { - end = check_nan_suffix(nptr + 3); - res = NAN; - } else if (!av_strncasecmp(nptr, "+nan", 4) || - !av_strncasecmp(nptr, "-nan", 4)) { - end = check_nan_suffix(nptr + 4); - res = NAN; - } else if (!av_strncasecmp(nptr, "0x", 2) || - !av_strncasecmp(nptr, "-0x", 3) || - !av_strncasecmp(nptr, "+0x", 3)) { - /* FIXME this doesn't handle exponents, non-integers (float/double) - * and numbers too large for long long */ - res = strtoll(nptr, &end, 16); - } else { - res = strtod(nptr, &end); - } - - if (endptr) - *endptr = end; - - return res; -} |