Fix uninitialized variable warnings.

2 files changed, 20 insertions, 28 deletions

diff --git a/mupdf/pdf_font.c b/mupdf/pdf_font.c
index 424ebf4d..108ed2d6 100644
--- a/mupdf/pdf_font.c
+++ b/mupdf/pdf_font.c
@@ -901,6 +901,8 @@ pdf_loadfont(pdf_fontdesc **fontdescp, pdf_xref *xref, fz_obj *dict, fz_obj *ref
 {
 	fz_error error;
 	char *subtype;
+	fz_obj *dfonts;
+	fz_obj *charprocs;
 
 	if ((*fontdescp = pdf_finditem(xref->store, PDF_KFONT, ref)))
 	{
@@ -909,6 +911,9 @@ pdf_loadfont(pdf_fontdesc **fontdescp, pdf_xref *xref, fz_obj *dict, fz_obj *ref
 	}
 
 	subtype = fz_toname(fz_dictgets(dict, "Subtype"));
+	dfonts = fz_dictgets(dict, "DescendantFonts");
+	charprocs = fz_dictgets(dict, "CharProcs");
+
 	if (subtype && !strcmp(subtype, "Type0"))
 		error = loadtype0(fontdescp, xref, dict, ref);
 	else if (subtype && !strcmp(subtype, "Type1"))
@@ -919,36 +924,23 @@ pdf_loadfont(pdf_fontdesc **fontdescp, pdf_xref *xref, fz_obj *dict, fz_obj *ref
 		error = loadsimplefont(fontdescp, xref, dict, ref);
 	else if (subtype && !strcmp(subtype, "Type3"))
 		error = pdf_loadtype3font(fontdescp, xref, dict, ref);
+	else if (charprocs)
+	{
+		fz_warn("unknown font format, guessing type3.");
+		error = pdf_loadtype3font(fontdescp, xref, dict, ref);
+	}
+	else if (dfonts)
+	{
+		fz_warn("unknown font format, guessing type0.");
+		error = loadtype0(fontdescp, xref, dict, ref);
+	}
 	else
-        {
-		fz_obj *dfonts;
-		fz_obj *charprocs;
-
-		dfonts = fz_dictgets(dict, "DescendantFonts");
-		charprocs = fz_dictgets(dict, "CharProcs");
-
-		if (charprocs)
-		{
-			fz_warn("cannot recognize font format '%s', guessing type3...", subtype);
-			error = pdf_loadtype3font(fontdescp, xref, dict, ref);
-		}
-		if (dfonts)
-		{
-			fz_warn("cannot recognize font format '%s', guessing type0...", subtype);
-			error = loadtype0(fontdescp, xref, dict, ref);
-		}
-		if (!charprocs && !dfonts)
-		{
-			fz_warn("cannot recognize font format '%s', guessing type1, mmtype1 or truetype...", subtype);
-			error = loadsimplefont(fontdescp, xref, dict, ref);
-		}
-
-		if (error)
-			return fz_throw("cannot recognize font format '%s', guessing is impossible", subtype);
+	{
+		fz_warn("unknown font format, guessing type1 or truetype.");
+		error = loadsimplefont(fontdescp, xref, dict, ref);
 	}
-
 	if (error)
-		return fz_rethrow(error, "cannot load font");
+	    return fz_rethrow(error, "cannot load font");
 
 	error = pdf_storeitem(xref->store, PDF_KFONT, ref, *fontdescp);
 	if (error)
diff --git a/mupdf/pdf_function.c b/mupdf/pdf_function.c
index 6926f572..547b5e04 100644
--- a/mupdf/pdf_function.c
+++ b/mupdf/pdf_function.c
@@ -1286,7 +1286,7 @@ loadstitchingfunc(pdf_function *func, pdf_xref *xref, fz_obj *dict)
 		if (!func->n)
 			func->n = funcs[0]->n;
 		else if (func->n != funcs[0]->n)
-			return fz_rethrow(error, "sub function /Domain or /Range mismatch");
+			return fz_throw("sub function /Domain or /Range mismatch");
 	}
 
 	obj = fz_dictgets(dict, "Bounds");