Merge branch 'master' into forms

Conflicts:
	pdf/mupdf-internal.h
	pdf/pdf_font.c

4 files changed, 10 insertions, 5 deletions

diff --git a/apps/mudraw.c b/apps/mudraw.c
index 24e8a36e..a67ba8e8 100644
--- a/apps/mudraw.c
+++ b/apps/mudraw.c
@@ -546,6 +546,7 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum)
 		if (diff > timing.max)
 		{
 			timing.max = diff;
+			timing.maxpage = pagenum;
 			timing.maxfilename = filename;
 		}
 		timing.total += diff;
diff --git a/apps/mupdfinfo.c b/apps/mupdfinfo.c
index 5bdf760e..279298c2 100644
--- a/apps/mupdfinfo.c
+++ b/apps/mupdfinfo.c
@@ -176,14 +176,14 @@ showglobalinfo(void)
 	if (obj)
 	{
 		printf("Info object (%d %d R):\n", pdf_to_num(obj), pdf_to_gen(obj));
-		pdf_print_obj(pdf_resolve_indirect(obj));
+		pdf_fprint_obj(stdout, pdf_resolve_indirect(obj), 0);
 	}
 
 	obj = pdf_dict_gets(xref->trailer, "Encrypt");
 	if (obj)
 	{
 		printf("\nEncryption object (%d %d R):\n", pdf_to_num(obj), pdf_to_gen(obj));
-		pdf_print_obj(pdf_resolve_indirect(obj));
+		pdf_fprint_obj(stdout, pdf_resolve_indirect(obj), 0);
 	}
 
 	printf("\nPages: %d\n\n", pagecount);
diff --git a/apps/mupdfshow.c b/apps/mupdfshow.c
index 8e8425b0..f534a5c7 100644
--- a/apps/mupdfshow.c
+++ b/apps/mupdfshow.c
@@ -24,7 +24,7 @@ static void showtrailer(void)
 	if (!doc)
 		fz_throw(ctx, "no file specified");
 	printf("trailer\n");
-	pdf_print_obj(doc->trailer);
+	pdf_fprint_obj(stdout, doc->trailer, 0);
 	printf("\n");
 }
 
@@ -122,7 +122,7 @@ static void showobject(int num, int gen)
 		else
 		{
 			printf("%d %d obj\n", num, gen);
-			pdf_print_obj(obj);
+			pdf_fprint_obj(stdout, obj, 0);
 			printf("stream\n");
 			showstream(num, gen);
 			printf("endstream\n");
@@ -132,7 +132,7 @@ static void showobject(int num, int gen)
 	else
 	{
 		printf("%d %d obj\n", num, gen);
-		pdf_print_obj(obj);
+		pdf_fprint_obj(stdout, obj, 0);
 		printf("endobj\n\n");
 	}
 
diff --git a/apps/x11_main.c b/apps/x11_main.c
index d19b4f8c..ec78695d 100644
--- a/apps/x11_main.c
+++ b/apps/x11_main.c
@@ -583,7 +583,11 @@ void winopenuri(pdfapp_t *app, char *buf)
 #endif
 	}
 	if (fork() == 0)
+	{
 		execlp(browser, browser, buf, (char*)0);
+		fprintf(stderr, "cannot exec '%s'\n", browser);
+		exit(0);
+	}
 }
 
 static void onkey(int c)