diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 12:26:51 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 12:26:51 (GMT) |
| commit | 612a7680e10eb434cd6e09a2165ab1b75efdb72a (patch) | |
| tree | c0deb1de9b52f466a1d4128094652d8b5e983038 /src/gui/painting/qgrayraster.c | |
| parent | 94cae67da50d68f70d728a7fb231de89d47263db (diff) | |
| parent | f6d9c3f0dd014c409c43150b3a10866f47ea54a6 (diff) | |
| download | Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.zip Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.tar.gz Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.tar.bz2 | |
Merge commit 'origin/4.7' into mimir
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 d0e25a9..ec9ebeb 100644 --- a/src/gui/painting/qgrayraster.c +++ b/src/gui/painting/qgrayraster.c @@ -325,6 +325,7 @@ { void* buffer; long buffer_size; + long buffer_allocated_size; int band_size; void* memory; PWorker worker; @@ -1791,7 +1792,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 */ @@ -1930,6 +1931,7 @@ rast->buffer_size = 0; rast->worker = NULL; } + rast->buffer_allocated_size = pool_size; } } |