JPEG image handler: drop a use of "volatile"

The reading code protects a local variable with volatile. In this case
the only possible reason to apply volatile seems to be protecting the
variable across the subsequent setjmp/longjmp. However, the variable is
never accessed after the longjmp (the function returns). So, drop the
volatile.

Change-Id: Ibecb11a9edcc6027b2fd52b555287ad53375a5d0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2019-10-10 16:07:55 +02:00
parent 7fbadeddc1
commit 58c4fa1061

View File

@ -248,13 +248,12 @@ static bool ensureValidImage(QImage *dest, struct jpeg_decompress_struct *info,
static bool read_jpeg_image(QImage *outImage,
QSize scaledSize, QRect scaledClipRect,
QRect clipRect, volatile int inQuality,
QRect clipRect, int quality,
Rgb888ToRgb32Converter converter,
j_decompress_ptr info, struct my_error_mgr* err )
{
if (!setjmp(err->setjmp_buffer)) {
// -1 means default quality.
int quality = inQuality;
if (quality < 0)
quality = 75;