From 077e86da629ec72a3d8d780e5b61c5f9068f66c6 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Tue, 1 Aug 2017 18:16:26 +0300 Subject: [PATCH] [fbreader] Fixed a problem with displaying certain images Some images (those with empty style stack) were erroneously recognized as hidden. --- fbreader/fbreader/fbreader/src/formats/xhtml/XHTMLReader.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fbreader/fbreader/fbreader/src/formats/xhtml/XHTMLReader.cpp b/fbreader/fbreader/fbreader/src/formats/xhtml/XHTMLReader.cpp index e9144f0..7006ee5 100644 --- a/fbreader/fbreader/fbreader/src/formats/xhtml/XHTMLReader.cpp +++ b/fbreader/fbreader/fbreader/src/formats/xhtml/XHTMLReader.cpp @@ -283,7 +283,8 @@ XHTMLTagImageAction::XHTMLTagImageAction(const std::string &attributeName) { void XHTMLTagImageAction::doAtStart(XHTMLReader &reader, const char **xmlattributes) { // Ignore transparent and hidden images - if (!reader.myParseStack.back().opacity || reader.myStyleStack.back().DisplayNone) { + if (!reader.myParseStack.back().opacity || + (!reader.myStyleStack.empty() && reader.myStyleStack.back().DisplayNone)) { return; }