commit af8b72d3a97baa0c86583b03321e8a8d3f4bc2aa
author FinnWilliamsArm <Finn.Williams@arm.com> Wed May 22 14:50:55 2019 +0100
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Mon May 27 16:27:36 2019 +0000
tree 3b4d86842399842b852e593c3bcf131d86d3ae20
parent 43aec5886449c1b024b740fd6f4500e827bde221

IVGCVSW-3129 Image pre-processing fix for TFLite

 * Resized images for quantized models are now statically cast to uint8
   instead of quantized

 * Removed optional quantization parameters from ImagePreprocessor
   constructor

 * Changed mean and scale for TFLite models

Signed-off-by: FinnWilliamsArm <Finn.Williams@arm.com>
Change-Id: Id5ffdf77f3614d10c417e769bd8ffc4a4c07308b

tests/ImagePreprocessor.cpp

diff --git a/tests/ImagePreprocessor.cpp b/tests/ImagePreprocessor.cpp
index 0ef0fda..74bc943 100644
--- a/tests/ImagePreprocessor.cpp
+++ b/tests/ImagePreprocessor.cpp
@@ -31,7 +31,7 @@
 
     result = image.Resize(m_Width, m_Height, CHECK_LOCATION(),
                           InferenceTestImage::ResizingMethods::BilinearAndNormalized,
-                          m_Mean, m_Stddev);
+                          m_Mean, m_Stddev, m_Scale);
 
     // duplicate data across the batch
     for (unsigned int i = 1; i < m_BatchSize; i++)
@@ -72,9 +72,8 @@
 
     for (size_t i=0; i<resizedSize; ++i)
     {
-        quantized[i] = armnn::Quantize<uint8_t>(resized[i],
-                                                m_Scale,
-                                                m_Offset);
+        quantized[i] = static_cast<uint8_t>(resized[i]);
     }
+
     return std::make_unique<TTestCaseData>(label, std::move(quantized));
 }