zbar: Consistent fourcc across architectures

diff --git a/src/qrcode_scanner/QrCodeUtils.cpp b/src/qrcode_scanner/QrCodeUtils.cpp
index 9fc3e9babb5c3172bc7ff1fd514852339aed6577..1efe489af25fb4c936fff8cacf20a35beabf9158 100644 (file)
--- a/src/qrcode_scanner/QrCodeUtils.cpp
+++ b/src/qrcode_scanner/QrCodeUtils.cpp
@@ -40,7 +40,7 @@ QString QrCodeUtils::scanImage(const QImage &img) {
         return "";
     }
 
-    zbar::Image scanImg = zImg.convert(*(long*)"Y800");
+    zbar::Image scanImg = zImg.convert(zbar_fourcc('Y', '8', '0', '0'));
     scanner.scan(scanImg);
 
     QString result;

diff --git a/src/qrcode_scanner/QrScanThread.cpp b/src/qrcode_scanner/QrScanThread.cpp
index c39d67ee0124dce7268b14f4c5c0a87189797654..3b3db0a45133482443d41386d5d5517534b80103 100644 (file)
--- a/src/qrcode_scanner/QrScanThread.cpp
+++ b/src/qrcode_scanner/QrScanThread.cpp
@@ -26,7 +26,7 @@ void QrScanThread::image_callback(zbar::Image &image)
 void QrScanThread::processZImage(zbar::Image &image)
 {
     m_scanner.recycle_image(image);
-    zbar::Image tmp = image.convert(*(long*)"Y800");
+    zbar::Image tmp = image.convert(zbar_fourcc('Y', '8', '0', '0'));
     m_scanner.scan(tmp);
     image.set_symbols(tmp.get_symbols());
 }