aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/char_utils.cpp
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2012-08-12 11:10:48 +0900
committerKen Wakasa <kwakasa@google.com>2012-08-13 10:48:37 +0900
commitbcec82de66f52655593dc233346f11468f5077a0 (patch)
tree2237aa0f754e3ab44ccfac034f5ef6e17ffda724 /native/jni/src/char_utils.cpp
parent814510305c21b3081414e75e040dec4b73f6cdf3 (diff)
downloadlatinime-bcec82de66f52655593dc233346f11468f5077a0.tar.gz
latinime-bcec82de66f52655593dc233346f11468f5077a0.tar.xz
latinime-bcec82de66f52655593dc233346f11468f5077a0.zip
Clean up constructors
And, use C++ style casts and use float math functions rather than double ones to save memory space. Also, stop using FloatMath and NativeUtils as standard Math methods are faster now. See http://code.google.com/p/android/issues/detail?id=36199 and https://android-review.googlesource.com/40700 multi-project commit with I4259fb5ab8a15ac5760a7f04fc8f4c860529f04a Change-Id: I0b81cff8c91769f7559a59b9528c75a5aabb4211
Diffstat (limited to 'native/jni/src/char_utils.cpp')
-rw-r--r--native/jni/src/char_utils.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/native/jni/src/char_utils.cpp b/native/jni/src/char_utils.cpp
index 45d49b087..fc0a0596f 100644
--- a/native/jni/src/char_utils.cpp
+++ b/native/jni/src/char_utils.cpp
@@ -885,16 +885,17 @@ static const struct LatinCapitalSmallPair SORTED_CHAR_MAP[] = {
};
static int compare_pair_capital(const void *a, const void *b) {
- return (int)(*(unsigned short *)a)
- - (int)((struct LatinCapitalSmallPair*)b)->capital;
+ return static_cast<int>(*reinterpret_cast<const unsigned short *>(a))
+ - static_cast<int>(
+ (reinterpret_cast<const struct LatinCapitalSmallPair *>(b))->capital);
}
unsigned short latin_tolower(unsigned short c) {
struct LatinCapitalSmallPair *p =
- (struct LatinCapitalSmallPair *)bsearch(&c, SORTED_CHAR_MAP,
+ reinterpret_cast<struct LatinCapitalSmallPair *>(bsearch(&c, SORTED_CHAR_MAP,
sizeof(SORTED_CHAR_MAP) / sizeof(SORTED_CHAR_MAP[0]),
sizeof(SORTED_CHAR_MAP[0]),
- compare_pair_capital);
+ compare_pair_capital));
return p ? p->small : c;
}
} // namespace latinime