From 655372f10f987e1c7ece3e5060512d846db7f98e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 23 Feb 2017 22:42:03 +0530
Subject: [PATCH] E-book viewer: Use heuristics to try to detect comics encoded
 as fixed layout EPUBs to ensure they are displayed as intended. Fixes
 #1667357 [Private bug](https://bugs.launchpad.net/calibre/+bug/1667357)

---
 resources/compiled_coffeescript.zip         | Bin 101577 -> 101797 bytes
 src/calibre/ebooks/oeb/display/paged.coffee |  10 ++++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index 1934079e84f89f91a700f254c6f799c965df69db..fefc756553fddc5447b6615e4aa434f9a3480fb2 100644
GIT binary patch
delta 456
zcmX>(lWpm2whiz0@`-N^_xcr|;Zc&uz)+Gm{j4^l<aC8jMvl$0``V;<G7^j9%Q92T
z3-XIfHZQz!j&bt!mv8Gc(-buF^KvTVGjr256{@)u-~d^@f~`VIesXDUYF>$6MrvY;
zf|?qtfL>u~YEflyYEEi$Nq&)rdTwe-Vsu_&ZmO*k%uc0Pbxms|^FcOeXdyWY)p`Ym
z;>^7CoYeT@<f7EnJO$h70*;K*lRvEDn5=(=eRIjJWd6-ZUa8MR_w~;X#z^LgI*gMU
z_lZo`?_%VbUf9W~#d67skzsmZH>33QT|h3gxew#?3U5Z)=`3B00vygAj123Us+FeS
zX$K0mbTK-E!%auYN<qoc!q7a`(%jM@(K6B8G&Rw{C?z$`z|z9h$TZ2+(#*&($=o0%
zHN|53!)`|L$<f_>)30_hT2KGb&FD8>pqtSL#NwDNzlLl2>>ftl>5sY@#ip<CW^@Ee
PvQJM2sQ|jtl(7~7G9jAj

delta 253
zcmZ2Fo9*OGwhiz03QhE#;d$mIzr>7O1_lt8W|+>{$tXJgPbVYCX4!phQkys4IK#Nv
z;!Xzt<l0+rH!patK93Jo)AXyIjFC)RwWk|&F}kySb7W+gF4)T`J$+giqZUiFH;}8}
z!zeTTK^LO{M|wLW!+NG_rRjwojKb6Ndl^lqJ9RUPP0mf^nl9SS=sY>Pn{WEYZbs|r
zRy~Y9(`9-YgQwr_VRW1x(9Os(`TkVy>Hk5JK%R(3im9PdqGhV3WnyAds(F%`MY54)
pQktn*qIs%`rJ=E<k-3GLaiWRobjNN+@yYUQxTeqOVbo=;1pty4S%Lrn

diff --git a/src/calibre/ebooks/oeb/display/paged.coffee b/src/calibre/ebooks/oeb/display/paged.coffee
index 07d4ae33e8..e53b94236d 100644
--- a/src/calibre/ebooks/oeb/display/paged.coffee
+++ b/src/calibre/ebooks/oeb/display/paged.coffee
@@ -142,6 +142,14 @@ class PagedDisplay
             # Check if the current document is a full screen layout like
             # cover, if so we treat it specially.
             single_screen = (document.body.scrollHeight < window.innerHeight + 75)
+            has_svg = document.getElementsByTagName('svg').length > 0
+            only_img = document.getElementsByTagName('img').length == 1 and document.getElementsByTagName('div').length < 3 and document.getElementsByTagName('p').length < 2
+            if only_img
+                has_viewport = document.head and document.head.querySelector('meta[name="viewport"]')
+                if has_viewport
+                    # Has a viewport and only an img, is probably a comic, see for
+                    # example: https://bugs.launchpad.net/bugs/1667357
+                    single_screen = true
             this.handle_rtl_body(body_style)
             first_layout = true
             if not single_screen and this.cols_per_screen > 1
@@ -248,8 +256,6 @@ class PagedDisplay
             # width 100% are wider than body and lead to a blank page after the
             # current page (when cols_per_screen == 1). Similarly img elements
             # with height=100% overflow the first column
-            has_svg = document.getElementsByTagName('svg').length > 0
-            only_img = document.getElementsByTagName('img').length == 1 and document.getElementsByTagName('div').length < 3 and document.getElementsByTagName('p').length < 2
             # We only set full_screen_layout if scrollWidth is in (body_width,
             # 2*body_width) as if it is <= body_width scrolling will work
             # anyway and if it is >= 2*body_width it can't be a full screen