From 55011e05880ab4d030ff0d00ac3b30697be4a794 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sat, 30 Nov 2013 23:05:45 +0100
Subject: [PATCH] Don't create pages for files that are not images

The zip in bug #328182 has one
---
 generators/comicbook/document.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/generators/comicbook/document.cpp b/generators/comicbook/document.cpp
index 3ba7483f9..93b948eaa 100644
--- a/generators/comicbook/document.cpp
+++ b/generators/comicbook/document.cpp
@@ -185,11 +185,17 @@ void Document::pages( QVector<Okular::Page*> * pagesVector )
             {
                 QSize pageSize = reader.size();
                 if ( !pageSize.isValid() ) {
-                    pageSize = reader.read().size();
+                    const QImage i = reader.read();
+                    if ( !i.isNull() )
+                        pageSize = i.size();
+                }
+                if ( pageSize.isValid() ) {
+                    pagesVector->replace( count, new Okular::Page( count, pageSize.width(), pageSize.height(), Okular::Rotation0 ) );
+                    mPageMap.append(file);
+                    count++;
+                } else {
+                    kDebug() << "Ignoring" << file << "doesn't seem to be an image even if QImageReader::canRead returned true";
                 }
-                pagesVector->replace( count, new Okular::Page( count, pageSize.width(), pageSize.height(), Okular::Rotation0 ) );
-                mPageMap.append(file);
-                count++;
             }
         }
     }