diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-11 13:05:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-08 08:17:13 +0000 |
| commit | 4f88475a962975ca45994cff9add350344fce4f9 (patch) | |
| tree | 12884176f4fd5d5a28c7dbb220a0656d3c60daf7 /src/gui/image/qimage.h | |
| parent | 80c152d6898c1b8727ac14d32437b274153a7089 (diff) | |
Allow QImage with more than 2GByte of image data
Changes internal data-size and pointer calculations
to qssize_t.
Adds new sizeInBytes() accessor to read byte size, and
marks the old one deprecated.
Task-number: QTBUG-50912
Change-Id: Idf0c2010542b0ec1c9abef8afd02d6db07f43e6d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/image/qimage.h')
| -rw-r--r-- | src/gui/image/qimage.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 225ef3d2e8..7ad44cc33e 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -214,7 +214,10 @@ public: const uchar *bits() const; const uchar *constBits() const; - int byteCount() const; +#if QT_DEPRECATED_SINCE(5, 10) + QT_DEPRECATED int byteCount() const; +#endif + qssize_t sizeInBytes() const; uchar *scanLine(int); const uchar *scanLine(int) const; |