diff options
author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2013-03-04 11:30:34 +0000 |
---|---|---|
committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2013-03-04 11:30:34 +0000 |
commit | 5bf56ba7027cd5f22ff52d0138893f7a585135fb (patch) | |
tree | 19e17fc79b8873e66f211276d4dd169c480cede1 /src/lib/util.cc | |
parent | 3da1eb108d36da35333b2d655202791af854996b (diff) | |
parent | 5b6dc79427b8f7eeb6a7ff68034ab8548ce670ea (diff) | |
download | openfst-5bf56ba7027cd5f22ff52d0138893f7a585135fb.tar.gz |
Merge remote-tracking branch 'goog/ics-ub-google-tts' into jb-mr2-devandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devidea133-weekly-releaseidea133
Diffstat (limited to 'src/lib/util.cc')
-rw-r--r-- | src/lib/util.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index f754da5..ab877fd 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -21,6 +21,7 @@ #include <cctype> #include <string> #include <fst/util.h> +#include <fst/mapped-file.h> // Utility flag definitions @@ -31,7 +32,7 @@ DEFINE_bool(fst_error_fatal, true, namespace fst { int64 StrToInt64(const string &s, const string &src, size_t nline, - bool allow_negative = false, bool *error) { + bool allow_negative, bool *error) { int64 n; const char *cs = s.c_str(); char *p; @@ -59,15 +60,15 @@ void ConvertToLegalCSymbol(string *s) { // Skips over input characters to align to 'align' bytes. Returns // false if can't align. -bool AlignInput(istream &strm, int align) { +bool AlignInput(istream &strm) { char c; - for (int i = 0; i < align; ++i) { + for (int i = 0; i < MappedFile::kArchAlignment; ++i) { int64 pos = strm.tellg(); if (pos < 0) { LOG(ERROR) << "AlignInput: can't determine stream position"; return false; } - if (pos % align == 0) break; + if (pos % MappedFile::kArchAlignment == 0) break; strm.read(&c, 1); } return true; @@ -75,14 +76,14 @@ bool AlignInput(istream &strm, int align) { // Write null output characters to align to 'align' bytes. Returns // false if can't align. -bool AlignOutput(ostream &strm, int align) { - for (int i = 0; i < align; ++i) { +bool AlignOutput(ostream &strm) { + for (int i = 0; i < MappedFile::kArchAlignment; ++i) { int64 pos = strm.tellp(); if (pos < 0) { LOG(ERROR) << "AlignOutput: can't determine stream position"; return false; } - if (pos % align == 0) break; + if (pos % MappedFile::kArchAlignment == 0) break; strm.write("", 1); } return true; |