diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 19:12:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 19:12:58 (GMT) |
| commit | d3838fdda64a09fe6fc5c9054f460ce43fdc6f95 (patch) | |
| tree | 70662556aa8fb1ba06673cb8c2aff71fb9a0b4c2 /src/gui/painting/qgrayraster.c | |
| parent | 8b533a7564c634e6e7228c5e02832d55513777b5 (diff) | |
| parent | 6368ca1c36488d1297c768a5fae52f65bb5b91be (diff) | |
| download | Qt-d3838fdda64a09fe6fc5c9054f460ce43fdc6f95.zip Qt-d3838fdda64a09fe6fc5c9054f460ce43fdc6f95.tar.gz Qt-d3838fdda64a09fe6fc5c9054f460ce43fdc6f95.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed potential crash when loading corrupt GIFs.
Work around an ATI driver problem with mutli-sampled pbuffers.
tst_qstatemachine.cpp: fix compilation with Sun Studio
Fixed regression in clipping.qps autotest on 64-bit.
Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.
Fixed performance regression in curve stroking.
Don't disable texture_from_pixmap on GLX/X11 by default.
Avoid creating copy of an image in memory when storing as png
Doc update for the support of MSVC 2010 64-bit
fix documentation of drawText(int, int, int, int, ...
Optimization of pixel conversion when storing jpeg
Don't pretend to support single buffered EGL surfaces.
Named anonymous struct in the OpenGL paint engine.
Fixes gray_raster incorrectly reporting out of memory error.
Diffstat (limited to 'src/gui/painting/qgrayraster.c')
| -rw-r--r-- | src/gui/painting/qgrayraster.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.c index 94039fb..19cef49 100644 --- a/src/gui/painting/qgrayraster.c +++ b/src/gui/painting/qgrayraster.c @@ -324,6 +324,7 @@ { void* buffer; long buffer_size; + long buffer_allocated_size; int band_size; void* memory; PWorker worker; @@ -1767,7 +1768,7 @@ // If raster object and raster buffer are allocated, but // raster size isn't of the minimum size, indicate out of // memory. - if (raster && raster->buffer && raster->buffer_size < MINIMUM_POOL_SIZE ) + if (raster->buffer_allocated_size < MINIMUM_POOL_SIZE ) return ErrRaster_OutOfMemory; /* return immediately if the outline is empty */ @@ -1906,6 +1907,7 @@ rast->buffer_size = 0; rast->worker = NULL; } + rast->buffer_allocated_size = pool_size; } } |