Add warning context.

6 files changed, 18 insertions, 20 deletions

diff --git a/apps/pdfapp.c b/apps/pdfapp.c
index 36985010..c992b504 100644
--- a/apps/pdfapp.c
+++ b/apps/pdfapp.c
@@ -239,7 +239,7 @@ void pdfapp_close(pdfapp_t *app)
 		app->xps = NULL;
 	}
 
-	fz_flush_warnings();
+	fz_flush_warnings(app->ctx);
 }
 
 static fz_matrix pdfapp_viewctm(pdfapp_t *app)
@@ -426,7 +426,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage, int repai
 		wincursor(app, ARROW);
 	}
 
-	fz_flush_warnings();
+	fz_flush_warnings(app->ctx);
 }
 
 static void pdfapp_gotouri(pdfapp_t *app, fz_obj *uri)
diff --git a/apps/pdfclean.c b/apps/pdfclean.c
index a1e70a1a..4b5fa139 100644
--- a/apps/pdfclean.c
+++ b/apps/pdfclean.c
@@ -782,7 +782,7 @@ int main(int argc, char **argv)
 	fz_free(xref->ctx, renumbermap);
 
 	pdf_free_xref(xref);
-	fz_flush_warnings();
+	fz_flush_warnings(ctx);
 	fz_free_context(ctx);
 	return 0;
 }
diff --git a/apps/pdfdraw.c b/apps/pdfdraw.c
index a088a938..c65ef059 100644
--- a/apps/pdfdraw.c
+++ b/apps/pdfdraw.c
@@ -256,7 +256,7 @@ static void drawpage(pdf_xref *xref, int pagenum)
 
 	pdf_age_store(ctx, xref->store, 3);
 
-	fz_flush_warnings();
+	fz_flush_warnings(ctx);
 }
 
 static void drawrange(pdf_xref *xref, char *range)
@@ -407,9 +407,7 @@ int main(int argc, char **argv)
 	}
 
 	fz_free_glyph_cache(ctx, glyphcache);
-
-	fz_flush_warnings();
-
+	fz_flush_warnings(ctx);
 	fz_free_context(ctx);
 	return 0;
 }
diff --git a/apps/pdfextract.c b/apps/pdfextract.c
index f59f7df8..7e09226e 100644
--- a/apps/pdfextract.c
+++ b/apps/pdfextract.c
@@ -129,7 +129,7 @@ static void savefont(fz_obj *dict, int num)
 
 	if (!stream)
 	{
-		fz_warn("Unhandled font type");
+		fz_warn(ctx, "Unhandled font type");
 		return;
 	}
 
@@ -221,7 +221,7 @@ int main(int argc, char **argv)
 	}
 
 	pdf_free_xref(xref);
-	fz_flush_warnings();
+	fz_flush_warnings(ctx);
 	fz_free_context(ctx);
 	return 0;
 }
diff --git a/apps/pdfinfo.c b/apps/pdfinfo.c
index 3e403b08..d2aa0bb4 100644
--- a/apps/pdfinfo.c
+++ b/apps/pdfinfo.c
@@ -251,7 +251,7 @@ gatherfonts(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
 		fontdict = fz_dict_get_val(dict, i);
 		if (!fz_is_dict(fontdict))
 		{
-			fz_warn("not a font dict (%d %d R)", fz_to_num(fontdict), fz_to_gen(fontdict));
+			fz_warn(ctx, "not a font dict (%d %d R)", fz_to_num(fontdict), fz_to_gen(fontdict));
 			continue;
 		}
 
@@ -300,7 +300,7 @@ gatherimages(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
 		imagedict = fz_dict_get_val(dict, i);
 		if (!fz_is_dict(imagedict))
 		{
-			fz_warn("not an image dict (%d %d R)", fz_to_num(imagedict), fz_to_gen(imagedict));
+			fz_warn(ctx, "not an image dict (%d %d R)", fz_to_num(imagedict), fz_to_gen(imagedict));
 			continue;
 		}
 
@@ -371,7 +371,7 @@ gatherforms(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
 		xobjdict = fz_dict_get_val(dict, i);
 		if (!fz_is_dict(xobjdict))
 		{
-			fz_warn("not a xobject dict (%d %d R)", fz_to_num(xobjdict), fz_to_gen(xobjdict));
+			fz_warn(ctx, "not a xobject dict (%d %d R)", fz_to_num(xobjdict), fz_to_gen(xobjdict));
 			continue;
 		}
 
@@ -422,7 +422,7 @@ gatherpsobjs(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
 		xobjdict = fz_dict_get_val(dict, i);
 		if (!fz_is_dict(xobjdict))
 		{
-			fz_warn("not a xobject dict (%d %d R)", fz_to_num(xobjdict), fz_to_gen(xobjdict));
+			fz_warn(ctx, "not a xobject dict (%d %d R)", fz_to_num(xobjdict), fz_to_gen(xobjdict));
 			continue;
 		}
 
@@ -464,14 +464,14 @@ gathershadings(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
 		shade = fz_dict_get_val(dict, i);
 		if (!fz_is_dict(shade))
 		{
-			fz_warn("not a shading dict (%d %d R)", fz_to_num(shade), fz_to_gen(shade));
+			fz_warn(ctx, "not a shading dict (%d %d R)", fz_to_num(shade), fz_to_gen(shade));
 			continue;
 		}
 
 		type = fz_dict_gets(shade, "ShadingType");
 		if (!fz_is_int(type) || fz_to_int(type) < 1 || fz_to_int(type) > 7)
 		{
-			fz_warn("not a shading type (%d %d R)", fz_to_num(shade), fz_to_gen(shade));
+			fz_warn(ctx, "not a shading type (%d %d R)", fz_to_num(shade), fz_to_gen(shade));
 			type = NULL;
 		}
 
@@ -511,14 +511,14 @@ gatherpatterns(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
 		patterndict = fz_dict_get_val(dict, i);
 		if (!fz_is_dict(patterndict))
 		{
-			fz_warn("not a pattern dict (%d %d R)", fz_to_num(patterndict), fz_to_gen(patterndict));
+			fz_warn(ctx, "not a pattern dict (%d %d R)", fz_to_num(patterndict), fz_to_gen(patterndict));
 			continue;
 		}
 
 		type = fz_dict_gets(patterndict, "PatternType");
 		if (!fz_is_int(type) || fz_to_int(type) < 1 || fz_to_int(type) > 2)
 		{
-			fz_warn("not a pattern type (%d %d R)", fz_to_num(patterndict), fz_to_gen(patterndict));
+			fz_warn(ctx, "not a pattern type (%d %d R)", fz_to_num(patterndict), fz_to_gen(patterndict));
 			type = NULL;
 		}
 
@@ -527,14 +527,14 @@ gatherpatterns(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
 			paint = fz_dict_gets(patterndict, "PaintType");
 			if (!fz_is_int(paint) || fz_to_int(paint) < 1 || fz_to_int(paint) > 2)
 			{
-				fz_warn("not a pattern paint type (%d %d R)", fz_to_num(patterndict), fz_to_gen(patterndict));
+				fz_warn(ctx, "not a pattern paint type (%d %d R)", fz_to_num(patterndict), fz_to_gen(patterndict));
 				paint = NULL;
 			}
 
 			tiling = fz_dict_gets(patterndict, "TilingType");
 			if (!fz_is_int(tiling) || fz_to_int(tiling) < 1 || fz_to_int(tiling) > 3)
 			{
-				fz_warn("not a pattern tiling type (%d %d R)", fz_to_num(patterndict), fz_to_gen(patterndict));
+				fz_warn(ctx, "not a pattern tiling type (%d %d R)", fz_to_num(patterndict), fz_to_gen(patterndict));
 				tiling = NULL;
 			}
 		}
diff --git a/apps/pdfshow.c b/apps/pdfshow.c
index fc391b58..fb4bebd1 100644
--- a/apps/pdfshow.c
+++ b/apps/pdfshow.c
@@ -239,7 +239,7 @@ int main(int argc, char **argv)
 	}
 
 	pdf_free_xref(xref);
-	fz_flush_warnings();
+	fz_flush_warnings(ctx);
 	fz_free_context(ctx);
 	return 0;
 }