back-merged

This commit is contained in:
oxygenic 2017-06-13 21:05:35 +02:00 committed by Robin Stuart
parent 6413351fd6
commit d8330f5d96
13 changed files with 37 additions and 34 deletions

View file

@ -39,7 +39,7 @@
#endif
/* Convert Unicode to other character encodings */
int utf_to_eci(int eci, const unsigned char source[], unsigned char dest[], int *length) {
int utf_to_eci(const int eci, const unsigned char source[], unsigned char dest[], size_t *length) {
int glyph;
int bytelen;
int in_posn;
@ -288,7 +288,7 @@ int utf_to_eci(int eci, const unsigned char source[], unsigned char dest[], int
}
/* Find the lowest ECI mode which will encode a given set of Unicode text */
int get_best_eci(unsigned char source[], int length) {
int get_best_eci(unsigned char source[], size_t length) {
int eci = 3;
#ifndef _MSC_VER