status-im/qzxing
2
0
Fork 0
mirror of https://github.com/status-im/qzxing.git synced 2025-02-27 10:00:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility BUG：

Browse Source 
qt less than 5.5 does not support QImage::Format_Grayscale8
This commit is contained in:
KangLin 2016-05-12 11:19:51 +08:00
parent f9604ec163
commit f519e7b391
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/CameraImageWrapper.cpp
View File

@ -9,7 +9,11 @@ CameraImageWrapper::CameraImageWrapper() : LuminanceSource(0,0), image(NULL)
CameraImageWrapper::CameraImageWrapper(const QImage &sourceImage) : LuminanceSource(sourceImage.width(), sourceImage.height())
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
image = grayScaleImage( &sourceImage );
#else
image = new QImage(sourceImage);
#endif
delegate = Ref<GreyscaleLuminanceSource>(
new GreyscaleLuminanceSource(getMatrixP(),image->width(), image->height(),0, 0, image->width(), image->height()));
}
@ -42,6 +46,7 @@ CameraImageWrapper *CameraImageWrapper::Factory(const QImage &sourceImage, int m
return new CameraImageWrapper(sourceImage);
}
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
QImage* CameraImageWrapper::grayScaleImage(const QImage *origin)
{
QImage *tmp = new QImage(origin->width(), origin->height(), QImage::Format_Grayscale8);
@ -58,7 +63,7 @@ QImage* CameraImageWrapper::grayScaleImage(const QImage *origin)
return tmp;
}
#endif
QImage CameraImageWrapper::getOriginalImage()
{
return *image;
@ -128,8 +133,14 @@ ArrayRef<char> CameraImageWrapper::getRowP(int y, ArrayRef<char> row) const
row.reset(ArrayRef<char>(width));
for (int x = 0; x < width; x++)
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
row[x] = image->pixel(x,y);
#else
QRgb pixel = image->pixel(x,y);
row[x] = qGray(pixel);
#endif
}
return row;
}

3
src/CameraImageWrapper.h
View File

@ -32,8 +32,9 @@ public:
private:
ArrayRef<char> getRowP(int y, ArrayRef<char> row) const;
ArrayRef<char> getMatrixP() const;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
QImage* grayScaleImage(const QImage *origin);
#endif
unsigned int gray(unsigned int r, unsigned int g, unsigned int b);
QImage* image;