Issue 479

[zxing.git] / symbian / QQrDecoder / CameraImageWrapper.cpp

diff --git a/symbian/QQrDecoder/CameraImageWrapper.cpp b/symbian/QQrDecoder/CameraImageWrapper.cpp
index e8ac50f..f7026df 100644 (file)
--- a/symbian/QQrDecoder/CameraImageWrapper.cpp
+++ b/symbian/QQrDecoder/CameraImageWrapper.cpp
@@ -8,48 +8,64 @@ CameraImageWrapper::CameraImageWrapper() : LuminanceSource()
 }\r
 \r
 CameraImageWrapper::CameraImageWrapper(CameraImageWrapper& otherInstance) : LuminanceSource()\r
-{\r
+                    {\r
     image = otherInstance.getOriginalImage().copy();\r
-}\r
+                    }\r
 \r
 CameraImageWrapper::~CameraImageWrapper()\r
 {\r
 }\r
 \r
-int CameraImageWrapper::getWidth()\r
-{\r
-     return image.width();\r
-}\r
+int CameraImageWrapper::getWidth() const\r
+    {\r
+    return image.width();\r
+    }\r
 \r
-int CameraImageWrapper::getHeight()\r
-{\r
-     return image.height();\r
-}\r
+int CameraImageWrapper::getHeight() const\r
+    {\r
+    return image.height();\r
+    }\r
 \r
-unsigned char CameraImageWrapper::getPixel(int x, int y)\r
-{\r
+unsigned char CameraImageWrapper::getPixel(int x, int y) const\r
+    {\r
     QRgb pixel = image.pixel(x,y);\r
-    \r
+\r
     return qGray(pixel);//((qRed(pixel) + qGreen(pixel) + qBlue(pixel)) / 3);\r
-}\r
+    }\r
 \r
-void CameraImageWrapper::setImage(QString fileName, char* format)\r
+unsigned char* CameraImageWrapper::copyMatrix() const\r
+    {\r
+        unsigned char* newMatrix = (unsigned char*)malloc(image.width()*image.height()*sizeof(unsigned char));\r
+            \r
+        int cnt = 0;\r
+        for(int i=0; i<image.width(); i++)\r
+        {\r
+            for(int j=0; j<image.height(); j++)\r
+            {\r
+                newMatrix[cnt++] = getPixel(i,j);\r
+            }\r
+        }\r
+        \r
+        return newMatrix;\r
+    }\r
+\r
+void CameraImageWrapper::setImage(QString fileName)\r
 {\r
     image.load(fileName);\r
 \r
     if(image.width() > QApplication::desktop()->width())\r
-       image = image.scaled(QApplication::desktop()->width(), image.height(), Qt::IgnoreAspectRatio);\r
-    \r
+        image = image.scaled(QApplication::desktop()->width(), image.height(), Qt::IgnoreAspectRatio);\r
+\r
     if(image.height() > QApplication::desktop()->height())\r
-       image = image.scaled(image.width(), QApplication::desktop()->height(), Qt::IgnoreAspectRatio);\r
+        image = image.scaled(image.width(), QApplication::desktop()->height(), Qt::IgnoreAspectRatio);\r
 }\r
 \r
 void CameraImageWrapper::setImage(QImage newImage)\r
 {\r
     image = newImage.copy();\r
-    \r
+\r
     if(image.width() > 640)\r
-            image = image.scaled(640, image.height(), Qt::KeepAspectRatio);\r
+        image = image.scaled(640, image.height(), Qt::KeepAspectRatio);\r
 }\r
 \r
 QImage CameraImageWrapper::grayScaleImage(QImage::Format f)\r
@@ -63,15 +79,15 @@ QImage CameraImageWrapper::grayScaleImage(QImage::Format f)
             tmp.setPixel(i,j, qRgb(pix ,pix,pix));\r
         }   \r
     }\r
-    \r
+\r
     return tmp;\r
-       \r
-       //return image.convertToFormat(f);\r
+\r
+    //return image.convertToFormat(f);\r
 }\r
 \r
 QImage CameraImageWrapper::getOriginalImage()\r
 {\r
-       return image;\r
+    return image;\r
 }\r
 \r
 \r