Fix some compiler warnings on Android.

Use intptr_t when casting between a jlong and a pointer to suppress errors
about different size words.

Add a 'u' suffix to unsigned values output by the cmap dump utility.

1 files changed, 5 insertions, 5 deletions

diff --git a/scripts/cmapdump.c b/scripts/cmapdump.c
index 8d5cae2b..21052950 100644
--- a/scripts/cmapdump.c
+++ b/scripts/cmapdump.c
@@ -107,7 +107,7 @@ main(int argc, char **argv)
 			{
 				if (k % 4 == 0)
 					fprintf(fo, "\n");
-				fprintf(fo, "{%u,%u,%u},", cmap->ranges[k].low, cmap->ranges[k].high, cmap->ranges[k].out);
+				fprintf(fo, "{%uu,%uu,%uu},", cmap->ranges[k].low, cmap->ranges[k].high, cmap->ranges[k].out);
 			}
 			fprintf(fo, "\n};\n\n");
 		}
@@ -119,7 +119,7 @@ main(int argc, char **argv)
 			{
 				if (k % 4 == 0)
 					fprintf(fo, "\n");
-				fprintf(fo, "{%u,%u,%u},", cmap->xranges[k].low, cmap->xranges[k].high, cmap->xranges[k].out);
+				fprintf(fo, "{%uu,%uu,%uu},", cmap->xranges[k].low, cmap->xranges[k].high, cmap->xranges[k].out);
 			}
 			fprintf(fo, "\n};\n\n");
 		}
@@ -129,9 +129,9 @@ main(int argc, char **argv)
 			fprintf(fo, "static const pdf_mrange cmap_%s_mranges[] = {", name);
 			for (k = 0; k < cmap->mlen; k++)
 			{
-				fprintf(fo, "\n{%u,%u,{", cmap->mranges[k].low, cmap->mranges[k].len);
+				fprintf(fo, "\n{%uu,%uu,{", cmap->mranges[k].low, cmap->mranges[k].len);
 				for (m = 0; m < PDF_MRANGE_CAP; ++m)
-					fprintf(fo, "%u,", cmap->mranges[k].out[m]);
+					fprintf(fo, "%uu,", cmap->mranges[k].out[m]);
 				fprintf(fo, "}},");
 			}
 			fprintf(fo, "\n};\n\n");
@@ -149,7 +149,7 @@ main(int argc, char **argv)
 		}
 		for (k = 0; k < cmap->codespace_len; k++)
 		{
-			fprintf(fo, "{%u,%u,%u},", cmap->codespace[k].n, cmap->codespace[k].low, cmap->codespace[k].high);
+			fprintf(fo, "{%u,%uu,%uu},", cmap->codespace[k].n, cmap->codespace[k].low, cmap->codespace[k].high);
 		}
 		fprintf(fo, " },\n");