Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Be consistent in use of exceptions

Browse Source
This commit is contained in:
Kovid Goyal 2016-05-06 09:20:21 +05:30
parent cea4a8eebf
commit e165e24378
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/utils/imageops/imageops.cpp
View File

@ -50,7 +50,7 @@ unsigned int read_border_row(const QImage &img, const unsigned int width, const
#define ENSURE32(img) \ #define ENSURE32(img) \
if (img.format() != QImage::Format_RGB32 && img.format() != QImage::Format_ARGB32) { \ if (img.format() != QImage::Format_RGB32 && img.format() != QImage::Format_ARGB32) { \
img = img.convertToFormat(img.hasAlphaChannel() ? QImage::Format_ARGB32 : QImage::Format_RGB32); \ 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) { QImage remove_borders(const QImage &image, double fuzz) {
@ -59,6 +59,7 @@ QImage remove_borders(const QImage &image, double fuzz) {
QTransform transpose; QTransform transpose;
unsigned int width = img.width(), height = img.height(); unsigned int width = img.width(), height = img.height();
unsigned int top_border = 0, bottom_border = 0, left_border = 0, right_border = 0; unsigned int top_border = 0, bottom_border = 0, left_border = 0, right_border = 0;
bool bad_alloc = false;
ENSURE32(img) ENSURE32(img)
buf = new int[3*(MAX(width, height)+1)]; 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) { if (bottom_border < height - 1) {
transpose.rotate(90); transpose.rotate(90);
timg = img.transformed(transpose); timg = img.transformed(transpose);
if (timg.isNull()) PyErr_NoMemory(); if (timg.isNull()) bad_alloc = true;
else { else {
left_border = read_border_row(timg, height, width, buf, fuzz, true); left_border = read_border_row(timg, height, width, buf, fuzz, true);
if (left_border < width - 1) { 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) { 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); // 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); 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; Py_END_ALLOW_THREADS;
delete[] buf; delete[] buf;
if (bad_alloc) throw std::bad_alloc();
return img; return img;
} }
// }}} // }}}

4
src/calibre/utils/imageops/imageops.sip
View File

@ -11,9 +11,7 @@
QImage ans; \ QImage ans; \
try { try {
#define IMAGEOPS_SUFFIX \ #define IMAGEOPS_SUFFIX \
if (PyErr_Occurred()) return NULL; \ sipRes = new QImage(ans); \
sipRes = new (std::nothrow) QImage(ans); \
if (sipRes == NULL) return PyErr_NoMemory(); \
} catch (std::out_of_range &exc) { PyErr_SetString(PyExc_ValueError, exc.what()); return NULL; \ } catch (std::out_of_range &exc) { PyErr_SetString(PyExc_ValueError, exc.what()); return NULL; \
} catch (std::bad_alloc &) { PyErr_NoMemory(); return NULL; \ } catch (std::bad_alloc &) { PyErr_NoMemory(); return NULL; \
} catch (std::exception &exc) { PyErr_SetString(PyExc_RuntimeError, exc.what()); return NULL; \ } catch (std::exception &exc) { PyErr_SetString(PyExc_RuntimeError, exc.what()); return NULL; \