From a3193f384597979ac9a52d635ea87212b2e885c4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 5 May 2016 19:32:21 +0530
Subject: [PATCH] ...

---
 src/calibre/utils/imageops/imageops.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/imageops/imageops.cpp b/src/calibre/utils/imageops/imageops.cpp
index 7808c5840d..95c13cc5d0 100644
--- a/src/calibre/utils/imageops/imageops.cpp
+++ b/src/calibre/utils/imageops/imageops.cpp
@@ -47,7 +47,7 @@ QImage* remove_borders(const QImage &image, double fuzz) {
 	unsigned int top_border = 0, bottom_border = 0, left_border = 0, right_border = 0;
 
 	if (img.format() != QImage::Format_RGB32 && img.format() != QImage::Format_ARGB32) {
-		img = img.convertToFormat(QImage::Format_RGB32);
+		img = img.convertToFormat(img.hasAlphaChannel() ? QImage::Format_ARGB32 : QImage::Format_RGB32);
 		if (img.isNull()) { PyErr_NoMemory(); return NULL; }
 	}
 	buf = new int[3*(MAX(width, height)+1)];