am 880cb618: am 3970352e: Make digraph lookups case insensitive

* commit '880cb6187cfe4ec6632bc2d19d70411210818bc9':
  Make digraph lookups case insensitive
main
Tom Ouyang 2013-04-17 19:47:37 -07:00 committed by Android Git Automerger
commit 05da1df8ee
1 changed files with 3 additions and 1 deletions

View File

@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "char_utils.h"
#include "binary_format.h" #include "binary_format.h"
#include "defines.h" #include "defines.h"
#include "digraph_utils.h" #include "digraph_utils.h"
@ -120,10 +121,11 @@ const DigraphUtils::DigraphType DigraphUtils::USED_DIGRAPH_TYPES[] =
/* static */ const DigraphUtils::digraph_t *DigraphUtils::getDigraphForDigraphTypeAndCodePoint( /* static */ const DigraphUtils::digraph_t *DigraphUtils::getDigraphForDigraphTypeAndCodePoint(
const DigraphUtils::DigraphType digraphType, const int compositeGlyphCodePoint) { const DigraphUtils::DigraphType digraphType, const int compositeGlyphCodePoint) {
const DigraphUtils::digraph_t *digraphs = 0; const DigraphUtils::digraph_t *digraphs = 0;
const int compositeGlyphLowerCodePoint = toLowerCase(compositeGlyphCodePoint);
const int digraphsSize = const int digraphsSize =
DigraphUtils::getAllDigraphsForDictionaryAndReturnSize(digraphType, &digraphs); DigraphUtils::getAllDigraphsForDictionaryAndReturnSize(digraphType, &digraphs);
for (int i = 0; i < digraphsSize; i++) { for (int i = 0; i < digraphsSize; i++) {
if (digraphs[i].compositeGlyph == compositeGlyphCodePoint) { if (digraphs[i].compositeGlyph == compositeGlyphLowerCodePoint) {
return &digraphs[i]; return &digraphs[i];
} }
} }