Commit c9b467da authored by Albert Astals Cid's avatar Albert Astals Cid

* poppler/Gfx.cc: Accept reals for width and height of images. Fixes

        KDE bug 143322
parent ff8f8d44
2007-03-22 Albert Astals Cid <aacid@kde.org>
* poppler/Gfx.cc: Accept reals for width and height of images. Fixes
KDE bug 143322
2007-03-15 Albert Astals Cid <aacid@kde.org>
* glib/Makefile.am: Make it build with BSD/Make. Patch by
......
......@@ -2955,18 +2955,24 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
obj1.free();
dict->lookup("W", &obj1);
}
if (!obj1.isInt())
if (obj1.isInt())
width = obj1.getInt();
else if (obj1.isReal())
width = (int)obj1.getReal();
else
goto err2;
width = obj1.getInt();
obj1.free();
dict->lookup("Height", &obj1);
if (obj1.isNull()) {
obj1.free();
dict->lookup("H", &obj1);
}
if (!obj1.isInt())
if (obj1.isInt())
height = obj1.getInt();
else if (obj1.isReal())
height = (int)obj1.getReal();
else
goto err2;
height = obj1.getInt();
obj1.free();
// image or mask?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment