Fix ImageSource unloading.

This commit is contained in:
John Preston 2018-10-30 09:44:48 +04:00
parent f28a92be1d
commit 264ab285a7
2 changed files with 11 additions and 3 deletions

View File

@ -18,7 +18,9 @@ namespace Images {
ImageSource::ImageSource(QImage &&data, const QByteArray &format) ImageSource::ImageSource(QImage &&data, const QByteArray &format)
: _data(std::move(data)) : _data(std::move(data))
, _format(format) { , _format(format)
, _width(_data.width())
, _height(_data.height()) {
} }
void ImageSource::load( void ImageSource::load(
@ -108,11 +110,11 @@ void ImageSource::setImageBytes(const QByteArray &bytes) {
} }
int ImageSource::width() { int ImageSource::width() {
return _data.width(); return _width;
} }
int ImageSource::height() { int ImageSource::height() {
return _data.height(); return _height;
} }
int ImageSource::bytesSize() { int ImageSource::bytesSize() {
@ -120,6 +122,10 @@ int ImageSource::bytesSize() {
} }
void ImageSource::setInformation(int size, int width, int height) { void ImageSource::setInformation(int size, int width, int height) {
if (width && height) {
_width = width;
_height = height;
}
} }
QByteArray ImageSource::bytesForCache() { QByteArray ImageSource::bytesForCache() {

View File

@ -57,6 +57,8 @@ private:
QImage _data; QImage _data;
QByteArray _format; QByteArray _format;
QByteArray _bytes; QByteArray _bytes;
int _width = 0;
int _height = 0;
}; };