kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Handle jpeg errors with exceptions

Browse source
This commit is contained in:
Ilya Fedin 2023-01-09 14:29:24 +04:00 • committed by John Preston
parent 3c261d254e
commit 6cd13e1057
1 changed files with 106 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ui/image/image_prepare.cpp
View file

@ -23,21 +23,6 @@
#include <QtSvg/QSvgRenderer> #include <QtSvg/QSvgRenderer>
#include <jpeglib.h> #include <jpeglib.h>
#include <setjmp.h>
struct my_error_mgr : public jpeg_error_mgr {
jmp_buf setjmp_buffer;
};
extern "C" {
static void my_error_exit(j_common_ptr cinfo) {
(*cinfo->err->output_message)(cinfo);
my_error_mgr* myerr = (my_error_mgr*)cinfo->err;
longjmp(myerr->setjmp_buffer, 1);
}
} // extern "C"
namespace Images { namespace Images {
namespace { namespace {
@ -1268,14 +1253,15 @@ QImage Prepare(QImage image, int w, int h, const PrepareArgs &args) {
} }
bool IsProgressiveJpeg(const QByteArray &bytes) { bool IsProgressiveJpeg(const QByteArray &bytes) {
try {
struct jpeg_decompress_struct info; struct jpeg_decompress_struct info;
struct my_error_mgr jerr; struct jpeg_error_mgr jerr;
info.err = jpeg_std_error(&jerr); info.err = jpeg_std_error(&jerr);
jerr.error_exit = my_error_exit; jerr.error_exit = [](j_common_ptr cinfo) {
if (setjmp(jerr.setjmp_buffer)) { (*cinfo->err->output_message)(cinfo);
return false; throw new std::exception;
} };
jpeg_create_decompress(&info); jpeg_create_decompress(&info);
const auto guard = gsl::finally([&] { const auto guard = gsl::finally([&] {
@ -1291,19 +1277,23 @@ bool IsProgressiveJpeg(const QByteArray &bytes) {
} }
return (info.progressive_mode > 0); return (info.progressive_mode > 0);
} catch (...) {
return false;
}
} }
QByteArray MakeProgressiveJpeg(const QByteArray &bytes) { QByteArray MakeProgressiveJpeg(const QByteArray &bytes) {
try {
struct jpeg_decompress_struct srcinfo; struct jpeg_decompress_struct srcinfo;
struct jpeg_compress_struct dstinfo; struct jpeg_compress_struct dstinfo;
struct my_error_mgr jerr; struct jpeg_error_mgr jerr;
srcinfo.err = jpeg_std_error(&jerr); srcinfo.err = jpeg_std_error(&jerr);
dstinfo.err = jpeg_std_error(&jerr); dstinfo.err = jpeg_std_error(&jerr);
jerr.error_exit = my_error_exit; jerr.error_exit = [](j_common_ptr cinfo) {
if (setjmp(jerr.setjmp_buffer)) { (*cinfo->err->output_message)(cinfo);
return {}; throw new std::exception;
} };
jpeg_create_decompress(&srcinfo); jpeg_create_decompress(&srcinfo);
const auto srcguard = gsl::finally([&] { const auto srcguard = gsl::finally([&] {
@ -1375,6 +1365,9 @@ QByteArray MakeProgressiveJpeg(const QByteArray &bytes) {
return QByteArray::fromRawData( return QByteArray::fromRawData(
reinterpret_cast<char*>(outbuffer), reinterpret_cast<char*>(outbuffer),
outsize); outsize);
} catch (...) {
return {};
}
} }
} // namespace Images } // namespace Images