Formatting automated-tests
[platform/core/uifw/dali-adaptor.git] / automated-tests / src / dali-adaptor-internal / utc-Dali-ImageOperations.cpp
index 01ec549..bc48efe 100644 (file)
@@ -16,8 +16,8 @@
  */
 
 #include <dali-test-suite-utils.h>
-#include <dali/internal/imaging/common/image-operations.h>
 #include <dali/devel-api/common/ref-counted-dali-vector.h>
+#include <dali/internal/imaging/common/image-operations.h>
 
 #include <sys/mman.h>
 #include <unistd.h>
@@ -26,11 +26,10 @@ using namespace Dali::Internal::Platform;
 
 namespace
 {
-
 /**
  * @brief Generate a random integer between zero and the parameter passed in.
  **/
-uint32_t RandomInRange( uint32_t max )
+uint32_t RandomInRange(uint32_t max)
 {
   const uint32_t randToMax = lrand48() % (max + 1);
   return randToMax;
@@ -41,7 +40,7 @@ uint32_t RandomInRange( uint32_t max )
  */
 inline uint32_t RandomComponent8()
 {
-  return RandomInRange( 255u );
+  return RandomInRange(255u);
 }
 
 /**
@@ -49,7 +48,7 @@ inline uint32_t RandomComponent8()
  */
 inline uint32_t RandomComponent5()
 {
-  return RandomInRange( 31u );
+  return RandomInRange(31u);
 }
 
 /**
@@ -57,13 +56,13 @@ inline uint32_t RandomComponent5()
  */
 inline uint32_t RandomComponent6()
 {
-  return RandomInRange( 63u );
+  return RandomInRange(63u);
 }
 
 /**
  * @brief RGBA8888 Pixels from separate color components.
  */
-inline uint32_t PixelRGBA8888( uint32_t r, uint32_t g, uint32_t b, uint32_t a )
+inline uint32_t PixelRGBA8888(uint32_t r, uint32_t g, uint32_t b, uint32_t a)
 {
   return (r << 24) + (g << 16) + (b << 8) + a;
 }
@@ -71,7 +70,7 @@ inline uint32_t PixelRGBA8888( uint32_t r, uint32_t g, uint32_t b, uint32_t a )
 /**
  * @brief RGB565 Pixels from color components in the low bits of passed-in words.
  */
-inline uint16_t PixelRGB565( uint32_t r, uint32_t g, uint32_t b )
+inline uint16_t PixelRGB565(uint32_t r, uint32_t g, uint32_t b)
 {
   return (r << 11) + (g << 5) + b;
 }
@@ -79,9 +78,9 @@ inline uint16_t PixelRGB565( uint32_t r, uint32_t g, uint32_t b )
 /**
  * @brief RGBA8888 Pixels with random color components.
  */
-inline uint32_t RandomPixelRGBA8888( )
+inline uint32_t RandomPixelRGBA8888()
 {
-  const uint32_t randomPixel = PixelRGBA8888( RandomComponent8(), RandomComponent8(), RandomComponent8(), RandomComponent8() );
+  const uint32_t randomPixel = PixelRGBA8888(RandomComponent8(), RandomComponent8(), RandomComponent8(), RandomComponent8());
   return randomPixel;
 }
 
@@ -91,11 +90,11 @@ inline uint32_t RandomPixelRGBA8888( )
  * Used to check a buffer of pixels is unmodified by an operation given inputs
  * that should mean that it is not changed.
  */
-inline uint32_t HashPixels( const uint32_t* const pixels, unsigned int numPixels )
+inline uint32_t HashPixels(const uint32_t* const pixels, unsigned int numPixels)
 {
   uint32_t hash = 5381;
 
-  for( unsigned int i = 0; i < numPixels; ++i )
+  for(unsigned int i = 0; i < numPixels; ++i)
   {
     hash = hash * 33 + pixels[i];
   }
@@ -106,14 +105,14 @@ inline uint32_t HashPixels( const uint32_t* const pixels, unsigned int numPixels
 /**
  * @brief Build some dummy scanlines to exercise scanline averaging code on.
  */
-void SetupScanlineForHalvingTestsRGBA8888( size_t scanlineLength, Dali::Vector<uint32_t>& scanline, Dali::Vector<uint32_t>& reference )
+void SetupScanlineForHalvingTestsRGBA8888(size_t scanlineLength, Dali::Vector<uint32_t>& scanline, Dali::Vector<uint32_t>& reference)
 {
-  scanline.Resize( scanlineLength );
-  reference.Reserve( scanlineLength / 2 + 32 );
+  scanline.Resize(scanlineLength);
+  reference.Reserve(scanlineLength / 2 + 32);
 
   // Prepare some random pixels:
-  srand( 19 * 23 * 47 * 53 );
-  for( size_t i = 0; i < scanlineLength / 2; ++i )
+  srand(19 * 23 * 47 * 53);
+  for(size_t i = 0; i < scanlineLength / 2; ++i)
   {
     // Generate random colors:
     const uint32_t red1   = RandomComponent8();
@@ -126,14 +125,14 @@ void SetupScanlineForHalvingTestsRGBA8888( size_t scanlineLength, Dali::Vector<u
     const uint32_t alpha2 = RandomComponent8();
 
     // The average of these pixels should equal the reference:
-    scanline[i * 2]     = PixelRGBA8888( red1, green1, blue1, alpha1 );
-    scanline[i * 2 + 1] = PixelRGBA8888( red2, green2, blue2, alpha2 );
+    scanline[i * 2]     = PixelRGBA8888(red1, green1, blue1, alpha1);
+    scanline[i * 2 + 1] = PixelRGBA8888(red2, green2, blue2, alpha2);
 
     // Average the two pixels manually as a reference:
-    reference.PushBack( PixelRGBA8888( (red1 + red2) >> 1u, (green1 + green2) >> 1u, (blue1 + blue2) >> 1u, (alpha1 + alpha2) >> 1u ) );
+    reference.PushBack(PixelRGBA8888((red1 + red2) >> 1u, (green1 + green2) >> 1u, (blue1 + blue2) >> 1u, (alpha1 + alpha2) >> 1u));
   }
 
-  for( size_t i = scanlineLength / 2; i < reference.Capacity(); ++i )
+  for(size_t i = scanlineLength / 2; i < reference.Capacity(); ++i)
   {
     reference[i] = 0xEEEEEEEE;
   }
@@ -142,14 +141,14 @@ void SetupScanlineForHalvingTestsRGBA8888( size_t scanlineLength, Dali::Vector<u
 /**
  * @brief Build some dummy scanlines to exercise scanline averaging code on.
  */
-void SetupScanlineForHalvingTestsRGB565( size_t scanlineLength, Dali::Vector<uint16_t>& scanline, Dali::Vector<uint16_t>& reference )
+void SetupScanlineForHalvingTestsRGB565(size_t scanlineLength, Dali::Vector<uint16_t>& scanline, Dali::Vector<uint16_t>& reference)
 {
-  scanline.Resize( scanlineLength );
-  reference.Reserve( scanlineLength / 2 + 32 );
+  scanline.Resize(scanlineLength);
+  reference.Reserve(scanlineLength / 2 + 32);
 
   // Prepare some random pixels:
-  srand48( 19 * 23 * 47 * 53 );
-  for( size_t i = 0; i < scanlineLength / 2; ++i )
+  srand48(19 * 23 * 47 * 53);
+  for(size_t i = 0; i < scanlineLength / 2; ++i)
   {
     // Generate random colors:
     const uint32_t red1   = RandomComponent5();
@@ -160,14 +159,14 @@ void SetupScanlineForHalvingTestsRGB565( size_t scanlineLength, Dali::Vector<uin
     const uint32_t blue2  = RandomComponent5();
 
     // The average of these pixels should equal the reference:
-    scanline[i * 2]     = PixelRGB565( red1, green1, blue1 );
-    scanline[i * 2 + 1] = PixelRGB565( red2, green2, blue2 );
+    scanline[i * 2]     = PixelRGB565(red1, green1, blue1);
+    scanline[i * 2 + 1] = PixelRGB565(red2, green2, blue2);
 
     // Average the two pixels manually as a reference:
-    reference.PushBack( PixelRGB565( (red1 + red2) >> 1u, (green1 + green2) >> 1u, (blue1 + blue2) >> 1u ) );
+    reference.PushBack(PixelRGB565((red1 + red2) >> 1u, (green1 + green2) >> 1u, (blue1 + blue2) >> 1u));
   }
 
-  for( size_t i = scanlineLength / 2; i < reference.Capacity(); ++i )
+  for(size_t i = scanlineLength / 2; i < reference.Capacity(); ++i)
   {
     reference[i] = 0xEEEE;
   }
@@ -176,20 +175,20 @@ void SetupScanlineForHalvingTestsRGB565( size_t scanlineLength, Dali::Vector<uin
 /**
  * @brief Build some dummy scanlines to exercise scanline averaging code on.
  */
-void SetupScanlineForHalvingTests2Bytes( size_t scanlineLength, Dali::Vector<uint8_t>& scanline, Dali::Vector<uint8_t>& reference )
+void SetupScanlineForHalvingTests2Bytes(size_t scanlineLength, Dali::Vector<uint8_t>& scanline, Dali::Vector<uint8_t>& reference)
 {
-  scanline.Resize( scanlineLength * 2 );
-  reference.Reserve( scanlineLength + 32 );
+  scanline.Resize(scanlineLength * 2);
+  reference.Reserve(scanlineLength + 32);
 
   // Prepare some random pixels:
-  srand48( 19 * 23 * 47 * 53 * 59 );
-  for( size_t i = 0; i < scanlineLength / 2; ++i )
+  srand48(19 * 23 * 47 * 53 * 59);
+  for(size_t i = 0; i < scanlineLength / 2; ++i)
   {
     // Generate random colors:
-    const uint32_t c11   = RandomComponent8();
-    const uint32_t c12   = RandomComponent8();
-    const uint32_t c21   = RandomComponent8();
-    const uint32_t c22   = RandomComponent8();
+    const uint32_t c11 = RandomComponent8();
+    const uint32_t c12 = RandomComponent8();
+    const uint32_t c21 = RandomComponent8();
+    const uint32_t c22 = RandomComponent8();
 
     // The average of these pixels should equal the reference:
     scanline[i * 4]     = c11;
@@ -198,11 +197,11 @@ void SetupScanlineForHalvingTests2Bytes( size_t scanlineLength, Dali::Vector<uin
     scanline[i * 4 + 3] = c22;
 
     // Average the two pixels manually as a reference:
-    reference.PushBack( (c11 + c21) >> 1u );
-    reference.PushBack( (c12 + c22) >> 1u );
+    reference.PushBack((c11 + c21) >> 1u);
+    reference.PushBack((c12 + c22) >> 1u);
   }
 
-  for( size_t i = scanlineLength; i < reference.Capacity(); ++i )
+  for(size_t i = scanlineLength; i < reference.Capacity(); ++i)
   {
     reference[i] = 0xEE;
   }
@@ -211,14 +210,14 @@ void SetupScanlineForHalvingTests2Bytes( size_t scanlineLength, Dali::Vector<uin
 /**
  * @brief Build some dummy 1 byte per pixel scanlines to exercise scanline averaging code on.
  */
-void SetupScanlineForHalvingTests1Byte( size_t scanlineLength, Dali::Vector<uint8_t>& scanline, Dali::Vector<uint8_t>& reference )
+void SetupScanlineForHalvingTests1Byte(size_t scanlineLength, Dali::Vector<uint8_t>& scanline, Dali::Vector<uint8_t>& reference)
 {
-  scanline.Resize( scanlineLength * 2 );
-  reference.Reserve( scanlineLength + 32 );
+  scanline.Resize(scanlineLength * 2);
+  reference.Reserve(scanlineLength + 32);
 
   // Prepare some random pixels:
-  srand48( 19 * 23 * 47 * 53 * 63 );
-  for( size_t i = 0; i < scanlineLength / 2; ++i )
+  srand48(19 * 23 * 47 * 53 * 63);
+  for(size_t i = 0; i < scanlineLength / 2; ++i)
   {
     // Generate random colors:
     const uint32_t c1 = RandomComponent8();
@@ -229,11 +228,10 @@ void SetupScanlineForHalvingTests1Byte( size_t scanlineLength, Dali::Vector<uint
     scanline[i * 2 + 1] = c2;
 
     // Average the two pixels manually as a reference:
-    reference.PushBack( (c1 + c2) >> 1u );
-
+    reference.PushBack((c1 + c2) >> 1u);
   }
 
-  for( size_t i = scanlineLength; i < reference.Capacity(); ++i )
+  for(size_t i = scanlineLength; i < reference.Capacity(); ++i)
   {
     reference[i] = 0xEE;
   }
@@ -244,22 +242,22 @@ void SetupScanlineForHalvingTests1Byte( size_t scanlineLength, Dali::Vector<uint
  *
  * All tested formats bar RGB565 can share this setup.
  */
-void SetupScanlinesRGBA8888( size_t scanlineLength, Dali::Vector<uint32_t>& scanline1, Dali::Vector<uint32_t>& scanline2, Dali::Vector<uint32_t>& reference, Dali::Vector<uint32_t>& output )
+void SetupScanlinesRGBA8888(size_t scanlineLength, Dali::Vector<uint32_t>& scanline1, Dali::Vector<uint32_t>& scanline2, Dali::Vector<uint32_t>& reference, Dali::Vector<uint32_t>& output)
 {
-  scanline1.Reserve( scanlineLength );
-  scanline2.Reserve( scanlineLength );
-  reference.Reserve( scanlineLength + 32 );
-  output.Reserve( scanlineLength + 32 );
+  scanline1.Reserve(scanlineLength);
+  scanline2.Reserve(scanlineLength);
+  reference.Reserve(scanlineLength + 32);
+  output.Reserve(scanlineLength + 32);
 
-  for( size_t i = scanlineLength; i < output.Capacity(); ++i )
+  for(size_t i = scanlineLength; i < output.Capacity(); ++i)
   {
     output[i]    = 0xDEADBEEF;
     reference[i] = 0xDEADBEEF;
   }
 
   // Prepare some random pixels:
-  srand48( 19 * 23 * 47 );
-  for( size_t i = 0; i < scanlineLength; ++i )
+  srand48(19 * 23 * 47);
+  for(size_t i = 0; i < scanlineLength; ++i)
   {
     // Generate random colors:
     const uint32_t red1   = RandomComponent8();
@@ -272,45 +270,45 @@ void SetupScanlinesRGBA8888( size_t scanlineLength, Dali::Vector<uint32_t>& scan
     const uint32_t alpha2 = RandomComponent8();
 
     // The average of these pixels should equal the reference:
-    scanline1.PushBack( PixelRGBA8888( red1, green1, blue1, alpha1 ) );
-    scanline2.PushBack( PixelRGBA8888( red2, green2, blue2, alpha2 ) );
+    scanline1.PushBack(PixelRGBA8888(red1, green1, blue1, alpha1));
+    scanline2.PushBack(PixelRGBA8888(red2, green2, blue2, alpha2));
 
     // Average the two pixels manually as a reference:
-    reference.PushBack( PixelRGBA8888( (red1 + red2) >> 1u, (green1 + green2) >> 1u, (blue1 + blue2) >> 1u, (alpha1 + alpha2) >> 1u ) );
+    reference.PushBack(PixelRGBA8888((red1 + red2) >> 1u, (green1 + green2) >> 1u, (blue1 + blue2) >> 1u, (alpha1 + alpha2) >> 1u));
   }
 }
 
 /**
  * @brief Compares a scanline of interest to a reference, testing each pixel is the same.
  */
-void MatchScanlinesRGBA8888( Dali::Vector<uint32_t>& reference, Dali::Vector<uint32_t>& output, size_t& numMatches, const char * const location )
+void MatchScanlinesRGBA8888(Dali::Vector<uint32_t>& reference, Dali::Vector<uint32_t>& output, size_t& numMatches, const char* const location)
 {
   numMatches = 0;
-  for( size_t i = 0, length = reference.Capacity(); i < length; ++i )
+  for(size_t i = 0, length = reference.Capacity(); i < length; ++i)
   {
-    DALI_TEST_EQUALS( output[i], reference[i], location );
+    DALI_TEST_EQUALS(output[i], reference[i], location);
     numMatches += output[i] == reference[i];
   }
 }
 
-} //< namespace unnamed
+} // namespace
 
 /**
  * @brief Test component averaging code.
  */
 int UtcDaliImageOperationsAverageComponent(void)
 {
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AverageComponent( 0u, 0u ), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AverageComponent( 1u, 1u ), 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AverageComponent( 0xffffffffu >> 1u, 0xffffffffu >> 1u ), 0xffffffffu >> 1u, TEST_LOCATION );
-  const unsigned int avg3 = Dali::Internal::Platform::AverageComponent( 0xfffffffeu, 1u );
-  DALI_TEST_EQUALS( avg3, 0x7fffffffu, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AverageComponent( 255u, 255u ), 255u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AverageComponent( 512u, 0u ), 256u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AverageComponent( 511u, 0u ), 255u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AverageComponent( 510u, 0u ), 255u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AverageComponent( 509u, 0u ), 254u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AverageComponent( 0u, 509u ), 254u, TEST_LOCATION );
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AverageComponent(0u, 0u), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AverageComponent(1u, 1u), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AverageComponent(0xffffffffu >> 1u, 0xffffffffu >> 1u), 0xffffffffu >> 1u, TEST_LOCATION);
+  const unsigned int avg3 = Dali::Internal::Platform::AverageComponent(0xfffffffeu, 1u);
+  DALI_TEST_EQUALS(avg3, 0x7fffffffu, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AverageComponent(255u, 255u), 255u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AverageComponent(512u, 0u), 256u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AverageComponent(511u, 0u), 255u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AverageComponent(510u, 0u), 255u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AverageComponent(509u, 0u), 254u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AverageComponent(0u, 509u), 254u, TEST_LOCATION);
   END_TEST;
 }
 
@@ -319,11 +317,11 @@ int UtcDaliImageOperationsAverageComponent(void)
  */
 int UtcDaliImageOperationsAveragePixelRGBA8888(void)
 {
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGBA8888( 0u, 0u ), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGBA8888( 0x01010101, 0x01010101 ), 0x01010101u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGBA8888( 0x01010101, 0x03030303 ), 0x02020202u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGBA8888( 0xffffffff, 0xffffffff ), 0xffffffffu, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGBA8888( 0xffffffff, 0u ), 0x7f7f7f7fu, TEST_LOCATION );
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGBA8888(0u, 0u), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGBA8888(0x01010101, 0x01010101), 0x01010101u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGBA8888(0x01010101, 0x03030303), 0x02020202u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGBA8888(0xffffffff, 0xffffffff), 0xffffffffu, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGBA8888(0xffffffff, 0u), 0x7f7f7f7fu, TEST_LOCATION);
   END_TEST;
 }
 
@@ -332,15 +330,15 @@ int UtcDaliImageOperationsAveragePixelRGBA8888(void)
  */
 int UtcDaliImageOperationsAveragePixelRGB565(void)
 {
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGB565( 0u, 0u ), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGB565( 0xf800u, 0xf800u ), 0xf800u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGB565( 0xf800u, 0x800u ), 1u << 15, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGB565( 0x7e0u, 0x7e0u ), 0x7e0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGB565( 0x7e0u, 0x20u ), 1u << 10, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGB565( 0x1f, 0x1f ), 0x1fu, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGB565( 0x1f, 0x1 ), 1u << 4, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGB565( 0xf800u, 0x7e0u ), 0x7800u + 0x3e0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( Dali::Internal::Platform::AveragePixelRGB565( 0xffff, 0xffff ), 0xffffu, TEST_LOCATION );
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGB565(0u, 0u), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGB565(0xf800u, 0xf800u), 0xf800u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGB565(0xf800u, 0x800u), 1u << 15, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGB565(0x7e0u, 0x7e0u), 0x7e0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGB565(0x7e0u, 0x20u), 1u << 10, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGB565(0x1f, 0x1f), 0x1fu, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGB565(0x1f, 0x1), 1u << 4, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGB565(0xf800u, 0x7e0u), 0x7800u + 0x3e0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(Dali::Internal::Platform::AveragePixelRGB565(0xffff, 0xffff), 0xffffu, TEST_LOCATION);
   END_TEST;
 }
 
@@ -348,23 +346,23 @@ int UtcDaliImageOperationsAveragePixelRGB565(void)
  * @brief Build a square bitmap, downscale it and assert the resulting bitmap has the right dimensions.
  */
 void TestDownscaledBitmapHasRightDimensionsAndFormat(
-    Pixel::Format format,
-    uint32_t sourceDimension,
-    uint32_t targetDimension,
-    uint32_t expectedDimension,
-    const char * const location )
+  Pixel::Format     format,
+  uint32_t          sourceDimension,
+  uint32_t          targetDimension,
+  uint32_t          expectedDimension,
+  const char* const location)
 {
-  ImageDimensions desired( targetDimension, targetDimension );
-  FittingMode::Type fittingMode( FittingMode::SHRINK_TO_FIT );
-  SamplingMode::Type samplingMode( SamplingMode::BOX );
+  ImageDimensions    desired(targetDimension, targetDimension);
+  FittingMode::Type  fittingMode(FittingMode::SHRINK_TO_FIT);
+  SamplingMode::Type samplingMode(SamplingMode::BOX);
 
-  Dali::Devel::PixelBuffer sourceBitmap = Dali::Devel::PixelBuffer::New( sourceDimension, sourceDimension, format );
+  Dali::Devel::PixelBuffer sourceBitmap = Dali::Devel::PixelBuffer::New(sourceDimension, sourceDimension, format);
 
-  Dali::Devel::PixelBuffer downScaled = DownscaleBitmap( sourceBitmap, desired, fittingMode, samplingMode );
+  Dali::Devel::PixelBuffer downScaled = DownscaleBitmap(sourceBitmap, desired, fittingMode, samplingMode);
 
-  DALI_TEST_EQUALS( downScaled.GetWidth(), expectedDimension, location );
-  DALI_TEST_EQUALS( downScaled.GetHeight(), expectedDimension, location );
-  DALI_TEST_EQUALS( downScaled.GetPixelFormat(), format, location );
+  DALI_TEST_EQUALS(downScaled.GetWidth(), expectedDimension, location);
+  DALI_TEST_EQUALS(downScaled.GetHeight(), expectedDimension, location);
+  DALI_TEST_EQUALS(downScaled.GetPixelFormat(), format, location);
 }
 
 /**
@@ -377,24 +375,24 @@ int UtcDaliImageOperationsDownscaleBitmap(void)
 {
   // Do Scalings that are expected to work for all pixels modes and assert the resulting bitmap dimensions:
 
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::RGBA8888, 1024, 8, 8, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::RGB888, 1024, 8, 8, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::RGB565, 1024, 8, 8, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::LA88, 1024, 8, 8, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::L8, 1024, 8, 8, TEST_LOCATION );
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::RGBA8888, 1024, 8, 8, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::RGB888, 1024, 8, 8, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::RGB565, 1024, 8, 8, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::LA88, 1024, 8, 8, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::L8, 1024, 8, 8, TEST_LOCATION);
 
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::RGBA8888, 773, 1, 1, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::RGB888, 787, 1, 1, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::RGB565, 797, 1, 1, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::LA88, 809, 1, 1, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::L8, 811, 1, 1, TEST_LOCATION );
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::RGBA8888, 773, 1, 1, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::RGB888, 787, 1, 1, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::RGB565, 797, 1, 1, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::LA88, 809, 1, 1, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::L8, 811, 1, 1, TEST_LOCATION);
 
   // Do Scalings that are expected to produce a slightly larger than requested image:
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::RGBA8888, 47, 7, 11, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::RGB888, 73, 17, 18, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::RGB565, 61, 8, 15, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::LA88, 19, 5, 9, TEST_LOCATION );
-  TestDownscaledBitmapHasRightDimensionsAndFormat( Pixel::L8, 353, 23, 44, TEST_LOCATION );
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::RGBA8888, 47, 7, 11, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::RGB888, 73, 17, 18, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::RGB565, 61, 8, 15, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::LA88, 19, 5, 9, TEST_LOCATION);
+  TestDownscaledBitmapHasRightDimensionsAndFormat(Pixel::L8, 353, 23, 44, TEST_LOCATION);
 
   END_TEST;
 }
@@ -409,97 +407,85 @@ int UtcDaliImageOperationsDownscaleInPlacePow2RGB888(void)
   // Do downscaling to 1 x 1 so we can easily assert the value of the single pixel produced:
 
   // Scale down a black/white checkerboard to mid-grey:
-  unsigned char check_4x4 [16 * 3] = {
-      0xff, 0xff, 0xff,  0x00, 0x00, 0x00,  0xff, 0xff, 0xff,  0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00,  0xff, 0xff, 0xff,  0x00, 0x00, 0x00,  0xff, 0xff, 0xff,
-      0xff, 0xff, 0xff,  0x00, 0x00, 0x00,  0xff, 0xff, 0xff,  0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00,  0xff, 0xff, 0xff,  0x00, 0x00, 0x00,  0xff, 0xff, 0xff
-  };
-
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(check_4x4, 4, 4, 1, 1, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_EQUALS( outWidth, 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( outHeight, 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( check_4x4[0], (unsigned char)0x7f, TEST_LOCATION );
+  unsigned char check_4x4[16 * 3] = {
+    0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff};
+
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(check_4x4, 4, 4, 1, 1, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_EQUALS(outWidth, 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(outHeight, 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(check_4x4[0], (unsigned char)0x7f, TEST_LOCATION);
 
   // Scale down a 16 pixel black image with a single white pixel to a 1/16th grey single pixel:
-  unsigned char single_4x4 [16 * 3] = {
-    0xff, 0xff, 0xff,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00
-  };
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(single_4x4, 4, 4, 1, 1, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_EQUALS( outWidth, 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( outHeight, 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( single_4x4[0], (unsigned char)0xf, TEST_LOCATION );
+  unsigned char single_4x4[16 * 3] = {
+    0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(single_4x4, 4, 4, 1, 1, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_EQUALS(outWidth, 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(outHeight, 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(single_4x4[0], (unsigned char)0xf, TEST_LOCATION);
 
   // Scale down a 16 pixel black image with a single white pixel to a 1/16th grey single pixel:
   // (white pixel at bottom-right of image)
-  unsigned char single_4x4_2 [16 * 3] = {
-      0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0x00, 0x00, 0x00,  0xff, 0xff, 0xff
-    };
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(single_4x4_2, 4, 4, 1, 1, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_EQUALS( outWidth, 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( outHeight, 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( single_4x4_2[0], (unsigned char)0xf, TEST_LOCATION );
+  unsigned char single_4x4_2[16 * 3] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff};
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(single_4x4_2, 4, 4, 1, 1, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_EQUALS(outWidth, 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(outHeight, 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(single_4x4_2[0], (unsigned char)0xf, TEST_LOCATION);
 
   // Build a larger ~600 x ~600 uniform magenta image for tests which only test output dimensions:
 
-  unsigned char magenta_600_x_600[608*608 * 3];
-  for( unsigned int i = 0; i < sizeof(magenta_600_x_600); i += 3 )
+  unsigned char magenta_600_x_600[608 * 608 * 3];
+  for(unsigned int i = 0; i < sizeof(magenta_600_x_600); i += 3)
   {
-    magenta_600_x_600[i] = 0xff;
+    magenta_600_x_600[i]     = 0xff;
     magenta_600_x_600[i + 1] = 0;
     magenta_600_x_600[i + 2] = 0xff;
   }
 
   // Scaling to 0 x 0 should stop at 1 x 1:
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888( magenta_600_x_600, 352, 352, 0, 0, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_EQUALS( outWidth, 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( outHeight, 1u, TEST_LOCATION );
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(magenta_600_x_600, 352, 352, 0, 0, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_EQUALS(outWidth, 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(outHeight, 1u, TEST_LOCATION);
 
   // Scaling to 1 x 1 should hit 1 x 1:
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888( magenta_600_x_600, 608, 608, 1, 1, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_EQUALS( outWidth, 1u, TEST_LOCATION );
-  DALI_TEST_EQUALS( outHeight, 1u, TEST_LOCATION );
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(magenta_600_x_600, 608, 608, 1, 1, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_EQUALS(outWidth, 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(outHeight, 1u, TEST_LOCATION);
 
   // Scaling to original dimensions should NOP:
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888( magenta_600_x_600, 384, 384, 384, 384, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_EQUALS( outWidth, 384u, TEST_LOCATION );
-  DALI_TEST_EQUALS( outHeight, 384u, TEST_LOCATION );
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(magenta_600_x_600, 384, 384, 384, 384, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_EQUALS(outWidth, 384u, TEST_LOCATION);
+  DALI_TEST_EQUALS(outHeight, 384u, TEST_LOCATION);
 
   // More dimension tests:
 
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888( magenta_600_x_600, 352, 352, 44, 11, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_EQUALS( outWidth, 44u, TEST_LOCATION );
-  DALI_TEST_EQUALS( outHeight, 44u, TEST_LOCATION );
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(magenta_600_x_600, 352, 352, 44, 11, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_EQUALS(outWidth, 44u, TEST_LOCATION);
+  DALI_TEST_EQUALS(outHeight, 44u, TEST_LOCATION);
 
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888( magenta_600_x_600, 384, 384, 3, 48, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_EQUALS( outWidth, 48u, TEST_LOCATION );
-  DALI_TEST_EQUALS( outHeight, 48u, TEST_LOCATION );
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(magenta_600_x_600, 384, 384, 3, 48, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_EQUALS(outWidth, 48u, TEST_LOCATION);
+  DALI_TEST_EQUALS(outHeight, 48u, TEST_LOCATION);
 
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888( magenta_600_x_600, 384, 384, 3, 3, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_CHECK( outWidth == 3u && outHeight == 3u );
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(magenta_600_x_600, 384, 384, 3, 3, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_CHECK(outWidth == 3u && outHeight == 3u);
 
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888( magenta_600_x_600, 320, 320, 5, 5, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_CHECK( outWidth == 5u && outHeight == 5u );
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(magenta_600_x_600, 320, 320, 5, 5, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_CHECK(outWidth == 5u && outHeight == 5u);
 
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888( magenta_600_x_600, 448, 448, 7, 7, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_CHECK( outWidth == 7u && outHeight == 7u );
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(magenta_600_x_600, 448, 448, 7, 7, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_CHECK(outWidth == 7u && outHeight == 7u);
 
-  Dali::Internal::Platform::DownscaleInPlacePow2RGB888( magenta_600_x_600, 352, 352, 11, 11, BoxDimensionTestBoth, outWidth, outHeight );
-  DALI_TEST_CHECK( outWidth == 11u && outHeight == 11u );
+  Dali::Internal::Platform::DownscaleInPlacePow2RGB888(magenta_600_x_600, 352, 352, 11, 11, BoxDimensionTestBoth, outWidth, outHeight);
+  DALI_TEST_CHECK(outWidth == 11u && outHeight == 11u);
 
   // Check that no pixel values were modified by the repeated averaging of identical pixels in tests above:
   unsigned int numNonMagenta = 0u;
-  for( unsigned i = 0; i < sizeof(magenta_600_x_600); i += 3 )
+  for(unsigned i = 0; i < sizeof(magenta_600_x_600); i += 3)
   {
     numNonMagenta += magenta_600_x_600[i] == 0xff && magenta_600_x_600[i + 1] == 0x00 && magenta_600_x_600[i + 2] == 0xff ? 0 : 1;
   }
-  DALI_TEST_EQUALS( numNonMagenta, 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS(numNonMagenta, 0u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -507,65 +493,81 @@ int UtcDaliImageOperationsDownscaleInPlacePow2RGB888(void)
 /**
  * @brief Test that resizing RGBA8888 images as raw pixel arrays produces a result of the correct dimensions.
  */
-void TestDownscaleOutputsExpectedDimensionsRGBA8888( uint32_t pixels[], unsigned inputWidth, unsigned inputHeight, unsigned int desiredWidth, unsigned int desiredHeight, unsigned int expectedWidth, unsigned int expectedHeight, const char * const location )
+void TestDownscaleOutputsExpectedDimensionsRGBA8888(uint32_t pixels[], unsigned inputWidth, unsigned inputHeight, unsigned int desiredWidth, unsigned int desiredHeight, unsigned int expectedWidth, unsigned int expectedHeight, const char* const location)
 {
   unsigned int resultingWidth = -1, resultingHeight = -1;
   Dali::Internal::Platform::DownscaleInPlacePow2RGBA8888(
-      reinterpret_cast<unsigned char *> (pixels),
-      inputWidth, inputHeight,
-      desiredWidth, desiredHeight, BoxDimensionTestBoth,
-      resultingWidth, resultingHeight );
-
-  DALI_TEST_EQUALS( resultingWidth, expectedWidth, location );
-  DALI_TEST_EQUALS( resultingHeight, expectedHeight, location );
+    reinterpret_cast<unsigned char*>(pixels),
+    inputWidth,
+    inputHeight,
+    desiredWidth,
+    desiredHeight,
+    BoxDimensionTestBoth,
+    resultingWidth,
+    resultingHeight);
+
+  DALI_TEST_EQUALS(resultingWidth, expectedWidth, location);
+  DALI_TEST_EQUALS(resultingHeight, expectedHeight, location);
 }
 
 /**
  * @brief Test that resizing RGB565 images as raw pixel arrays produces a result of the correct dimensions.
  */
-void TestDownscaleOutputsExpectedDimensionsRGB565( uint16_t pixels[], unsigned inputWidth, unsigned inputHeight, unsigned int desiredWidth, unsigned int desiredHeight, unsigned int expectedWidth, unsigned int expectedHeight, const char * const location )
+void TestDownscaleOutputsExpectedDimensionsRGB565(uint16_t pixels[], unsigned inputWidth, unsigned inputHeight, unsigned int desiredWidth, unsigned int desiredHeight, unsigned int expectedWidth, unsigned int expectedHeight, const char* const location)
 {
   unsigned int resultingWidth = -1, resultingHeight = -1;
   Dali::Internal::Platform::DownscaleInPlacePow2RGB565(
-      reinterpret_cast<unsigned char *> (pixels),
-      inputWidth, inputHeight,
-      desiredWidth, desiredHeight, BoxDimensionTestBoth,
-      resultingWidth, resultingHeight );
-
-  DALI_TEST_EQUALS( resultingWidth, expectedWidth, location );
-  DALI_TEST_EQUALS( resultingHeight, expectedHeight, location );
+    reinterpret_cast<unsigned char*>(pixels),
+    inputWidth,
+    inputHeight,
+    desiredWidth,
+    desiredHeight,
+    BoxDimensionTestBoth,
+    resultingWidth,
+    resultingHeight);
+
+  DALI_TEST_EQUALS(resultingWidth, expectedWidth, location);
+  DALI_TEST_EQUALS(resultingHeight, expectedHeight, location);
 }
 
 /**
  * @brief Test that resizing 2-byte-per-pixel images as raw pixel arrays produces a result of the correct dimensions.
  */
-void TestDownscaleOutputsExpectedDimensions2ComponentPair( uint8_t pixels[], unsigned inputWidth, unsigned inputHeight, unsigned int desiredWidth, unsigned int desiredHeight, unsigned int expectedWidth, unsigned int expectedHeight, const char * const location )
+void TestDownscaleOutputsExpectedDimensions2ComponentPair(uint8_t pixels[], unsigned inputWidth, unsigned inputHeight, unsigned int desiredWidth, unsigned int desiredHeight, unsigned int expectedWidth, unsigned int expectedHeight, const char* const location)
 {
   unsigned int resultingWidth = -1, resultingHeight = -1;
   Dali::Internal::Platform::DownscaleInPlacePow2ComponentPair(
-      pixels,
-      inputWidth, inputHeight,
-      desiredWidth, desiredHeight, BoxDimensionTestBoth,
-      resultingWidth, resultingHeight );
-
-  DALI_TEST_EQUALS( resultingWidth, expectedWidth, location );
-  DALI_TEST_EQUALS( resultingHeight, expectedHeight, location );
+    pixels,
+    inputWidth,
+    inputHeight,
+    desiredWidth,
+    desiredHeight,
+    BoxDimensionTestBoth,
+    resultingWidth,
+    resultingHeight);
+
+  DALI_TEST_EQUALS(resultingWidth, expectedWidth, location);
+  DALI_TEST_EQUALS(resultingHeight, expectedHeight, location);
 }
 
 /**
  * @brief Test that resizing single-byte-per-pixel images as raw pixel arrays produces a result of the correct dimensions.
  */
-void TestDownscaleOutputsExpectedDimensionsSingleComponent( uint8_t pixels[], unsigned inputWidth, unsigned inputHeight, unsigned int desiredWidth, unsigned int desiredHeight, unsigned int expectedWidth, unsigned int expectedHeight, const char * const location )
+void TestDownscaleOutputsExpectedDimensionsSingleComponent(uint8_t pixels[], unsigned inputWidth, unsigned inputHeight, unsigned int desiredWidth, unsigned int desiredHeight, unsigned int expectedWidth, unsigned int expectedHeight, const char* const location)
 {
   unsigned int resultingWidth = -1, resultingHeight = -1;
   Dali::Internal::Platform::DownscaleInPlacePow2SingleBytePerPixel(
-      pixels,
-      inputWidth, inputHeight,
-      desiredWidth, desiredHeight, BoxDimensionTestBoth,
-      resultingWidth, resultingHeight );
-
-  DALI_TEST_EQUALS( resultingWidth, expectedWidth, location );
-  DALI_TEST_EQUALS( resultingHeight, expectedHeight, location );
+    pixels,
+    inputWidth,
+    inputHeight,
+    desiredWidth,
+    desiredHeight,
+    BoxDimensionTestBoth,
+    resultingWidth,
+    resultingHeight);
+
+  DALI_TEST_EQUALS(resultingWidth, expectedWidth, location);
+  DALI_TEST_EQUALS(resultingHeight, expectedHeight, location);
 }
 
 /**
@@ -573,94 +575,92 @@ void TestDownscaleOutputsExpectedDimensionsSingleComponent( uint8_t pixels[], un
  */
 int UtcDaliImageOperationsDownscaleInPlacePow2RGBA8888(void)
 {
-  uint32_t image[608*608];
-  for( unsigned i = 0; i < sizeof(image) / sizeof(image[0]); ++i )
+  uint32_t image[608 * 608];
+  for(unsigned i = 0; i < sizeof(image) / sizeof(image[0]); ++i)
   {
     image[i] = 0xffffffff;
   }
-  unsigned char* const pixels = reinterpret_cast<unsigned char *> (image);
-  unsigned int resultingWidth = -1, resultingHeight = -1;
+  unsigned char* const pixels         = reinterpret_cast<unsigned char*>(image);
+  unsigned int         resultingWidth = -1, resultingHeight = -1;
 
   // Test downscaling where the input size is an exact multiple of the desired size:
   // (We expect a perfect result here)
 
-  DownscaleInPlacePow2RGBA8888( pixels, 600, 600, 75, 75, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 75u, TEST_LOCATION );
-  DALI_TEST_EQUALS( resultingHeight, 75u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 600, 600, 75, 75, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 75u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 75u, TEST_LOCATION);
 
-  DownscaleInPlacePow2RGBA8888( pixels, 512, 512, 16, 16, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 16u, TEST_LOCATION );
-  DALI_TEST_EQUALS( resultingHeight, 16u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 512, 512, 16, 16, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 16u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 16u, TEST_LOCATION);
 
-  DownscaleInPlacePow2RGBA8888( pixels, 512, 64, 16, 2, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 16u, TEST_LOCATION  );
-  DALI_TEST_EQUALS( resultingHeight, 2u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 512, 64, 16, 2, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 16u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 2u, TEST_LOCATION);
 
-  DownscaleInPlacePow2RGBA8888( pixels, 64, 1024, 4, 64, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 4u, TEST_LOCATION  );
-  DALI_TEST_EQUALS( resultingHeight, 64u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 64, 1024, 4, 64, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 4u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 64u, TEST_LOCATION);
 
   // Test downscaling where the input size is slightly off being an exact multiple of the desired size:
   // (We expect a perfect match at the end because of rounding-down to an even width and height at each step)
 
-  DownscaleInPlacePow2RGBA8888( pixels, 601, 603, 75, 75, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 75u, TEST_LOCATION  );
-  DALI_TEST_EQUALS( resultingHeight, 75u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 601, 603, 75, 75, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 75u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 75u, TEST_LOCATION);
 
-  DownscaleInPlacePow2RGBA8888( pixels, 736 + 1, 352 + 3, 23, 11, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 23u, TEST_LOCATION  );
-  DALI_TEST_EQUALS( resultingHeight, 11u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 736 + 1, 352 + 3, 23, 11, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 23u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 11u, TEST_LOCATION);
 
-  DownscaleInPlacePow2RGBA8888( pixels, 384 + 3, 896 + 1, 3, 7, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 3u, TEST_LOCATION  );
-  DALI_TEST_EQUALS( resultingHeight, 7u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 384 + 3, 896 + 1, 3, 7, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 3u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 7u, TEST_LOCATION);
 
   // Test downscales with source dimensions which are under a nice power of two by one:
 
   // The target is hit exactly due to losing spare columns or rows at each iteration:
-  DownscaleInPlacePow2RGBA8888( pixels, 63, 31, 7, 3, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 7u, TEST_LOCATION  );
-  DALI_TEST_EQUALS( resultingHeight, 3u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 63, 31, 7, 3, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 7u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 3u, TEST_LOCATION);
 
   // Asking to downscale a bit smaller should stop at the dimensions of the last test as one more halving would go down to 3 x 1, which is too small.
-  DownscaleInPlacePow2RGBA8888( pixels, 63, 31, 4, 2, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 7u, TEST_LOCATION  );
-  DALI_TEST_EQUALS( resultingHeight, 3u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 63, 31, 4, 2, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 7u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 3u, TEST_LOCATION);
 
   // Should stop at almost twice the requested dimensions:
-  DownscaleInPlacePow2RGBA8888( pixels, 15, 127, 4, 32, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 7u, TEST_LOCATION  );
-  DALI_TEST_EQUALS( resultingHeight, 63u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 15, 127, 4, 32, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 7u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 63u, TEST_LOCATION);
 
   // Test downscales to 1 in one or both dimensions:
   // Parameters:                                         input-x  input-y, desired-x, desired-y, expected-x, expected-y
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 512,     512,     1,         1,         1,          1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 512,     32,      16,        1,         16,         1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 512,     32,      7,         1,         16,         1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 512,     32,      7,         1,         16,         1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 512,     32,      5,         1,         16,         1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 512,     32,      3,         1,         16,         1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 32,      512,     1,         1,         1,          16,        TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 32,      512,     1,         16,        1,          16,        TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 32,      512,     1,         3,         1,          16,        TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 33,      33,      1,         1,         1,          1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 17*19,   17*19,   1,         1,         1,          1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 33,      33,      3,         1,         4,          4,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 33,      9,       3,         1,         4,          1,         TEST_LOCATION );
-
-
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 512, 512, 1, 1, 1, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 512, 32, 16, 1, 16, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 512, 32, 7, 1, 16, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 512, 32, 7, 1, 16, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 512, 32, 5, 1, 16, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 512, 32, 3, 1, 16, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 32, 512, 1, 1, 1, 16, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 32, 512, 1, 16, 1, 16, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 32, 512, 1, 3, 1, 16, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 33, 33, 1, 1, 1, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 17 * 19, 17 * 19, 1, 1, 1, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 33, 33, 3, 1, 4, 4, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 33, 9, 3, 1, 4, 1, TEST_LOCATION);
 
   // Test downscales to zero in one or both dimensions:
   // Scaling should stop when one or both dimensions reach 1.
   // Parameters:                                         input-x  input-y, desired-x, desired-y, expected-x, expected-y
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 512,     512,     0,         0,         1,          1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 512,     256,     0,         0,         2,          1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 512,     128,     0,         0,         4,          1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 512,     16,      0,         0,         32,         1,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 128,     512,     0,         0,         1,          4,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 32,      512,     0,         0,         1,          16,        TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 8,       512,     0,         0,         1,          64,        TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 2,       512,     0,         0,         1,          256,       TEST_LOCATION );
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 512, 512, 0, 0, 1, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 512, 256, 0, 0, 2, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 512, 128, 0, 0, 4, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 512, 16, 0, 0, 32, 1, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 128, 512, 0, 0, 1, 4, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 32, 512, 0, 0, 1, 16, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 8, 512, 0, 0, 1, 64, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 2, 512, 0, 0, 1, 256, TEST_LOCATION);
 
   END_TEST;
 }
@@ -670,40 +670,39 @@ int UtcDaliImageOperationsDownscaleInPlacePow2RGBA8888(void)
  */
 int UtcDaliImageOperationsDownscaleInPlacePow2RGBA8888Nops(void)
 {
-  uint32_t image[608*608];
+  uint32_t       image[608 * 608];
   const uint32_t numPixels = sizeof(image) / sizeof(image[0]);
-  for( unsigned i = 0; i < numPixels; ++i )
+  for(unsigned i = 0; i < numPixels; ++i)
   {
     image[i] = RandomPixelRGBA8888();
   }
-  const uint32_t imageHash = HashPixels( image, numPixels );
-  unsigned char* const pixels = reinterpret_cast<unsigned char *> (image);
-  unsigned int resultingWidth = -1, resultingHeight = -1;
+  const uint32_t       imageHash      = HashPixels(image, numPixels);
+  unsigned char* const pixels         = reinterpret_cast<unsigned char*>(image);
+  unsigned int         resultingWidth = -1, resultingHeight = -1;
 
   // Test downscales to the same size:
   // The point is just to be sure the downscale is a NOP in this case:
 
-  DownscaleInPlacePow2RGBA8888( pixels, 600, 600, 600, 600, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 600u, TEST_LOCATION );
-  DALI_TEST_EQUALS( resultingHeight, 600u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 600, 600, 600, 600, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 600u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 600u, TEST_LOCATION);
 
-  DownscaleInPlacePow2RGBA8888( pixels, 512, 128, 512, 128, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 512u, TEST_LOCATION );
-  DALI_TEST_EQUALS( resultingHeight, 128u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 512, 128, 512, 128, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 512u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 128u, TEST_LOCATION);
 
-  DownscaleInPlacePow2RGBA8888( pixels, 17, 1001, 17, 1001, BoxDimensionTestBoth, resultingWidth, resultingHeight );
-  DALI_TEST_EQUALS( resultingWidth, 17u, TEST_LOCATION );
-  DALI_TEST_EQUALS( resultingHeight, 1001u, TEST_LOCATION );
+  DownscaleInPlacePow2RGBA8888(pixels, 17, 1001, 17, 1001, BoxDimensionTestBoth, resultingWidth, resultingHeight);
+  DALI_TEST_EQUALS(resultingWidth, 17u, TEST_LOCATION);
+  DALI_TEST_EQUALS(resultingHeight, 1001u, TEST_LOCATION);
 
   // Test downscales that request a larger size (we never upscale so these are NOPs too):
   // Parameters:                                         input-x  input-y, desired-x, desired-y, expected-x, expected-y
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 300,     300,     600,       600,       300,        300,       TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 3,       127,     99,        599,       3,          127,       TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGBA8888( image, 600,     600,     999,       999,       600,        600,       TEST_LOCATION ); //< checks no out of bounds mem access in this case
-
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 300, 300, 600, 600, 300, 300, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 3, 127, 99, 599, 3, 127, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGBA8888(image, 600, 600, 999, 999, 600, 600, TEST_LOCATION); //< checks no out of bounds mem access in this case
 
   // Make sure that none of these NOP downscalings has affected the pixels of the image:
-  DALI_TEST_EQUALS( HashPixels( image, numPixels ), imageHash, TEST_LOCATION );
+  DALI_TEST_EQUALS(HashPixels(image, numPixels), imageHash, TEST_LOCATION);
 
   END_TEST;
 }
@@ -716,35 +715,34 @@ int UtcDaliImageOperationsDownscaleInPlacePow2RGB565(void)
 {
   // Test that calling with null and zero parameters doesn't blow up:
   unsigned int outWidth, outHeight;
-  DownscaleInPlacePow2RGB565( 0, 0, 0, 0, 0, BoxDimensionTestBoth, outWidth, outHeight );
+  DownscaleInPlacePow2RGB565(0, 0, 0, 0, 0, BoxDimensionTestBoth, outWidth, outHeight);
 
-  uint16_t image[608*608];
-  for( unsigned i = 0; i < sizeof(image) / sizeof(image[0]); ++i )
+  uint16_t image[608 * 608];
+  for(unsigned i = 0; i < sizeof(image) / sizeof(image[0]); ++i)
   {
     image[i] = 0xffff;
   }
 
   // Do a straightforward test using an exact divisor target size:
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 600, 600, 75, 75, 75, 75, TEST_LOCATION );
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 600, 600, 75, 75, 75, 75, TEST_LOCATION);
   // Test that a slightly smaller than possible to achieve target results in the
   // next-higher exact divisor output image dimensions:
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 600, 600, 71, 69, 75, 75, TEST_LOCATION );
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 600, 600, 71, 69, 75, 75, TEST_LOCATION);
   // Test that resizing from a starting size that is slightly larger than an exact
   // multiple of the desired dimensions still results in the desired ones being
   // reached:
   // Parameters:                                       input-x  input-y, desired-x, desired-y, expected-x, expected-y
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 600 + 1, 600 + 1, 75,        75,        75,         75,        TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 256 + 1, 512 + 1, 2,         4,         2,          4,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 512 + 1, 128 + 1, 16,        4,         16,         4,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 512 + 1, 64  + 1, 16,        2,         16,         2,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 512 + 3, 512 + 3, 16,        16,        16,         16,        TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 512 + 3, 256 + 3, 16,        8,         16,         8,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 256 + 3, 512 + 3, 4,         8,         4,          8,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 256 + 7, 512 + 7, 4,         8,         4,          8,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 256 + 7, 512 + 7, 2,         4,         2,          4,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 512 + 7, 128 + 7, 16,        4,         16,         4,         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsRGB565( image, 512 + 7, 64  + 7, 16,        2,         16,         2,         TEST_LOCATION );
-
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 600 + 1, 600 + 1, 75, 75, 75, 75, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 256 + 1, 512 + 1, 2, 4, 2, 4, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 512 + 1, 128 + 1, 16, 4, 16, 4, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 512 + 1, 64 + 1, 16, 2, 16, 2, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 512 + 3, 512 + 3, 16, 16, 16, 16, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 512 + 3, 256 + 3, 16, 8, 16, 8, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 256 + 3, 512 + 3, 4, 8, 4, 8, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 256 + 7, 512 + 7, 4, 8, 4, 8, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 256 + 7, 512 + 7, 2, 4, 2, 4, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 512 + 7, 128 + 7, 16, 4, 16, 4, TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsRGB565(image, 512 + 7, 64 + 7, 16, 2, 16, 2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -757,26 +755,32 @@ int UtcDaliImageOperationsDownscaleInPlacePow2ComponentPair(void)
 {
   // Simple test that a null pointer does not get dereferenced in the function:
   unsigned int outWidth, outHeight;
-  DownscaleInPlacePow2ComponentPair( 0, 0, 0, 0, 0, BoxDimensionTestBoth, outWidth, outHeight );
+  DownscaleInPlacePow2ComponentPair(0, 0, 0, 0, 0, BoxDimensionTestBoth, outWidth, outHeight);
 
   // Simple tests of dimensions output:
 
-  uint8_t image[608*608*2];
-  for( unsigned i = 0; i < sizeof(image) / sizeof(image[0]); ++i )
+  uint8_t image[608 * 608 * 2];
+  for(unsigned i = 0; i < sizeof(image) / sizeof(image[0]); ++i)
   {
     image[i] = 0xff;
   }
 
-  TestDownscaleOutputsExpectedDimensions2ComponentPair( image,
-                                                        600, 600, //< Input dimensions
-                                                        37, 37,   //< Requested dimensions
-                                                        37, 37,   //< Expected output dimensions
-                                                        TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensions2ComponentPair( image,
-                                                        600, 600, //< Input dimensions
-                                                        34, 35,   //< Requested dimensions to scale-down to
-                                                        37, 37,   //< Expected output dimensions achieved
-                                                        TEST_LOCATION );
+  TestDownscaleOutputsExpectedDimensions2ComponentPair(image,
+                                                       600,
+                                                       600, //< Input dimensions
+                                                       37,
+                                                       37, //< Requested dimensions
+                                                       37,
+                                                       37, //< Expected output dimensions
+                                                       TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensions2ComponentPair(image,
+                                                       600,
+                                                       600, //< Input dimensions
+                                                       34,
+                                                       35, //< Requested dimensions to scale-down to
+                                                       37,
+                                                       37, //< Expected output dimensions achieved
+                                                       TEST_LOCATION);
   ///@note: No need to be as comprehensive as with RGB888 and RGBA8888 as the logic is shared.
 
   END_TEST;
@@ -790,21 +794,24 @@ int UtcDaliImageOperationsDownscaleInPlacePow2SingleBytePerPixel(void)
 {
   // Simple test that a null pointer does not get dereferenced in the function:
   unsigned int outWidth, outHeight;
-  DownscaleInPlacePow2SingleBytePerPixel( 0, 0, 0, 0, 0, BoxDimensionTestBoth, outWidth, outHeight );
+  DownscaleInPlacePow2SingleBytePerPixel(0, 0, 0, 0, 0, BoxDimensionTestBoth, outWidth, outHeight);
 
   // Tests of output dimensions from downscaling:
-  uint8_t image[608*608];
-  for( unsigned i = 0; i < sizeof(image) / sizeof(image[0]); ++i )
+  uint8_t image[608 * 608];
+  for(unsigned i = 0; i < sizeof(image) / sizeof(image[0]); ++i)
   {
     image[i] = 0xff;
   }
 
-  TestDownscaleOutputsExpectedDimensionsSingleComponent( image,
-                                                         600, 300,  //< Input dimensions
-                                                         150, 75,   //< Requested dimensions to scale-down to
-                                                         150, 75,   //< Expected output dimensions achieved
-                                                         TEST_LOCATION );
-  TestDownscaleOutputsExpectedDimensionsSingleComponent( image, 577, 411, 142, 99, 144, 102, TEST_LOCATION );
+  TestDownscaleOutputsExpectedDimensionsSingleComponent(image,
+                                                        600,
+                                                        300, //< Input dimensions
+                                                        150,
+                                                        75, //< Requested dimensions to scale-down to
+                                                        150,
+                                                        75, //< Expected output dimensions achieved
+                                                        TEST_LOCATION);
+  TestDownscaleOutputsExpectedDimensionsSingleComponent(image, 577, 411, 142, 99, 144, 102, TEST_LOCATION);
 
   END_TEST;
 }
@@ -815,15 +822,16 @@ int UtcDaliImageOperationsDownscaleInPlacePow2SingleBytePerPixel(void)
 int UtcDaliImageOperationsHalveScanlineInPlaceRGB888(void)
 {
   // Red and cyan, averaging to grey:
-  unsigned char shortEven[] =    { 0xff, 0, 0,   0, 0xff, 0xff,   0xff, 0, 0,   0, 0xff, 0xff };
-  unsigned char shortOdd[] =     { 0xff, 0, 0,  0, 0xff, 0xff,  0xff, 0, 0,  0, 0xff, 0xff,  0xC, 0xC, 0xC };
+  unsigned char shortEven[] = {0xff, 0, 0, 0, 0xff, 0xff, 0xff, 0, 0, 0, 0xff, 0xff};
+  unsigned char shortOdd[]  = {0xff, 0, 0, 0, 0xff, 0xff, 0xff, 0, 0, 0, 0xff, 0xff, 0xC, 0xC, 0xC};
+
+  Dali::Internal::Platform::HalveScanlineInPlaceRGB888(shortEven, 4u);
+  Dali::Internal::Platform::HalveScanlineInPlaceRGB888(shortOdd, 4u);
 
-  Dali::Internal::Platform::HalveScanlineInPlaceRGB888( shortEven, 4u );
-  Dali::Internal::Platform::HalveScanlineInPlaceRGB888( shortOdd, 4u );
-  for( unsigned i = 0; i < sizeof(shortEven) >> 1u ; ++i )
+  for(unsigned i = 0; i < (sizeof(shortEven) >> 1u); ++i)
   {
-    DALI_TEST_EQUALS( unsigned(shortEven[i]), 0x7fu, TEST_LOCATION );
-    DALI_TEST_EQUALS( unsigned(shortOdd[i]), 0x7fu, TEST_LOCATION );
+    DALI_TEST_EQUALS(unsigned(shortEven[i]), 0x7fu, TEST_LOCATION);
+    DALI_TEST_EQUALS(unsigned(shortOdd[i]), 0x7fu, TEST_LOCATION);
   }
 
   END_TEST;
@@ -834,26 +842,26 @@ int UtcDaliImageOperationsHalveScanlineInPlaceRGB888(void)
  */
 int UtcDaliImageOperationsHalveScanlineInPlaceRGBA8888(void)
 {
-  const size_t scanlineLength = 4096u;
+  const size_t           scanlineLength = 4096u;
   Dali::Vector<uint32_t> scanline;
   Dali::Vector<uint32_t> reference;
-  SetupScanlineForHalvingTestsRGBA8888( scanlineLength, scanline, reference );
+  SetupScanlineForHalvingTestsRGBA8888(scanlineLength, scanline, reference);
 
-  HalveScanlineInPlaceRGBA8888( (uint8_t *) &scanline[0], scanlineLength );
+  HalveScanlineInPlaceRGBA8888((uint8_t*)&scanline[0], scanlineLength);
 
   // Check that the halving matches the independently calculated reference:
   size_t numMatches = 0;
-  for( int i = 0, length = reference.Size(); i < length; ++i )
+  for(int i = 0, length = reference.Size(); i < length; ++i)
   {
-    DALI_TEST_EQUALS( scanline[i], reference[i], TEST_LOCATION );
+    DALI_TEST_EQUALS(scanline[i], reference[i], TEST_LOCATION);
     numMatches += scanline[i] == reference[i];
   }
-  DALI_TEST_EQUALS( numMatches, scanlineLength / 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(numMatches, scanlineLength / 2, TEST_LOCATION);
 
   // Test for no beyond-bounds writes:
-  for( size_t i = scanlineLength / 2; i < reference.Capacity(); ++i )
+  for(size_t i = scanlineLength / 2; i < reference.Capacity(); ++i)
   {
-    DALI_TEST_EQUALS( reference[i],  (uint32_t)0xEEEEEEEE, TEST_LOCATION );
+    DALI_TEST_EQUALS(reference[i], (uint32_t)0xEEEEEEEE, TEST_LOCATION);
   }
 
   END_TEST;
@@ -864,26 +872,26 @@ int UtcDaliImageOperationsHalveScanlineInPlaceRGBA8888(void)
  */
 int UtcDaliImageOperationsHalveScanlineInPlaceRGB565(void)
 {
-  const size_t scanlineLength = 4096u;
+  const size_t           scanlineLength = 4096u;
   Dali::Vector<uint16_t> scanline;
   Dali::Vector<uint16_t> reference;
-  SetupScanlineForHalvingTestsRGB565( scanlineLength, scanline, reference );
+  SetupScanlineForHalvingTestsRGB565(scanlineLength, scanline, reference);
 
-  HalveScanlineInPlaceRGB565( (unsigned char *) (&scanline[0]), scanlineLength );
+  HalveScanlineInPlaceRGB565((unsigned char*)(&scanline[0]), scanlineLength);
 
   // Check output against reference:
   size_t numMatches = 0;
-  for( int i = 0, length = reference.Size(); i < length; ++i )
+  for(int i = 0, length = reference.Size(); i < length; ++i)
   {
-    DALI_TEST_EQUALS( scanline[i], reference[i], TEST_LOCATION );
+    DALI_TEST_EQUALS(scanline[i], reference[i], TEST_LOCATION);
     numMatches += scanline[i] == reference[i];
   }
-  DALI_TEST_EQUALS( numMatches, scanlineLength / 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(numMatches, scanlineLength / 2, TEST_LOCATION);
 
   // Test for no beyond-bounds writes:
-  for( size_t i = scanlineLength / 2; i < reference.Capacity(); ++i )
+  for(size_t i = scanlineLength / 2; i < reference.Capacity(); ++i)
   {
-    DALI_TEST_EQUALS( reference[i],  (uint16_t)0xEEEE, TEST_LOCATION );
+    DALI_TEST_EQUALS(reference[i], (uint16_t)0xEEEE, TEST_LOCATION);
   }
 
   END_TEST;
@@ -894,22 +902,22 @@ int UtcDaliImageOperationsHalveScanlineInPlaceRGB565(void)
  */
 int UtcDaliImageOperationsHalveScanlineInPlace2Bytes(void)
 {
-  const size_t scanlineLength = 4096u;
+  const size_t          scanlineLength = 4096u;
   Dali::Vector<uint8_t> scanline;
   Dali::Vector<uint8_t> reference;
-  SetupScanlineForHalvingTests2Bytes( scanlineLength, scanline, reference );
+  SetupScanlineForHalvingTests2Bytes(scanlineLength, scanline, reference);
 
-  HalveScanlineInPlace2Bytes( &scanline[0], scanlineLength );
+  HalveScanlineInPlace2Bytes(&scanline[0], scanlineLength);
 
   // Test the output against the reference (no differences):
   size_t numMatches = 0;
-  for( int i = 0, length = reference.Size(); i < length; ++i )
+  for(int i = 0, length = reference.Size(); i < length; ++i)
   {
-    DALI_TEST_EQUALS( 1u * scanline[i], 1u * reference[i], TEST_LOCATION );
+    DALI_TEST_EQUALS(1u * scanline[i], 1u * reference[i], TEST_LOCATION);
     numMatches += scanline[i] == reference[i];
   }
   // The number of matching bytes should be double the number of pixels, which happens to be the original scanline length in pixels:
-  DALI_TEST_EQUALS( numMatches, scanlineLength, TEST_LOCATION );
+  DALI_TEST_EQUALS(numMatches, scanlineLength, TEST_LOCATION);
 
   END_TEST;
 }
@@ -919,21 +927,21 @@ int UtcDaliImageOperationsHalveScanlineInPlace2Bytes(void)
  */
 int UtcDaliImageOperationsHalveScanlineInPlace1Byte(void)
 {
-  const size_t scanlineLength = 4096u;
+  const size_t          scanlineLength = 4096u;
   Dali::Vector<uint8_t> scanline;
   Dali::Vector<uint8_t> reference;
-  SetupScanlineForHalvingTests1Byte( scanlineLength, scanline, reference );
+  SetupScanlineForHalvingTests1Byte(scanlineLength, scanline, reference);
 
-  HalveScanlineInPlace1Byte( &scanline[0], scanlineLength );
+  HalveScanlineInPlace1Byte(&scanline[0], scanlineLength);
 
   // Test the reference matches the output:
   size_t numMatches = 0;
-  for( int i = 0, length = reference.Size(); i < length; ++i )
+  for(int i = 0, length = reference.Size(); i < length; ++i)
   {
-    DALI_TEST_EQUALS( 1u * scanline[i], 1u * reference[i], TEST_LOCATION );
+    DALI_TEST_EQUALS(1u * scanline[i], 1u * reference[i], TEST_LOCATION);
     numMatches += scanline[i] == reference[i];
   }
-  DALI_TEST_EQUALS( numMatches, scanlineLength / 2, TEST_LOCATION );
+  DALI_TEST_EQUALS(numMatches, scanlineLength / 2, TEST_LOCATION);
 
   END_TEST;
 }
@@ -944,30 +952,30 @@ int UtcDaliImageOperationsHalveScanlineInPlace1Byte(void)
 int UtcDaliImageOperationsAverageScanlines1(void)
 {
   // Red and cyan, averaging to grey:
-  unsigned char shortEven1[] =    { 0xff, 0, 0,    0, 0xff, 0xff,  0xff, 0, 0,      0, 0xff, 0xff };
-  unsigned char shortEven2[] =    { 0, 0xff, 0xff, 0xff, 0, 0,     0, 0xff,  0xff,  0xff, 0, 0 };
+  unsigned char shortEven1[] = {0xff, 0, 0, 0, 0xff, 0xff, 0xff, 0, 0, 0, 0xff, 0xff};
+  unsigned char shortEven2[] = {0, 0xff, 0xff, 0xff, 0, 0, 0, 0xff, 0xff, 0xff, 0, 0};
   unsigned char outputBuffer[sizeof(shortEven1)];
 
-  AverageScanlines1( shortEven1, shortEven2, outputBuffer, sizeof(shortEven1) );
-  for( unsigned i = 0; i < sizeof(shortEven1) ; ++i )
+  AverageScanlines1(shortEven1, shortEven2, outputBuffer, sizeof(shortEven1));
+  for(unsigned i = 0; i < sizeof(shortEven1); ++i)
   {
-    DALI_TEST_EQUALS( unsigned(outputBuffer[i]), 0x7fu, TEST_LOCATION );
+    DALI_TEST_EQUALS(unsigned(outputBuffer[i]), 0x7fu, TEST_LOCATION);
   }
 
   // Longer test reusing RGBA setup/test logic:
-  const size_t scanlineLength = 4096u;
+  const size_t           scanlineLength = 4096u;
   Dali::Vector<uint32_t> scanline1;
   Dali::Vector<uint32_t> scanline2;
   Dali::Vector<uint32_t> reference;
   Dali::Vector<uint32_t> output;
-  SetupScanlinesRGBA8888( scanlineLength, scanline1, scanline2, reference, output );
+  SetupScanlinesRGBA8888(scanlineLength, scanline1, scanline2, reference, output);
 
-  AverageScanlines1( (const unsigned char*) &scanline1[0], (const unsigned char*) &scanline2[0], (unsigned char*) &output[0], scanlineLength * 4 );
+  AverageScanlines1((const unsigned char*)&scanline1[0], (const unsigned char*)&scanline2[0], (unsigned char*)&output[0], scanlineLength * 4);
 
   // Check the output matches the independently generated reference:
   size_t numMatches = 0;
-  MatchScanlinesRGBA8888( reference, output, numMatches, TEST_LOCATION );
-  DALI_TEST_EQUALS( numMatches, reference.Capacity(), TEST_LOCATION );
+  MatchScanlinesRGBA8888(reference, output, numMatches, TEST_LOCATION);
+  DALI_TEST_EQUALS(numMatches, reference.Capacity(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -978,31 +986,31 @@ int UtcDaliImageOperationsAverageScanlines1(void)
 int UtcDaliImageOperationsAverageScanlines2(void)
 {
   // Red and cyan, averaging to grey:
-  unsigned char shortEven1[] =    { 0xff, 0, 0,    0, 0xff, 0xff,  0xff, 0, 0,      0, 0xff, 0xff };
-  unsigned char shortEven2[] =    { 0, 0xff, 0xff, 0xff, 0, 0,     0, 0xff,  0xff,  0xff, 0, 0 };
+  unsigned char shortEven1[] = {0xff, 0, 0, 0, 0xff, 0xff, 0xff, 0, 0, 0, 0xff, 0xff};
+  unsigned char shortEven2[] = {0, 0xff, 0xff, 0xff, 0, 0, 0, 0xff, 0xff, 0xff, 0, 0};
   unsigned char outputBuffer[sizeof(shortEven1)];
 
-  AverageScanlines2( shortEven1, shortEven2, outputBuffer, sizeof(shortEven1) / 2 );
+  AverageScanlines2(shortEven1, shortEven2, outputBuffer, sizeof(shortEven1) / 2);
 
-  for( unsigned i = 0; i < sizeof(shortEven1); ++i )
+  for(unsigned i = 0; i < sizeof(shortEven1); ++i)
   {
-    DALI_TEST_EQUALS( unsigned(outputBuffer[i]), 0x7fu, TEST_LOCATION );
+    DALI_TEST_EQUALS(unsigned(outputBuffer[i]), 0x7fu, TEST_LOCATION);
   }
 
   // Longer test reusing RGBA setup/test logic:
-  const size_t scanlineLength = 4096u;
+  const size_t           scanlineLength = 4096u;
   Dali::Vector<uint32_t> scanline1;
   Dali::Vector<uint32_t> scanline2;
   Dali::Vector<uint32_t> reference;
   Dali::Vector<uint32_t> output;
-  SetupScanlinesRGBA8888( scanlineLength, scanline1, scanline2, reference, output );
+  SetupScanlinesRGBA8888(scanlineLength, scanline1, scanline2, reference, output);
 
-  AverageScanlines2( (const unsigned char*) &scanline1[0], (const unsigned char*) &scanline2[0], (unsigned char*) &output[0], scanlineLength * 2 );
+  AverageScanlines2((const unsigned char*)&scanline1[0], (const unsigned char*)&scanline2[0], (unsigned char*)&output[0], scanlineLength * 2);
 
   // Check the output matches the independently generated reference:
   size_t numMatches = 0;
-  MatchScanlinesRGBA8888( reference, output, numMatches, TEST_LOCATION );
-  DALI_TEST_EQUALS( numMatches, reference.Capacity(), TEST_LOCATION );
+  MatchScanlinesRGBA8888(reference, output, numMatches, TEST_LOCATION);
+  DALI_TEST_EQUALS(numMatches, reference.Capacity(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1013,30 +1021,30 @@ int UtcDaliImageOperationsAverageScanlines2(void)
 int UtcDaliImageOperationsAverageScanlines3(void)
 {
   // Red and cyan, averaging to grey:
-  unsigned char shortEven1[] =    { 0xff, 0, 0,    0, 0xff, 0xff,  0xff, 0, 0,      0, 0xff, 0xff };
-  unsigned char shortEven2[] =    { 0, 0xff, 0xff, 0xff, 0, 0,     0, 0xff,  0xff,  0xff, 0, 0 };
+  unsigned char shortEven1[] = {0xff, 0, 0, 0, 0xff, 0xff, 0xff, 0, 0, 0, 0xff, 0xff};
+  unsigned char shortEven2[] = {0, 0xff, 0xff, 0xff, 0, 0, 0, 0xff, 0xff, 0xff, 0, 0};
   unsigned char outputBuffer[sizeof(shortEven1)];
 
-  AverageScanlines3( shortEven1, shortEven2, outputBuffer, sizeof(shortEven1) / 3 );
-  for( unsigned i = 0; i < sizeof(shortEven1) ; ++i )
+  AverageScanlines3(shortEven1, shortEven2, outputBuffer, sizeof(shortEven1) / 3);
+  for(unsigned i = 0; i < sizeof(shortEven1); ++i)
   {
-    DALI_TEST_EQUALS( unsigned(outputBuffer[i]), 0x7fu, TEST_LOCATION );
+    DALI_TEST_EQUALS(unsigned(outputBuffer[i]), 0x7fu, TEST_LOCATION);
   }
 
   // Longer test reusing RGBA setup/test logic:
-  const size_t scanlineLength = 3 * 4 * 90u;
+  const size_t           scanlineLength = 3 * 4 * 90u;
   Dali::Vector<uint32_t> scanline1;
   Dali::Vector<uint32_t> scanline2;
   Dali::Vector<uint32_t> reference;
   Dali::Vector<uint32_t> output;
-  SetupScanlinesRGBA8888( scanlineLength, scanline1, scanline2, reference, output );
+  SetupScanlinesRGBA8888(scanlineLength, scanline1, scanline2, reference, output);
 
-  AverageScanlines3( (const unsigned char*) &scanline1[0], (const unsigned char*) &scanline2[0], (unsigned char*) &output[0], scanlineLength * 4 / 3 );
+  AverageScanlines3((const unsigned char*)&scanline1[0], (const unsigned char*)&scanline2[0], (unsigned char*)&output[0], scanlineLength * 4 / 3);
 
   // Check the output matches the independently generated reference:
   size_t numMatches = 0;
-  MatchScanlinesRGBA8888( reference, output, numMatches, TEST_LOCATION );
-  DALI_TEST_EQUALS( numMatches, reference.Capacity(), TEST_LOCATION );
+  MatchScanlinesRGBA8888(reference, output, numMatches, TEST_LOCATION);
+  DALI_TEST_EQUALS(numMatches, reference.Capacity(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1046,19 +1054,19 @@ int UtcDaliImageOperationsAverageScanlines3(void)
  */
 int UtcDaliImageOperationsAverageScanlinesRGBA8888(void)
 {
-  const size_t scanlineLength = 4096u;
+  const size_t           scanlineLength = 4096u;
   Dali::Vector<uint32_t> scanline1;
   Dali::Vector<uint32_t> scanline2;
   Dali::Vector<uint32_t> reference;
   Dali::Vector<uint32_t> output;
-  SetupScanlinesRGBA8888( scanlineLength, scanline1, scanline2, reference, output );
+  SetupScanlinesRGBA8888(scanlineLength, scanline1, scanline2, reference, output);
 
-  AverageScanlinesRGBA8888( (const unsigned char*) &scanline1[0], (const unsigned char*) &scanline2[0], (unsigned char*) &output[0], scanlineLength );
+  AverageScanlinesRGBA8888((const unsigned char*)&scanline1[0], (const unsigned char*)&scanline2[0], (unsigned char*)&output[0], scanlineLength);
 
   // Check the output matches the independently generated reference:
   size_t numMatches = 0;
-  MatchScanlinesRGBA8888( reference, output, numMatches, TEST_LOCATION );
-  DALI_TEST_EQUALS( numMatches, reference.Capacity(), TEST_LOCATION );
+  MatchScanlinesRGBA8888(reference, output, numMatches, TEST_LOCATION);
+  DALI_TEST_EQUALS(numMatches, reference.Capacity(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -1069,33 +1077,32 @@ int UtcDaliImageOperationsAverageScanlinesRGBA8888(void)
 int UtcDaliImageOperationsAverageScanlinesRGB565(void)
 {
   // Red and cyan, averaging to grey:
-  const uint16_t shortEven1[] =    { 0xf800, 0xf800, 0xf800, 0xf800, 0xf800, 0xf800, 0xBEEF, 0xBEEF };
-  const uint16_t shortEven2[] =    { 0x7ff,  0x7ff,  0x7ff,  0x7ff,  0x7ff,  0x7ff, 0xBEEF, 0xBEEF };
-  const size_t arrayLength = sizeof(shortEven1) / sizeof(shortEven1[0]) - 2;
-  uint16_t outputBuffer[arrayLength + 2];
-  outputBuffer[arrayLength] = 0xDEAD;
-  outputBuffer[arrayLength+1] = 0xDEAD;
-
-  Dali::Internal::Platform::AverageScanlinesRGB565( (const unsigned char*) shortEven1, (const unsigned char*) shortEven2, (unsigned char*) outputBuffer,  arrayLength );
-  for( unsigned i = 0; i <  arrayLength ; ++i )
+  const uint16_t shortEven1[] = {0xf800, 0xf800, 0xf800, 0xf800, 0xf800, 0xf800, 0xBEEF, 0xBEEF};
+  const uint16_t shortEven2[] = {0x7ff, 0x7ff, 0x7ff, 0x7ff, 0x7ff, 0x7ff, 0xBEEF, 0xBEEF};
+  const size_t   arrayLength  = sizeof(shortEven1) / sizeof(shortEven1[0]) - 2;
+  uint16_t       outputBuffer[arrayLength + 2];
+  outputBuffer[arrayLength]     = 0xDEAD;
+  outputBuffer[arrayLength + 1] = 0xDEAD;
+
+  Dali::Internal::Platform::AverageScanlinesRGB565((const unsigned char*)shortEven1, (const unsigned char*)shortEven2, (unsigned char*)outputBuffer, arrayLength);
+  for(unsigned i = 0; i < arrayLength; ++i)
   {
-    DALI_TEST_EQUALS( unsigned(outputBuffer[i]), 0xffff - (1u << 15) - (1u << 10) - (1u << 4), TEST_LOCATION );
+    DALI_TEST_EQUALS(unsigned(outputBuffer[i]), 0xffff - (1u << 15) - (1u << 10) - (1u << 4), TEST_LOCATION);
   }
 
   // Check for buffer overrun:
-  DALI_TEST_EQUALS( outputBuffer[arrayLength], (uint16_t)0xDEAD, TEST_LOCATION );
-  DALI_TEST_EQUALS( outputBuffer[arrayLength+1], (uint16_t)0xDEAD, TEST_LOCATION );
+  DALI_TEST_EQUALS(outputBuffer[arrayLength], (uint16_t)0xDEAD, TEST_LOCATION);
+  DALI_TEST_EQUALS(outputBuffer[arrayLength + 1], (uint16_t)0xDEAD, TEST_LOCATION);
 
   END_TEST;
 }
 
 namespace
 {
-
-void MakeSingleColorImageRGBA8888( unsigned int width, unsigned int height, uint32_t *inputImage )
+void MakeSingleColorImageRGBA8888(unsigned int width, unsigned int height, uint32_t* inputImage)
 {
-  const uint32_t inPixel = PixelRGBA8888( 255, 192, 128, 64 );
-  for( unsigned int i = 0; i < width * height; ++i )
+  const uint32_t inPixel = PixelRGBA8888(255, 192, 128, 64);
+  for(unsigned int i = 0; i < width * height; ++i)
   {
     inputImage[i] = inPixel;
   }
@@ -1105,40 +1112,40 @@ void MakeSingleColorImageRGBA8888( unsigned int width, unsigned int height, uint
  * @brief Make an image with a checkerboard pattern.
  * @note This is an easy pattern to scan for correctness after a downscaling test.
  */
-Dali::IntrusivePtr<Dali::RefCountedVector<uint32_t> > MakeCheckerboardImageRGBA8888( unsigned int width,  unsigned int height, unsigned int checkerSize )
+Dali::IntrusivePtr<Dali::RefCountedVector<uint32_t> > MakeCheckerboardImageRGBA8888(unsigned int width, unsigned int height, unsigned int checkerSize)
 {
-  const unsigned int imageWidth = width * checkerSize;
-  const unsigned int imageHeight = height * checkerSize;
-  Dali::IntrusivePtr<Dali::RefCountedVector<uint32_t> > image = new Dali::RefCountedVector<uint32_t>;
-  image->GetVector().Resize( imageWidth * imageHeight );
+  const unsigned int                                    imageWidth  = width * checkerSize;
+  const unsigned int                                    imageHeight = height * checkerSize;
+  Dali::IntrusivePtr<Dali::RefCountedVector<uint32_t> > image       = new Dali::RefCountedVector<uint32_t>;
+  image->GetVector().Resize(imageWidth * imageHeight);
 
   uint32_t rowColor = 0xffffffff;
-  for( unsigned int cy = 0; cy < height; ++cy )
+  for(unsigned int cy = 0; cy < height; ++cy)
   {
-    rowColor = rowColor == 0xffffffff ? 0xff000000 : 0xffffffff;
+    rowColor            = rowColor == 0xffffffff ? 0xff000000 : 0xffffffff;
     uint32_t checkColor = rowColor;
-    for( unsigned int cx = 0; cx < width; ++cx )
+    for(unsigned int cx = 0; cx < width; ++cx)
     {
-      checkColor = checkColor == 0xffffffff ? 0xff000000 : 0xffffffff;
+      checkColor            = checkColor == 0xffffffff ? 0xff000000 : 0xffffffff;
       uint32_t paintedColor = checkColor;
       // Draw 3 special case checks as r,g,b:
       if(cx == 0 && cy == 0)
       {
-        paintedColor = 0xff0000ff;// Red
+        paintedColor = 0xff0000ff; // Red
       }
       else if(cx == 7 && cy == 0)
       {
-        paintedColor = 0xff00ff00;// Green
+        paintedColor = 0xff00ff00; // Green
       }
       else if(cx == 7 && cy == 7)
       {
-        paintedColor = 0xffff0000;// blue
+        paintedColor = 0xffff0000; // blue
       }
-      uint32_t * check = &image->GetVector()[ (cy * checkerSize * imageWidth) + (cx * checkerSize)];
-      for( unsigned int py = 0; py < checkerSize; ++py )
+      uint32_t* check = &image->GetVector()[(cy * checkerSize * imageWidth) + (cx * checkerSize)];
+      for(unsigned int py = 0; py < checkerSize; ++py)
       {
-        uint32_t * checkLine = check +  py * imageWidth;
-        for( unsigned int px = 0; px < checkerSize; ++px )
+        uint32_t* checkLine = check + py * imageWidth;
+        for(unsigned int px = 0; px < checkerSize; ++px)
         {
           checkLine[px] = paintedColor;
         }
@@ -1149,66 +1156,66 @@ Dali::IntrusivePtr<Dali::RefCountedVector<uint32_t> > MakeCheckerboardImageRGBA8
   return image;
 }
 
-}
+} // namespace
 
 /**
  * @brief Test the right pixels are generated when downsampling a checkerboard into a small image.
  */
 int UtcDaliImageOperationsPointSampleCheckerboardRGBA888(void)
 {
-  Dali::IntrusivePtr<Dali::RefCountedVector<uint32_t> > image = MakeCheckerboardImageRGBA8888( 8, 8, 32 );
-  const unsigned int desiredWidth = 8;
-  const unsigned int desiredHeight = 8;
+  Dali::IntrusivePtr<Dali::RefCountedVector<uint32_t> > image         = MakeCheckerboardImageRGBA8888(8, 8, 32);
+  const unsigned int                                    desiredWidth  = 8;
+  const unsigned int                                    desiredHeight = 8;
 
-  uint32_t outputImage[ desiredWidth * desiredHeight ];
+  uint32_t outputImage[desiredWidth * desiredHeight];
 
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) &image->GetVector()[0], 256, 256, (unsigned char*) outputImage, desiredWidth, desiredHeight );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)&image->GetVector()[0], 256, 256, (unsigned char*)outputImage, desiredWidth, desiredHeight);
 
-  DALI_TEST_EQUALS( outputImage[0], (uint32_t)0xff0000ff, TEST_LOCATION ); // < Red corner pixel
-  DALI_TEST_EQUALS( outputImage[7], (uint32_t)0xff00ff00, TEST_LOCATION ); // < Green corner pixel
-  DALI_TEST_EQUALS( outputImage[8*8-1], (uint32_t)0xffff0000, TEST_LOCATION ); // < Blue corner pixel
+  DALI_TEST_EQUALS(outputImage[0], (uint32_t)0xff0000ff, TEST_LOCATION);         // < Red corner pixel
+  DALI_TEST_EQUALS(outputImage[7], (uint32_t)0xff00ff00, TEST_LOCATION);         // < Green corner pixel
+  DALI_TEST_EQUALS(outputImage[8 * 8 - 1], (uint32_t)0xffff0000, TEST_LOCATION); // < Blue corner pixel
 
-  DALI_TEST_EQUALS( outputImage[1], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[2], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[3], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[4], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[5], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[6], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
+  DALI_TEST_EQUALS(outputImage[1], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[2], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[3], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[4], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[5], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[6], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
 
   // Second scanline:
-  DALI_TEST_EQUALS( outputImage[8+0], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[8+1], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[8+2], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[8+3], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[8+4], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[8+5], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[8+6], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[8+7], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
+  DALI_TEST_EQUALS(outputImage[8 + 0], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[8 + 1], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[8 + 2], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[8 + 3], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[8 + 4], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[8 + 5], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[8 + 6], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[8 + 7], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
 
   // Third scanline:
-  DALI_TEST_EQUALS( outputImage[16+0], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[16+1], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[16+2], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[16+3], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[16+4], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[16+5], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[16+6], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[16+7], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
+  DALI_TEST_EQUALS(outputImage[16 + 0], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[16 + 1], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[16 + 2], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[16 + 3], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[16 + 4], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[16 + 5], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[16 + 6], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[16 + 7], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
 
   // ... could do more scanlines (there are 8)
 
   // Sample a few more pixels:
 
   // Diagonals:
-  DALI_TEST_EQUALS( outputImage[24+3], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[32+4], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[40+5], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[48+6], (uint32_t)0xffffffff, TEST_LOCATION ); // < white pixel
-  DALI_TEST_EQUALS( outputImage[24+4], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[32+3], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[40+2], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[48+1], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
-  DALI_TEST_EQUALS( outputImage[56+0], (uint32_t)0xff000000, TEST_LOCATION ); // < black pixel
+  DALI_TEST_EQUALS(outputImage[24 + 3], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[32 + 4], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[40 + 5], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[48 + 6], (uint32_t)0xffffffff, TEST_LOCATION); // < white pixel
+  DALI_TEST_EQUALS(outputImage[24 + 4], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[32 + 3], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[40 + 2], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[48 + 1], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
+  DALI_TEST_EQUALS(outputImage[56 + 0], (uint32_t)0xff000000, TEST_LOCATION); // < black pixel
 
   END_TEST;
 }
@@ -1218,33 +1225,33 @@ int UtcDaliImageOperationsPointSampleCheckerboardRGBA888(void)
  */
 int UtcDaliImageOperationsPointSampleRGBA888PixelsCorrectColor(void)
 {
-  const unsigned int inputWidth = 137;
-  const unsigned int inputHeight = 571;
-  const unsigned int desiredWidth = 59;
+  const unsigned int inputWidth    = 137;
+  const unsigned int inputHeight   = 571;
+  const unsigned int desiredWidth  = 59;
   const unsigned int desiredHeight = 257;
 
-  uint32_t inputImage[ inputWidth * inputHeight ];
-  MakeSingleColorImageRGBA8888( inputWidth, inputHeight, inputImage );
+  uint32_t inputImage[inputWidth * inputHeight];
+  MakeSingleColorImageRGBA8888(inputWidth, inputHeight, inputImage);
 
-  const size_t outputBufferSize = desiredWidth * desiredHeight;
-  std::vector< uint32_t > buffer;
-  buffer.resize( outputBufferSize );
+  const size_t          outputBufferSize = desiredWidth * desiredHeight;
+  std::vector<uint32_t> buffer;
+  buffer.resize(outputBufferSize);
   uint32_t* outputImage = &buffer[0];
 
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage, inputWidth, inputHeight, (unsigned char*) outputImage, desiredWidth, desiredHeight );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, inputWidth, inputHeight, (unsigned char*)outputImage, desiredWidth, desiredHeight);
 
   // Check that all the output pixels are the right color:
-  const uint32_t reference = inputImage[ inputWidth * inputHeight / 2];
-  unsigned int differentColorCount = 0;
-  for( unsigned int i = 0; i < desiredWidth * desiredHeight; ++i )
+  const uint32_t reference           = inputImage[inputWidth * inputHeight / 2];
+  unsigned int   differentColorCount = 0;
+  for(unsigned int i = 0; i < desiredWidth * desiredHeight; ++i)
   {
-    if( outputImage[i] != reference )
+    if(outputImage[i] != reference)
     {
       ++differentColorCount;
     }
   }
 
-  DALI_TEST_EQUALS( 0U, differentColorCount, TEST_LOCATION );
+  DALI_TEST_EQUALS(0U, differentColorCount, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1254,49 +1261,49 @@ int UtcDaliImageOperationsPointSampleRGBA888PixelsCorrectColor(void)
  */
 int UtcDaliImageOperationsPointSampleRGBA888ScaleToSinglePixel(void)
 {
-  const unsigned int desiredWidth = 1;
+  const unsigned int desiredWidth  = 1;
   const unsigned int desiredHeight = 1;
 
-  uint32_t inputImage[ 1024 * 1024 ];
-  MakeSingleColorImageRGBA8888( 1024, 1024, inputImage );
+  uint32_t inputImage[1024 * 1024];
+  MakeSingleColorImageRGBA8888(1024, 1024, inputImage);
   uint32_t outputImage = 0;
 
   // Try several different starting image sizes:
 
   // 1x1 -> 1x1:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage,    1,    1, (unsigned char*) &outputImage, desiredWidth, desiredHeight );
-  DALI_TEST_EQUALS( outputImage, inputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 1, 1, (unsigned char*)&outputImage, desiredWidth, desiredHeight);
+  DALI_TEST_EQUALS(outputImage, inputImage[0], TEST_LOCATION);
   outputImage = 0;
 
   // Single-pixel wide tall stripe:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage,    1, 1024, (unsigned char*) &outputImage, desiredWidth, desiredHeight );
-  DALI_TEST_EQUALS( outputImage, inputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 1, 1024, (unsigned char*)&outputImage, desiredWidth, desiredHeight);
+  DALI_TEST_EQUALS(outputImage, inputImage[0], TEST_LOCATION);
   outputImage = 0;
 
   // Single-pixel tall, wide strip:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage, 1024,    1, (unsigned char*) &outputImage, desiredWidth, desiredHeight );
-  DALI_TEST_EQUALS( outputImage, inputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 1024, 1, (unsigned char*)&outputImage, desiredWidth, desiredHeight);
+  DALI_TEST_EQUALS(outputImage, inputImage[0], TEST_LOCATION);
   outputImage = 0;
 
   // Square mid-size image:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage,  103,  103, (unsigned char*) &outputImage, desiredWidth, desiredHeight );
-  DALI_TEST_EQUALS( outputImage, inputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 103, 103, (unsigned char*)&outputImage, desiredWidth, desiredHeight);
+  DALI_TEST_EQUALS(outputImage, inputImage[0], TEST_LOCATION);
   outputImage = 0;
 
   // Wide mid-size image:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage,  313,  79, (unsigned char*) &outputImage, desiredWidth, desiredHeight );
-  DALI_TEST_EQUALS( outputImage, inputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 313, 79, (unsigned char*)&outputImage, desiredWidth, desiredHeight);
+  DALI_TEST_EQUALS(outputImage, inputImage[0], TEST_LOCATION);
   outputImage = 0;
 
   // Tall mid-size image:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage,   53,  467, (unsigned char*) &outputImage, desiredWidth, desiredHeight );
-  DALI_TEST_EQUALS( outputImage, inputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 53, 467, (unsigned char*)&outputImage, desiredWidth, desiredHeight);
+  DALI_TEST_EQUALS(outputImage, inputImage[0], TEST_LOCATION);
   outputImage = 0;
 
   // 0 x 0 input image (make sure output not written to):
   outputImage = 0xDEADBEEF;
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage,    0,    0, (unsigned char*) &outputImage, desiredWidth, desiredHeight );
-  DALI_TEST_EQUALS( outputImage, (uint32_t)0xDEADBEEF, TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 0, 0, (unsigned char*)&outputImage, desiredWidth, desiredHeight);
+  DALI_TEST_EQUALS(outputImage, (uint32_t)0xDEADBEEF, TEST_LOCATION);
   outputImage = 0;
 
   END_TEST;
@@ -1308,40 +1315,40 @@ int UtcDaliImageOperationsPointSampleRGBA888ScaleToSinglePixel(void)
  */
 int UtcDaliImageOperationsPointSampleRGBA888N(void)
 {
-  uint32_t inputImage[ 128 * 128 ];
-  MakeSingleColorImageRGBA8888( 128, 128, inputImage );
-  uint32_t outputImage[ 128 * 128 ];
-  memset( outputImage, 0xaa, 128 * 128 * sizeof(uint32_t) );
+  uint32_t inputImage[128 * 128];
+  MakeSingleColorImageRGBA8888(128, 128, inputImage);
+  uint32_t outputImage[128 * 128];
+  memset(outputImage, 0xaa, 128 * 128 * sizeof(uint32_t));
 
   // Try several different starting image sizes:
 
   // 1x1 -> 1x1:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage,   1,   1, (unsigned char*) outputImage, 0, 0 );
-  DALI_TEST_EQUALS( 0xaaaaaaaa, outputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 1, 1, (unsigned char*)outputImage, 0, 0);
+  DALI_TEST_EQUALS(0xaaaaaaaa, outputImage[0], TEST_LOCATION);
 
   // Single-pixel wide tall stripe:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage,   1, 102, (unsigned char*) outputImage, 0, 33 );
-  DALI_TEST_EQUALS( 0xaaaaaaaa, outputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 1, 102, (unsigned char*)outputImage, 0, 33);
+  DALI_TEST_EQUALS(0xaaaaaaaa, outputImage[0], TEST_LOCATION);
 
   // Single-pixel tall, wide strip:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage, 102,   1, (unsigned char*) outputImage, 0, 67 );
-  DALI_TEST_EQUALS( 0xaaaaaaaa, outputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 102, 1, (unsigned char*)outputImage, 0, 67);
+  DALI_TEST_EQUALS(0xaaaaaaaa, outputImage[0], TEST_LOCATION);
 
   // Square mid-size image:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage, 103, 103, (unsigned char*) outputImage, 21, 0 );
-  DALI_TEST_EQUALS( 0xaaaaaaaa, outputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 103, 103, (unsigned char*)outputImage, 21, 0);
+  DALI_TEST_EQUALS(0xaaaaaaaa, outputImage[0], TEST_LOCATION);
 
   // Wide mid-size image to 0 height
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage, 313,  79, (unsigned char*) outputImage, 99, 0 );
-  DALI_TEST_EQUALS( 0xaaaaaaaa, outputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 313, 79, (unsigned char*)outputImage, 99, 0);
+  DALI_TEST_EQUALS(0xaaaaaaaa, outputImage[0], TEST_LOCATION);
 
   // Tall mid-size image to 0 height, over width
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage,  53,  46, (unsigned char*) outputImage, 9999, 0 );
-  DALI_TEST_EQUALS( 0xaaaaaaaa, outputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 53, 46, (unsigned char*)outputImage, 9999, 0);
+  DALI_TEST_EQUALS(0xaaaaaaaa, outputImage[0], TEST_LOCATION);
 
   // 0 x 0 input image:
-  Dali::Internal::Platform::PointSample4BPP( (const unsigned char *) inputImage,   0,   0, (unsigned char*) outputImage, 200, 99 );
-  DALI_TEST_EQUALS( 0xaaaaaaaa, outputImage[0], TEST_LOCATION );
+  Dali::Internal::Platform::PointSample4BPP((const unsigned char*)inputImage, 0, 0, (unsigned char*)outputImage, 200, 99);
+  DALI_TEST_EQUALS(0xaaaaaaaa, outputImage[0], TEST_LOCATION);
 
   END_TEST;
 }
@@ -1351,26 +1358,26 @@ int UtcDaliImageOperationsPointSampleRGBA888N(void)
  */
 int UtcDaliImageOperationsUint16Pair(void)
 {
-  Uint16Pair vec1( 2, 3 );
+  Uint16Pair vec1(2, 3);
 
-  DALI_TEST_EQUALS( vec1.GetWidth(), (uint16_t)2, TEST_LOCATION );
-  DALI_TEST_EQUALS( vec1.GetX(),     (uint16_t)2, TEST_LOCATION );
+  DALI_TEST_EQUALS(vec1.GetWidth(), (uint16_t)2, TEST_LOCATION);
+  DALI_TEST_EQUALS(vec1.GetX(), (uint16_t)2, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( vec1.GetHeight(), (uint16_t)3, TEST_LOCATION );
-  DALI_TEST_EQUALS( vec1.GetY(),      (uint16_t)3, TEST_LOCATION );
+  DALI_TEST_EQUALS(vec1.GetHeight(), (uint16_t)3, TEST_LOCATION);
+  DALI_TEST_EQUALS(vec1.GetY(), (uint16_t)3, TEST_LOCATION);
 
   Uint16Pair vec1Copy = vec1;
 
-  DALI_TEST_EQUALS( vec1Copy.GetWidth(), (uint16_t)2, TEST_LOCATION );
-  DALI_TEST_EQUALS( vec1Copy.GetX(),     (uint16_t)2, TEST_LOCATION );
+  DALI_TEST_EQUALS(vec1Copy.GetWidth(), (uint16_t)2, TEST_LOCATION);
+  DALI_TEST_EQUALS(vec1Copy.GetX(), (uint16_t)2, TEST_LOCATION);
 
-  DALI_TEST_EQUALS( vec1Copy.GetHeight(), (uint16_t)3, TEST_LOCATION );
-  DALI_TEST_EQUALS( vec1Copy.GetY(),      (uint16_t)3, TEST_LOCATION );
+  DALI_TEST_EQUALS(vec1Copy.GetHeight(), (uint16_t)3, TEST_LOCATION);
+  DALI_TEST_EQUALS(vec1Copy.GetY(), (uint16_t)3, TEST_LOCATION);
 
-  Uint16Pair vec2( 65535u, 65535u );
+  Uint16Pair vec2(65535u, 65535u);
 
-  DALI_TEST_EQUALS( vec2.GetX(), (uint16_t)65535u, TEST_LOCATION );
-  DALI_TEST_EQUALS( vec2.GetY(), (uint16_t)65535u, TEST_LOCATION );
+  DALI_TEST_EQUALS(vec2.GetX(), (uint16_t)65535u, TEST_LOCATION);
+  DALI_TEST_EQUALS(vec2.GetY(), (uint16_t)65535u, TEST_LOCATION);
 
   END_TEST;
 }
@@ -1381,46 +1388,46 @@ int UtcDaliImageOperationsUint16Pair(void)
 int UtcDaliImageOperationsBilinearFilter1BPP(void)
 {
   // Zeros blend to zero:
-  DALI_TEST_EQUALS( 0u, BilinearFilter1Component( 0, 0, 0, 0, 0, 0 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0u, BilinearFilter1Component( 0, 0, 0, 0, 32768, 0 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0u, BilinearFilter1Component( 0, 0, 0, 0, 65535, 0 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0u, BilinearFilter1Component( 0, 0, 0, 0, 0, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 0u, BilinearFilter1Component( 0, 0, 0, 0, 0, 65535 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(0u, BilinearFilter1Component(0, 0, 0, 0, 0, 0), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, BilinearFilter1Component(0, 0, 0, 0, 32768, 0), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, BilinearFilter1Component(0, 0, 0, 0, 65535, 0), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, BilinearFilter1Component(0, 0, 0, 0, 0, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, BilinearFilter1Component(0, 0, 0, 0, 0, 65535), TEST_LOCATION);
 
   // Ones and zeros average to 0.5:
-  DALI_TEST_EQUALS( 127u, BilinearFilter1Component( 255, 0, 0, 255, 32768, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 127u, BilinearFilter1Component( 0, 255, 0, 255, 32768, 32768 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(127u, BilinearFilter1Component(255, 0, 0, 255, 32768, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(127u, BilinearFilter1Component(0, 255, 0, 255, 32768, 32768), TEST_LOCATION);
 
   // Quarters ones average to 0.25:
-  DALI_TEST_EQUALS( 64u, BilinearFilter1Component( 255, 0, 0, 0, 32768, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 64u, BilinearFilter1Component( 0, 255, 0, 0, 32768, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 64u, BilinearFilter1Component( 0, 0, 255, 0, 32768, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 64u, BilinearFilter1Component( 0, 0, 0, 255, 32768, 32768 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(64u, BilinearFilter1Component(255, 0, 0, 0, 32768, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(64u, BilinearFilter1Component(0, 255, 0, 0, 32768, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(64u, BilinearFilter1Component(0, 0, 255, 0, 32768, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(64u, BilinearFilter1Component(0, 0, 0, 255, 32768, 32768), TEST_LOCATION);
 
   // Horizontal blends:
-  DALI_TEST_EQUALS( 0u, BilinearFilter1Component( 0, 255, 0, 255, 0, 32768 ), TEST_LOCATION );
-  for( unsigned y = 0; y < 65536u; y += 256 )
+  DALI_TEST_EQUALS(0u, BilinearFilter1Component(0, 255, 0, 255, 0, 32768), TEST_LOCATION);
+  for(unsigned y = 0; y < 65536u; y += 256)
   {
     // Vertical blends don't change result in this case as there is no vertical gradient in inputs:
-    DALI_TEST_EQUALS( 0u, BilinearFilter1Component( 0, 255, 0, 255, 0, y ), TEST_LOCATION );
+    DALI_TEST_EQUALS(0u, BilinearFilter1Component(0, 255, 0, 255, 0, y), TEST_LOCATION);
   }
-  DALI_TEST_EQUALS( 5u, BilinearFilter1Component( 0, 255, 0, 255, 1233, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 29u, BilinearFilter1Component( 0, 255, 0, 255, 7539, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 29u, BilinearFilter1Component( 0, 255, 0, 255, 7539, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 67u, BilinearFilter1Component( 0, 255, 0, 255, 17291, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 123u, BilinearFilter1Component( 0, 255, 0, 255, 31671, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 184u, BilinearFilter1Component( 0, 255, 0, 255, 47231, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 207u, BilinearFilter1Component( 0, 255, 0, 255, 53129, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 239u, BilinearFilter1Component( 0, 255, 0, 255, 61392, 32768 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 255u, BilinearFilter1Component( 0, 255, 0, 255, 65535, 32768 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(5u, BilinearFilter1Component(0, 255, 0, 255, 1233, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(29u, BilinearFilter1Component(0, 255, 0, 255, 7539, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(29u, BilinearFilter1Component(0, 255, 0, 255, 7539, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(67u, BilinearFilter1Component(0, 255, 0, 255, 17291, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(123u, BilinearFilter1Component(0, 255, 0, 255, 31671, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(184u, BilinearFilter1Component(0, 255, 0, 255, 47231, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(207u, BilinearFilter1Component(0, 255, 0, 255, 53129, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(239u, BilinearFilter1Component(0, 255, 0, 255, 61392, 32768), TEST_LOCATION);
+  DALI_TEST_EQUALS(255u, BilinearFilter1Component(0, 255, 0, 255, 65535, 32768), TEST_LOCATION);
 
   // Vertical Blends:
-  DALI_TEST_EQUALS( 0u, BilinearFilter1Component( 0, 0, 255, 255, 32768, 0 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 60u, BilinearFilter1Component( 0, 0, 255, 255, 32768, 15379 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 130u, BilinearFilter1Component( 0, 0, 255, 255, 32768, 33451 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 186u, BilinearFilter1Component( 0, 0, 255, 255, 32768, 47836 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 244u, BilinearFilter1Component( 0, 0, 255, 255, 32768, 62731 ), TEST_LOCATION );
-  DALI_TEST_EQUALS( 255u, BilinearFilter1Component( 0, 0, 255, 255, 32768, 65535 ), TEST_LOCATION );
+  DALI_TEST_EQUALS(0u, BilinearFilter1Component(0, 0, 255, 255, 32768, 0), TEST_LOCATION);
+  DALI_TEST_EQUALS(60u, BilinearFilter1Component(0, 0, 255, 255, 32768, 15379), TEST_LOCATION);
+  DALI_TEST_EQUALS(130u, BilinearFilter1Component(0, 0, 255, 255, 32768, 33451), TEST_LOCATION);
+  DALI_TEST_EQUALS(186u, BilinearFilter1Component(0, 0, 255, 255, 32768, 47836), TEST_LOCATION);
+  DALI_TEST_EQUALS(244u, BilinearFilter1Component(0, 0, 255, 255, 32768, 62731), TEST_LOCATION);
+  DALI_TEST_EQUALS(255u, BilinearFilter1Component(0, 0, 255, 255, 32768, 65535), TEST_LOCATION);
 
   END_TEST;
 }