Merge branch 'master' into android

This commit is contained in:
Reece H. Dunn
2013-05-01 21:31:23 +01:00
33 changed files with 587 additions and 271 deletions
+3 -2
View File
@@ -2984,8 +2984,9 @@ int TransposeAlphabet(Translator *tr, char *text)
*p2++ = (acc << (8-bits));
}
*p2 = 0;
strcpy(text, buf);
return((p2 - buf) | 0x40); // bit 6 indicates compressed characters
ix = p2 - buf;
memcpy(text, buf, ix);
return(ix | 0x40); // bit 6 indicates compressed characters
}
else
{