Change back offset in BinaryDict to size_t, because "size_t" on MSVC …

…x64 is unsigned long long.

src/BinaryDict.cpp

@@ -67,11 +67,12 @@ void BinaryDict::SerializeToFile(FILE* fp) const {
 }
 
 BinaryDictPtr BinaryDict::NewFromFile(FILE* fp) {
-  long offsetBound, savedOffset;
-  savedOffset = ftell(fp);
+  long savedOffset = ftell(fp);
   fseek(fp, 0L, SEEK_END);
-  offsetBound = ftell(fp) - savedOffset;
+  long offsetBoundLong = ftell(fp) - savedOffset;
   fseek(fp, savedOffset, SEEK_SET);
+  assert(offsetBoundLong >= 0);
+  size_t offsetBound = static_cast<size_t>(offsetBoundLong);
 
   BinaryDictPtr dict(new BinaryDict(LexiconPtr(new Lexicon)));
 
@@ -117,17 +118,17 @@ BinaryDictPtr BinaryDict::NewFromFile(FILE* fp) {
       throw InvalidFormat("Invalid OpenCC binary dictionary (numValues)");
     }
     // Key offset
-    long keyOffset;
-    unitsRead = fread(&keyOffset, sizeof(long), 1, fp);
+    size_t keyOffset;
+    unitsRead = fread(&keyOffset, sizeof(size_t), 1, fp);
     if (unitsRead != 1 || keyOffset >= offsetBound) {
       throw InvalidFormat("Invalid OpenCC binary dictionary (keyOffset)");
     }
     std::string key = dict->keyBuffer.c_str() + keyOffset;
     // Value offset
     std::vector<std::string> values;
     for (size_t j = 0; j < numValues; j++) {
-      long valueOffset;
-      unitsRead = fread(&valueOffset, sizeof(long), 1, fp);
+      size_t valueOffset;
+      unitsRead = fread(&valueOffset, sizeof(size_t), 1, fp);
       if (unitsRead != 1 || valueOffset >= offsetBound) {
         throw InvalidFormat("Invalid OpenCC binary dictionary (valueOffset)");
       }

src/PhraseExtract.cpp

@@ -57,7 +57,7 @@ class PhraseExtract::DictType {
     marisa::Agent agent;
     agent.set_query(key.CString(), key.ByteLength());
     if (marisa_trie.lookup(agent)) {
-      int item_id = marisa_id_item_map[agent.key().id()];
+      size_t item_id = marisa_id_item_map[agent.key().id()];
       return items[item_id].second;
     }