summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuriy M. Kaminskiy <yumkam@gmail.com>2010-01-12 08:22:27 +0300
committerGrigori Goronzy <greg@blackbox>2010-01-12 13:59:31 +0100
commitf6e2623f25c81eaed26b29a0d9691c443b5e5ef3 (patch)
tree71b00676bb60e078103871339118c5b138174cb3
parent8707f00bb3e56590f04ede70013339aeba57875c (diff)
downloadlibass-f6e2623f25c81eaed26b29a0d9691c443b5e5ef3.tar.bz2
libass-f6e2623f25c81eaed26b29a0d9691c443b5e5ef3.tar.xz
Fix leftovers from conversion to ass_strtod
-rw-r--r--libass/ass.c8
-rw-r--r--libass/ass_parse.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/libass/ass.c b/libass/ass.c
index 6becb39..5f49a19 100644
--- a/libass/ass.c
+++ b/libass/ass.c
@@ -38,6 +38,8 @@
#include "ass_utils.h"
#include "ass_library.h"
+#define ass_atof(STR) (ass_strtod((STR),NULL))
+
typedef enum {
PST_UNKNOWN = 0,
PST_INFO,
@@ -250,7 +252,7 @@ static int numpad2align(int val)
ass_msg(track->library, MSGL_DBG2, "%s = %s", #name, token);
#define INTVAL(name) ANYVAL(name,atoi)
-#define FPVAL(name) ANYVAL(name,atof)
+#define FPVAL(name) ANYVAL(name,ass_atof)
#define TIMEVAL(name) \
} else if (strcasecmp(tname, #name) == 0) { \
target->name = string2timecode(track->library, token); \
@@ -384,7 +386,7 @@ void ass_process_force_style(ASS_Track *track)
else if (!strcasecmp(*fs, "PlayResY"))
track->PlayResY = atoi(token);
else if (!strcasecmp(*fs, "Timer"))
- track->Timer = atof(token);
+ track->Timer = ass_atof(token);
else if (!strcasecmp(*fs, "WrapStyle"))
track->WrapStyle = atoi(token);
else if (!strcasecmp(*fs, "ScaledBorderAndShadow"))
@@ -568,7 +570,7 @@ static int process_info_line(ASS_Track *track, char *str)
} else if (!strncmp(str, "PlayResY:", 9)) {
track->PlayResY = atoi(str + 9);
} else if (!strncmp(str, "Timer:", 6)) {
- track->Timer = atof(str + 6);
+ track->Timer = ass_atof(str + 6);
} else if (!strncmp(str, "WrapStyle:", 10)) {
track->WrapStyle = atoi(str + 10);
} else if (!strncmp(str, "ScaledBorderAndShadow:", 22)) {
diff --git a/libass/ass_parse.c b/libass/ass_parse.c
index 0ccb5a2..e5d1b16 100644
--- a/libass/ass_parse.c
+++ b/libass/ass_parse.c
@@ -586,7 +586,7 @@ static char *parse_tag(ASS_Renderer *render_priv, char *p, double pwr)
for (cnt = 0; cnt < 3; ++cnt) {
if (*p == '\\')
break;
- v[cnt] = strtod(p, &p);
+ mystrtod(&p, &v[cnt]);
skip(',');
}
if (cnt == 3) {