[gs-cvs] /home/tor/repos/fitz - Handle missing width or height for images.

sebras at hotmail.com sebras at hotmail.com
Sun May 3 12:05:58 PDT 2009


Sat May  2 00:47:42 UTC 2009  sebras at hotmail.com
  * Handle missing width or height for images.

    M ./mupdf/pdf_image.c -10 +18

--- old-fitz-21/mupdf/pdf_image.c	2009-05-03 19:05:58.000000000 +0000
+++ new-fitz-34/mupdf/pdf_image.c	2009-05-03 19:05:58.000000000 +0000
@@ -240,19 +240,27 @@
 	 * Dimensions, BPC and ColorSpace
 	 */
 
+	w = 0;
 	obj = fz_dictgets(dict, "Width");
-	error = pdf_resolve(&obj, xref);
-	if (error)
-		return fz_rethrow(error, "cannot parse image dictionary");
-	w = fz_toint(obj);
-	fz_dropobj(obj);
+	if (obj)
+	{
+		error = pdf_resolve(&obj, xref);
+		if (error)
+			return fz_rethrow(error, "cannot parse image dictionary");
+		w = fz_toint(obj);
+		fz_dropobj(obj);
+	}
 
+	h = 0;
 	obj = fz_dictgets(dict, "Height");
-	error = pdf_resolve(&obj, xref);
-	if (error)
-		return fz_rethrow(error, "cannot parse image dictionary");
-	h = fz_toint(obj);
-	fz_dropobj(obj);
+	if (obj)
+	{
+		error = pdf_resolve(&obj, xref);
+		if (error)
+			return fz_rethrow(error, "cannot parse image dictionary");
+		h = fz_toint(obj);
+		fz_dropobj(obj);
+	}
 
 	bpc = 1; /* TODO: should check that ImageMask is true before using default */
 	obj = fz_dictgets(dict, "BitsPerComponent");



More information about the gs-cvs mailing list