From e317c87028877b5fbc6073511b4053b24e8ff1e0 Mon Sep 17 00:00:00 2001
From: favoritas37 <ftylitak@gmail.com>
Date: Sun, 26 Apr 2015 14:11:54 +0300
Subject: [PATCH] minor fixes to the call of the decoding function.

---
 source/QZXing.h   |  2 +-
 source/qzxing.cpp | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/source/QZXing.h b/source/QZXing.h
index 573de7d..57bfc7e 100644
--- a/source/QZXing.h
+++ b/source/QZXing.h
@@ -78,7 +78,7 @@ public slots:
       * The smoothTransformation flag determines whether the transformation will be smooth or fast.
       * Smooth transformation provides better results but fast transformation is...faster.
       */
-    QString decodeImage(QImage image, int maxWidth=-1, int maxHeight=-1, bool smoothTransformation = false);
+    QString decodeImage(QImage &image, int maxWidth=-1, int maxHeight=-1, bool smoothTransformation = false);
 
     /**
       * The decoding function. Will try to decode the given image based on the enabled decoders.
diff --git a/source/qzxing.cpp b/source/qzxing.cpp
index de79dc8..404e1df 100644
--- a/source/qzxing.cpp
+++ b/source/qzxing.cpp
@@ -95,7 +95,7 @@ void QZXing::setDecoder(const uint &hint)
     emit enabledFormatsChanged();
 }
 
-QString QZXing::decodeImage(QImage image, int maxWidth, int maxHeight, bool smoothTransformation)
+QString QZXing::decodeImage(QImage &image, int maxWidth, int maxHeight, bool smoothTransformation)
 {
     QTime t;
     t.start();
@@ -104,14 +104,15 @@ QString QZXing::decodeImage(QImage image, int maxWidth, int maxHeight, bool smoo
 
     if(image.isNull())
     {
+        qDebug() << "Image Null";
         emit decodingFinished(false);
         processingTime = -1;
         return "";
     }
 
-    try{
-        CameraImageWrapper* ciw;
+    CameraImageWrapper* ciw;
 
+    try{
         if(maxWidth > 0 || maxHeight > 0)
             ciw = CameraImageWrapper::Factory(image, maxWidth, maxHeight, smoothTransformation);
         else
@@ -129,13 +130,18 @@ QString QZXing::decodeImage(QImage image, int maxWidth, int maxHeight, bool smoo
 
         QString string = QString(res->getText()->getText().c_str());
         processingTime = t.elapsed();
+        qDebug() << "Deconding succeeded: " << string;
+        delete ciw;
         emit tagFound(string);
         emit decodingFinished(true);
         return string;
     }
-    catch(zxing::Exception& e)
+    catch(zxing::Exception& /*e*/)
     {
+        qDebug() << "Deconding failed";
         emit decodingFinished(false);
+        if (ciw)
+            delete ciw;
         processingTime = -1;
         return "";
     }
@@ -146,7 +152,8 @@ QString QZXing::decodeImageFromFile(QString imageFilePath, int maxWidth, int max
     //used to have a check if this image exists
     //but was removed because if the image file path doesn't point to a valid image
     // then the QImage::isNull will return true and the decoding will fail eitherway.
-    return decodeImage(QImage(imageFilePath), maxWidth, maxHeight, smoothTransformation);
+    QImage tmpImage = QImage(imageFilePath);
+    return decodeImage(tmpImage, maxWidth, maxHeight, smoothTransformation);
 }
 
 QString QZXing::decodeImageQML(QObject *item)