20814N/A@@ -187,13 +187,13 @@ bool ParseDictDataBcd(
20814N/A // TODO(yusukes): would be better to store actual double value,
20814N/A // rather than the dummy integer.
20814N/A- operands->push_back(std::make_pair(0, DICT_OPERAND_REAL));
20814N/A+ operands->push_back(std::make_pair((unsigned)0, DICT_OPERAND_REAL));
20814N/A- operands->push_back(std::make_pair(0, DICT_OPERAND_REAL));
20814N/A+ operands->push_back(std::make_pair((unsigned)0, DICT_OPERAND_REAL));
20814N/A@@ -262,7 +262,7 @@ bool ParseDictDataNumber(
20814N/A- operands->push_back(std::make_pair((b1 << 8) + b2, DICT_OPERAND_INTEGER));
20814N/A+ operands->push_back(std::make_pair((unsigned)((b1 << 8) + b2), DICT_OPERAND_INTEGER));
20814N/A@@ -272,8 +272,8 @@ bool ParseDictDataNumber(
20814N/A- operands->push_back(std::make_pair(
20814N/A- (b1 << 24) + (b2 << 16) + (b3 << 8) + b4, DICT_OPERAND_INTEGER));
20814N/A+ operands->push_back(std::make_pair((unsigned)
20814N/A+ ((b1 << 24) + (b2 << 16) + (b3 << 8) + b4), DICT_OPERAND_INTEGER));
20814N/A case 30: // binary coded decimal
20814N/A@@ -315,7 +315,7 @@ bool ParseDictDataReadNext(
20814N/A return ParseDictDataEscapedOperator(table, operands);
20814N/A- operands->push_back(std::make_pair(op, DICT_OPERATOR));
20814N/A+ operands->push_back(std::make_pair((unsigned)op, DICT_OPERATOR));
20814N/A } else if (op <= 27 || op == 31 || op == 255) {
20814N/A@@ -648,9 +648,9 @@ bool ots_cmap_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
20814N/A- std::make_pair(subtable_headers[i].offset, 1 /* start */));
20814N/A+ std::make_pair(subtable_headers[i].offset, (uint8_t)1 /* start */));
20814N/A- std::make_pair(end_byte, 0 /* end */));
20814N/A+ std::make_pair(end_byte, (uint8_t)0 /* end */));
20814N/A@@ -118,7 +118,7 @@ bool ParseSimpleGlyph(ots::OpenTypeFile *file, const uint8_t *data,
20814N/A // a pointer to a static uint16_t 0 to overwrite the length.
20814N/A data + gly_offset, gly_header_length - 2));
20814N/A if (!table->Skip(bytecode_length)) {
20814N/A@@ -394,9 +394,9 @@ bool ProcessGeneric(ots::OpenTypeFile *header, ots::OTSStream *output,
20814N/A std::vector<std::pair<uint32_t, uint8_t> > overlap_checker;
20814N/A for (unsigned i = 0; i < header->num_tables; ++i) {
20814N/A- std::make_pair(tables[i].offset, 1 /* start */));
20814N/A+ std::make_pair(tables[i].offset, (uint8_t)1 /* start */));
20814N/A- std::make_pair(tables[i].offset + tables[i].length, 0 /* end */));
20814N/A+ std::make_pair(tables[i].offset + tables[i].length, (uint8_t)0 /* end */));