Merge branch 'master' into jgrpp
# Conflicts: # src/lang/czech.txt # src/order_backup.h # src/settings_internal.h # src/string.cpp # src/viewport.cpp
This commit is contained in:
@@ -727,7 +727,6 @@ size_t Utf8Decode(WChar *c, const char *s)
|
||||
}
|
||||
}
|
||||
|
||||
/* DEBUG(misc, 1, "[utf8] invalid UTF-8 sequence"); */
|
||||
*c = '?';
|
||||
return 1;
|
||||
}
|
||||
@@ -763,7 +762,6 @@ inline size_t Utf8Encode(T buf, WChar c)
|
||||
return 4;
|
||||
}
|
||||
|
||||
/* DEBUG(misc, 1, "[utf8] can't UTF-8 encode value 0x%X", c); */
|
||||
*buf = '?';
|
||||
return 1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user