From e165e24378312ab5e713cde62c5709a90a25d579 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 6 May 2016 09:20:21 +0530
Subject: [PATCH] Be consistent in use of exceptions

---
 src/calibre/utils/imageops/imageops.cpp | 8 +++++---
 src/calibre/utils/imageops/imageops.sip | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/calibre/utils/imageops/imageops.cpp b/src/calibre/utils/imageops/imageops.cpp
index 8a935e23ac..8136566ac5 100644
--- a/src/calibre/utils/imageops/imageops.cpp
+++ b/src/calibre/utils/imageops/imageops.cpp
@@ -50,7 +50,7 @@ unsigned int read_border_row(const QImage &img, const unsigned int width, const
 #define ENSURE32(img) \
 	if (img.format() != QImage::Format_RGB32 && img.format() != QImage::Format_ARGB32) { \
 		img = img.convertToFormat(img.hasAlphaChannel() ? QImage::Format_ARGB32 : QImage::Format_RGB32); \
-		if (img.isNull()) { PyErr_NoMemory(); return img; } \
+		if (img.isNull()) throw std::bad_alloc(); \
 	} \
 
 QImage remove_borders(const QImage &image, double fuzz) {
@@ -59,6 +59,7 @@ QImage remove_borders(const QImage &image, double fuzz) {
 	QTransform transpose;
 	unsigned int width = img.width(), height = img.height();
 	unsigned int top_border = 0, bottom_border = 0, left_border = 0, right_border = 0;
+    bool bad_alloc = false;
 
     ENSURE32(img)
 	buf = new int[3*(MAX(width, height)+1)];
@@ -71,7 +72,7 @@ QImage remove_borders(const QImage &image, double fuzz) {
         if (bottom_border < height - 1) {
             transpose.rotate(90);
             timg = img.transformed(transpose);
-            if (timg.isNull()) PyErr_NoMemory(); 
+            if (timg.isNull()) bad_alloc = true; 
             else {
                 left_border = read_border_row(timg, height, width, buf, fuzz, true);
                 if (left_border < width - 1) {
@@ -80,7 +81,7 @@ QImage remove_borders(const QImage &image, double fuzz) {
                         if (left_border || right_border || top_border || bottom_border) {
                             // printf("111111 l=%d t=%d r=%d b=%d\n", left_border, top_border, right_border, bottom_border);
                             img = img.copy(left_border, top_border, width - left_border - right_border, height - top_border - bottom_border);
-                            if (img.isNull()) PyErr_NoMemory();
+                            if (img.isNull()) bad_alloc = true;
                         }
                     }
                 }
@@ -90,6 +91,7 @@ QImage remove_borders(const QImage &image, double fuzz) {
     Py_END_ALLOW_THREADS;
 
 	delete[] buf;
+    if (bad_alloc) throw std::bad_alloc();
     return img;
 }
 // }}}
diff --git a/src/calibre/utils/imageops/imageops.sip b/src/calibre/utils/imageops/imageops.sip
index f11c9f7d01..424300814e 100644
--- a/src/calibre/utils/imageops/imageops.sip
+++ b/src/calibre/utils/imageops/imageops.sip
@@ -11,9 +11,7 @@
             QImage ans; \
             try {
 #define IMAGEOPS_SUFFIX \
-			if (PyErr_Occurred()) return NULL; \
-            sipRes = new (std::nothrow) QImage(ans); \
-            if (sipRes == NULL) return PyErr_NoMemory(); \
+            sipRes = new QImage(ans); \
         } catch (std::out_of_range &exc) { PyErr_SetString(PyExc_ValueError, exc.what()); return NULL; \
         } catch (std::bad_alloc &) { PyErr_NoMemory(); return NULL; \
         } catch (std::exception &exc) { PyErr_SetString(PyExc_RuntimeError, exc.what()); return NULL; \