Merge "Remove deprecated APIs from GaussianBlurView" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 10 Jul 2019 12:22:45 +0000 (12:22 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 10 Jul 2019 12:22:45 +0000 (12:22 +0000)
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Circular.cpp
dali-toolkit/devel-api/text/text-utils-devel.cpp

index 9a6d206..ae3afd2 100755 (executable)
@@ -797,6 +797,10 @@ int UtcDaliTextUpdateBufferFormatCheck(void)
 
   Dali::Toolkit::DevelText::UpdateBuffer(srcBuffer, dstBuffer, 0, 0, true);
 
+  Devel::PixelBuffer compressedSrcBuffer = Devel::PixelBuffer::New( 10, 10, Pixel::COMPRESSED_R11_EAC );
+  Devel::PixelBuffer compressedDstBuffer = Devel::PixelBuffer::New( 10, 10, Pixel::COMPRESSED_R11_EAC );
+  Dali::Toolkit::DevelText::UpdateBuffer(compressedSrcBuffer, compressedDstBuffer, 0, 0, true);
+
   tet_result(TET_PASS);
   END_TEST;
 }
index dcc9ab8..eaab0e5 100755 (executable)
@@ -1281,6 +1281,10 @@ void UpdateBuffer(Devel::PixelBuffer src, Devel::PixelBuffer dst, unsigned int x
   }
 
   const unsigned int bytesPerPixel = Dali::Pixel::GetBytesPerPixel(pixelFormat);
+  if( bytesPerPixel == 0u )
+  {
+    return;
+  }
   const unsigned int alphaIndex = bytesPerPixel - 1u;
 
   const unsigned char* const srcBuffer = src.GetBuffer();