Add npatch utility 24/236824/6
authorHeeyong Song <heeyong.song@samsung.com>
Mon, 22 Jun 2020 08:36:17 +0000 (17:36 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 23 Jun 2020 10:12:05 +0000 (19:12 +0900)
Change-Id: I31cece8e4a1f85c515038f66a9afa3b697e7a112

automated-tests/src/dali-toolkit-internal/utc-Dali-Visuals-internal.cpp
automated-tests/src/dali-toolkit/CMakeLists.txt
automated-tests/src/dali-toolkit/utc-Dali-NPatchUtilities.cpp [new file with mode: 0644]
automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
dali-toolkit/devel-api/file.list
dali-toolkit/devel-api/utility/npatch-utilities.cpp [new file with mode: 0644]
dali-toolkit/devel-api/utility/npatch-utilities.h [new file with mode: 0644]
dali-toolkit/internal/visuals/npatch-loader.cpp
dali-toolkit/internal/visuals/npatch-loader.h
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp

index 023da7c..7b0e2f8 100644 (file)
@@ -26,7 +26,6 @@
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
-#include <dali-toolkit/internal/visuals/npatch-loader.h>
 #include <dummy-visual.h>
 #include <../dali-toolkit/dali-toolkit-test-utils/dummy-control.h>
 #include <dali-toolkit/devel-api/visuals/arc-visual-properties-devel.h>
@@ -161,145 +160,6 @@ int UtcDaliVisualSetProperties(void)
   END_TEST;
 }
 
-int UtcDaliNPatchBufferGetRedOffsetAndMask(void)
-{
-  TestApplication application;
-
-  tet_infoline("UtcDaliNPatchBufferGetRedOffsetAndMask");
-
-  int byteOffset = 0;
-  int bitMask = 0;
-
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::A8, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::L8, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::LA88, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::RGB888, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xff );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::RGB8888, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xff );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::RGBA8888, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xff );
-
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::BGR8888, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 2 && bitMask == 0xff );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::BGRA8888, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 2 && bitMask == 0xff );
-
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::RGB565, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xf8 );
-
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::BGR565, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 1 && bitMask == 0x1f );
-
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::RGBA4444, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xf0 );
-
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::BGRA4444, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 1 && bitMask == 0xf0 );
-
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::RGBA5551, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xf8 );
-
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::BGRA5551, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 1 && bitMask == 0x1e );
-
-  // Compressed formats are not supported
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::INVALID, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_R11_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SIGNED_R11_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RG11_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SIGNED_RG11_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB8_ETC2, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ETC2, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB8_ETC1, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB_PVRTC_4BPPV1, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA8_ETC2_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_4x4_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_5x4_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_5x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_6x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_6x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_8x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_8x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_8x8_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x8_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x10_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_12x10_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_12x12_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-
-  // Not supported
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::RGB16F, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-  Toolkit::Internal::NPatchBuffer::GetRedOffsetAndMask( Pixel::RGB32F, byteOffset, bitMask );
-  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
-
-  END_TEST;
-}
-
 int UtcDaliAnimatedVectorImageVisualCreateInstancePropertyMap(void)
 {
   ToolkitTestApplication application;
index f87d48c..d7b4a5b 100755 (executable)
@@ -71,6 +71,7 @@ SET(TC_SOURCES
   utc-Dali-SyncImageLoader.cpp
   utc-Dali-ControlWrapper.cpp
   utc-Dali-DragAndDropDetector.cpp
+  utc-Dali-NPatchUtilities.cpp
 )
 
 # Append list of test harness files (Won't get parsed for test cases)
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-NPatchUtilities.cpp b/automated-tests/src/dali-toolkit/utc-Dali-NPatchUtilities.cpp
new file mode 100644 (file)
index 0000000..64f57d5
--- /dev/null
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+#include <stdlib.h>
+#include <dali-toolkit-test-suite-utils.h>
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/utility/npatch-utilities.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+namespace
+{
+
+void InitialiseRegionsToZeroAlpha( Dali::Devel::PixelBuffer pixelBuffer, uint32_t width, uint32_t height, Pixel::Format pixelFormat )
+{
+  unsigned char* buffer = pixelBuffer.GetBuffer();
+  uint32_t bytesPerPixel = GetBytesPerPixel( pixelFormat );
+
+  for( uint32_t row = 0; row < width; ++row )
+  {
+    uint32_t pixelOffset = row * bytesPerPixel;
+    buffer[ pixelOffset + 3 ] = 0x00;
+    pixelOffset += ( height - 1 ) * width * bytesPerPixel;
+    buffer[ pixelOffset + 3 ] = 0x00;
+  }
+
+  for( unsigned int column = 0; column < height; ++column )
+  {
+    uint32_t pixelOffset = column * width * bytesPerPixel;
+    buffer[ pixelOffset + 3 ] = 0x00;
+    pixelOffset += ( width -1 ) * bytesPerPixel;
+    buffer[ pixelOffset + 3 ] = 0x00;
+  }
+}
+
+void AddStretchRegionsToImage( Dali::Devel::PixelBuffer pixelBuffer, uint32_t width, uint32_t height, const Vector4& requiredStretchBorder, Pixel::Format pixelFormat )
+{
+  unsigned char* buffer = pixelBuffer.GetBuffer();
+  uint32_t bytesPerPixel = GetBytesPerPixel( pixelFormat );
+
+  for( uint32_t column = requiredStretchBorder.x; column < width - requiredStretchBorder.z; ++column )
+  {
+    uint32_t pixelOffset = column * bytesPerPixel;
+    buffer[ pixelOffset ] = 0x00;
+    buffer[ pixelOffset + 1 ] = 0x00;
+    buffer[ pixelOffset + 2 ] = 0x00;
+    buffer[ pixelOffset + 3 ] = 0xFF;
+  }
+
+  for( uint32_t row = requiredStretchBorder.y; row < height - requiredStretchBorder.w; ++row )
+  {
+    unsigned int pixelOffset = row * width * bytesPerPixel;
+    buffer[ pixelOffset ] = 0x00;
+    buffer[ pixelOffset + 1 ] = 0x00;
+    buffer[ pixelOffset + 2 ] = 0x00;
+    buffer[ pixelOffset + 3 ] = 0xFF;
+  }
+}
+
+Dali::Devel::PixelBuffer CustomizeNPatch( uint32_t width, uint32_t height, const Vector4& requiredStretchBorder )
+{
+  Pixel::Format pixelFormat = Pixel::RGBA8888;
+  Dali::Devel::PixelBuffer pixelBuffer = Dali::Devel::PixelBuffer::New( width, height, pixelFormat );
+
+  unsigned char* buffer = pixelBuffer.GetBuffer();
+  memset( buffer, 0, width * height * Dali::Pixel::GetBytesPerPixel( pixelFormat ) );
+
+  InitialiseRegionsToZeroAlpha( pixelBuffer, width, height, pixelFormat );
+
+  AddStretchRegionsToImage( pixelBuffer, width, height, requiredStretchBorder, pixelFormat );
+
+  return pixelBuffer;
+}
+
+} //namespace
+
+void dali_npatch_utilities_startup(void)
+{
+  test_return_value = TET_UNDEF;
+}
+
+void dali_npatch_utilities_cleanup(void)
+{
+  test_return_value = TET_PASS;
+}
+
+int UtcDaliNPatchUtilityGetRedOffsetAndMask(void)
+{
+  TestApplication application;
+
+  tet_infoline("UtcDaliNPatchUtilityGetRedOffsetAndMask");
+
+  int32_t byteOffset = 0;
+  int32_t bitMask = 0;
+
+  NPatchUtility::GetRedOffsetAndMask( Pixel::A8, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::L8, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::LA88, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+
+  NPatchUtility::GetRedOffsetAndMask( Pixel::RGB888, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xff );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::RGB8888, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xff );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::RGBA8888, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xff );
+
+  NPatchUtility::GetRedOffsetAndMask( Pixel::BGR8888, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 2 && bitMask == 0xff );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::BGRA8888, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 2 && bitMask == 0xff );
+
+  NPatchUtility::GetRedOffsetAndMask( Pixel::RGB565, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xf8 );
+
+  NPatchUtility::GetRedOffsetAndMask( Pixel::BGR565, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 1 && bitMask == 0x1f );
+
+  NPatchUtility::GetRedOffsetAndMask( Pixel::RGBA4444, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xf0 );
+
+  NPatchUtility::GetRedOffsetAndMask( Pixel::BGRA4444, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 1 && bitMask == 0xf0 );
+
+  NPatchUtility::GetRedOffsetAndMask( Pixel::RGBA5551, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0xf8 );
+
+  NPatchUtility::GetRedOffsetAndMask( Pixel::BGRA5551, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 1 && bitMask == 0x1e );
+
+  // Compressed formats are not supported
+  NPatchUtility::GetRedOffsetAndMask( Pixel::INVALID, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_R11_EAC, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SIGNED_R11_EAC, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RG11_EAC, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SIGNED_RG11_EAC, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB8_ETC2, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ETC2, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB8_ETC1, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB_PVRTC_4BPPV1, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA8_ETC2_EAC, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_4x4_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_5x4_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_5x5_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_6x5_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_6x6_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_8x5_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_8x6_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_8x8_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x5_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x6_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x8_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_10x10_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_12x10_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_RGBA_ASTC_12x12_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+
+  // Not supported
+  NPatchUtility::GetRedOffsetAndMask( Pixel::RGB16F, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+  NPatchUtility::GetRedOffsetAndMask( Pixel::RGB32F, byteOffset, bitMask );
+  DALI_TEST_CHECK( byteOffset == 0 && bitMask == 0 );
+
+  END_TEST;
+}
+
+int UtcDaliNPatchUtilityParseBorders(void)
+{
+  TestApplication application;
+  tet_infoline("UtcDaliNPatchUtilityParseBorders");
+
+  /* Stretch region left(2) top(2) right (2) bottom (2)
+    *    ss
+    *  OOOOOO
+    *  OOOOOOc
+    * sOOooOOc
+    * sOOooOOc
+    *  OOOOOOc
+    *  OOOOOO
+    *   cccc
+    */
+
+   const unsigned int imageHeight = 18;
+   const unsigned int imageWidth = 28;
+   const Vector4 requiredStretchBorder( 3, 4, 5, 6 );
+
+   Dali::Devel::PixelBuffer pixelBuffer = CustomizeNPatch( imageHeight, imageWidth, requiredStretchBorder );
+   DALI_TEST_CHECK( pixelBuffer );
+
+   if( pixelBuffer )
+   {
+     NPatchUtility::StretchRanges stretchPixelsX;
+     NPatchUtility::StretchRanges stretchPixelsY;
+
+     NPatchUtility::ParseBorders( pixelBuffer, stretchPixelsX, stretchPixelsY );
+
+     DALI_TEST_CHECK( stretchPixelsX.Size() == 1 );
+     DALI_TEST_CHECK( stretchPixelsY.Size() == 1 );
+
+     Vector4 stretchBorders;
+     //The NPatch image stretch pixels are in the cropped image space, inset by 1 to get it to uncropped image space
+     stretchBorders.x = stretchPixelsX[ 0 ].GetX() + 1;
+     stretchBorders.y = stretchPixelsY[ 0 ].GetX() + 1;
+     stretchBorders.z = imageHeight - stretchPixelsX[ 0 ].GetY() - 1;
+     stretchBorders.w = imageWidth - stretchPixelsY[ 0 ].GetY() - 1;
+
+     DALI_TEST_EQUALS( stretchBorders, requiredStretchBorder, 0.001, TEST_LOCATION );
+   }
+   else
+   {
+     test_return_value = TET_FAIL;
+   }
+
+  END_TEST;
+}
+
+int UtcDaliNPatchUtilityIsNinePatchUrl(void)
+{
+  tet_infoline( "UtcDaliNPatchUtilityIsNinePatchUrl" );
+
+  DALI_TEST_CHECK( NPatchUtility::IsNinePatchUrl( "test.9.jpg" ) );
+  DALI_TEST_CHECK( NPatchUtility::IsNinePatchUrl( "test.#.jpg" ) );
+  DALI_TEST_CHECK( !NPatchUtility::IsNinePatchUrl( "test.9" ) );
+  DALI_TEST_CHECK( !NPatchUtility::IsNinePatchUrl( "test.#" ) );
+  DALI_TEST_CHECK( !NPatchUtility::IsNinePatchUrl( "test" ) );
+
+  END_TEST;
+}
index d917895..b9a5e19 100644 (file)
@@ -24,6 +24,7 @@
 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
 #include <dali-toolkit/internal/visuals/npatch-loader.h>
 #include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali-toolkit/devel-api/utility/npatch-utilities.h>
 #include "dummy-control.h"
 
 #include <dali/integration-api/debug.h>
@@ -33,7 +34,7 @@ using namespace Dali::Toolkit;
 
 namespace
 {
-typedef Toolkit::Internal::NPatchLoader::StretchRanges StretchRanges;
+typedef Toolkit::NPatchUtility::StretchRanges StretchRanges;
 
 const char* TEST_9_PATCH_FILE_NAME =  TEST_RESOURCE_DIR  "/demo-tile-texture-focused.9.png";
 const char* TEST_NPATCH_FILE_NAME =  TEST_RESOURCE_DIR  "/heartsframe.9.png";
index 5eb6d82..36f0649 100755 (executable)
@@ -47,6 +47,7 @@ SET( devel_api_src_files
   ${devel_api_src_dir}/transition-effects/cube-transition-effect.cpp
   ${devel_api_src_dir}/transition-effects/cube-transition-fold-effect.cpp
   ${devel_api_src_dir}/transition-effects/cube-transition-wave-effect.cpp
+  ${devel_api_src_dir}/utility/npatch-utilities.cpp
   ${devel_api_src_dir}/visual-factory/transition-data.cpp
   ${devel_api_src_dir}/visual-factory/visual-factory.cpp
   ${devel_api_src_dir}/visual-factory/visual-base.cpp
@@ -223,6 +224,10 @@ SET( devel_api_drag_and_drop_detector_header_files
   ${devel_api_src_dir}/drag-drop-detector/drag-and-drop-detector.h
 )
 
+SET( devel_api_utility_header_files
+  ${devel_api_src_dir}/utility/npatch-utilities.h
+)
+
 SET( SOURCES ${SOURCES}
   ${devel_api_src_files}
 )
@@ -259,4 +264,5 @@ SET( DEVEL_API_HEADERS ${DEVEL_API_HEADERS}
   ${devel_api_video_view_header_files}
   ${devel_api_web_view_header_files}
   ${devel_api_drag_and_drop_detector_header_files}
+  ${devel_api_utility_header_files}
 )
diff --git a/dali-toolkit/devel-api/utility/npatch-utilities.cpp b/dali-toolkit/devel-api/utility/npatch-utilities.cpp
new file mode 100644 (file)
index 0000000..a8b6e32
--- /dev/null
@@ -0,0 +1,317 @@
+/*
+* Copyright (c) 2020 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+// CLASS HEADER
+#include <dali-toolkit/devel-api/utility/npatch-utilities.h>
+
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
+namespace Dali
+{
+
+namespace Toolkit
+{
+
+namespace NPatchUtility
+{
+
+namespace
+{
+
+Uint16Pair ParseRange( uint32_t& index, uint32_t width, uint8_t*& pixel, uint32_t pixelStride, int32_t testByte, int32_t testBits, int32_t testValue )
+{
+ unsigned int start = 0xFFFF;
+ for( ; index < width; ++index, pixel += pixelStride )
+ {
+   if( ( pixel[ testByte ] & testBits ) == testValue )
+   {
+       start = index;
+       ++index;
+       pixel += pixelStride;
+       break;
+   }
+ }
+
+ unsigned int end = width;
+ for( ; index < width; ++index, pixel += pixelStride )
+ {
+   if( ( pixel[ testByte ] & testBits ) != testValue )
+   {
+       end = index;
+       ++index;
+       pixel += pixelStride;
+       break;
+   }
+ }
+
+ return Uint16Pair( start, end );
+}
+
+} // unnamed namespace
+
+void GetRedOffsetAndMask( Dali::Pixel::Format pixelFormat, int32_t& byteOffset, int32_t& bitMask )
+{
+ switch( pixelFormat )
+ {
+   case Dali::Pixel::A8:
+   case Dali::Pixel::L8:
+   case Dali::Pixel::LA88:
+   {
+     byteOffset = 0;
+     bitMask = 0;
+     break;
+   }
+   case Dali::Pixel::RGB888:
+   case Dali::Pixel::RGB8888:
+   case Dali::Pixel::RGBA8888:
+   {
+     byteOffset = 0;
+     bitMask = 0xFF;
+     break;
+   }
+   case Dali::Pixel::BGR8888:
+   case Dali::Pixel::BGRA8888:
+   {
+     byteOffset = 2;
+     bitMask = 0xff;
+     break;
+   }
+   case Dali::Pixel::RGB565:
+   {
+     byteOffset = 0;
+     bitMask = 0xf8;
+     break;
+   }
+   case Dali::Pixel::BGR565:
+   {
+     byteOffset = 1;
+     bitMask = 0x1f;
+     break;
+   }
+   case Dali::Pixel::RGBA4444:
+   {
+     byteOffset = 0;
+     bitMask = 0xf0;
+     break;
+   }
+   case Dali::Pixel::BGRA4444:
+   {
+     byteOffset = 1;
+     bitMask = 0xf0;
+     break;
+   }
+   case Dali::Pixel::RGBA5551:
+   {
+     byteOffset = 0;
+     bitMask = 0xf8;
+     break;
+   }
+   case Dali::Pixel::BGRA5551:
+   {
+     byteOffset = 1;
+     bitMask = 0x1e;
+     break;
+   }
+   case Dali::Pixel::INVALID:
+   case Dali::Pixel::COMPRESSED_R11_EAC:
+   case Dali::Pixel::COMPRESSED_SIGNED_R11_EAC:
+   case Dali::Pixel::COMPRESSED_RG11_EAC:
+   case Dali::Pixel::COMPRESSED_SIGNED_RG11_EAC:
+   case Dali::Pixel::COMPRESSED_RGB8_ETC2:
+   case Dali::Pixel::COMPRESSED_SRGB8_ETC2:
+   case Dali::Pixel::COMPRESSED_RGB8_ETC1:
+   case Dali::Pixel::COMPRESSED_RGB_PVRTC_4BPPV1:
+   case Dali::Pixel::COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+   case Dali::Pixel::COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+   case Dali::Pixel::COMPRESSED_RGBA8_ETC2_EAC:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_4x4_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_5x4_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_5x5_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_6x5_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_6x6_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_8x5_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_8x6_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_8x8_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_10x5_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_10x6_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_10x8_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_10x10_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_12x10_KHR:
+   case Dali::Pixel::COMPRESSED_RGBA_ASTC_12x12_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
+   case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
+   {
+     DALI_LOG_ERROR("Pixel formats for compressed images are not compatible with simple masking-out of per-pixel alpha.\n");
+     byteOffset=0;
+     bitMask=0;
+     break;
+   }
+   case Dali::Pixel::RGB16F:
+   case Dali::Pixel::RGB32F:
+   case Dali::Pixel::DEPTH_UNSIGNED_INT:
+   case Dali::Pixel::DEPTH_FLOAT:
+   case Dali::Pixel::DEPTH_STENCIL:
+   {
+     DALI_LOG_ERROR("Pixel format not compatible.\n");
+     byteOffset=0;
+     bitMask=0;
+     break;
+   }
+ }
+}
+
+void ParseBorders( Devel::PixelBuffer& pixelBuffer, StretchRanges& stretchPixelsX, StretchRanges& stretchPixelsY )
+{
+ stretchPixelsX.Clear();
+ stretchPixelsY.Clear();
+
+ Pixel::Format pixelFormat = pixelBuffer.GetPixelFormat();
+
+ int32_t alphaByte = 0;
+ int32_t alphaBits = 0;
+ Pixel::GetAlphaOffsetAndMask( pixelFormat, alphaByte, alphaBits );
+
+ int32_t testByte = alphaByte;
+ int32_t testBits = alphaBits;
+ int32_t testValue = alphaBits; // Opaque == stretch
+ if( !alphaBits )
+ {
+   GetRedOffsetAndMask( pixelFormat, testByte, testBits );
+   testValue = 0;           // Black == stretch
+ }
+
+ uint32_t bytesPerPixel = Pixel::GetBytesPerPixel( pixelFormat );
+ uint32_t width = pixelBuffer.GetWidth();
+ uint32_t height = pixelBuffer.GetHeight();
+ uint8_t* srcPixels = pixelBuffer.GetBuffer();
+ uint32_t srcStride = width * bytesPerPixel;
+
+ // TOP
+ uint8_t* top = srcPixels + bytesPerPixel;
+ uint32_t index = 0;
+
+ for( ; index < width - 2; )
+ {
+   Uint16Pair range = ParseRange( index, width - 2, top, bytesPerPixel, testByte, testBits, testValue );
+   if( range.GetX() != 0xFFFF )
+   {
+     stretchPixelsX.PushBack( range );
+   }
+ }
+
+ // LEFT
+ uint8_t* left  = srcPixels + srcStride;
+ index = 0;
+ for( ; index < height - 2; )
+ {
+   Uint16Pair range = ParseRange( index, height - 2, left, srcStride, testByte, testBits, testValue );
+   if( range.GetX() != 0xFFFF )
+   {
+     stretchPixelsY.PushBack( range );
+   }
+ }
+
+ // If there are no stretch pixels then make the entire image stretchable
+ if( stretchPixelsX.Size() == 0 )
+ {
+   stretchPixelsX.PushBack( Uint16Pair( 0, width - 2 ) );
+ }
+ if( stretchPixelsY.Size() == 0 )
+ {
+   stretchPixelsY.PushBack( Uint16Pair( 0, height - 2 ) );
+ }
+}
+
+bool IsNinePatchUrl( const std::string& url )
+{
+  bool match = false;
+
+  std::string::const_reverse_iterator iter = url.rbegin();
+  enum { SUFFIX, HASH, HASH_DOT, DONE } state = SUFFIX;
+  while(iter < url.rend())
+  {
+    switch(state)
+    {
+      case SUFFIX:
+      {
+        if(*iter == '.')
+        {
+          state = HASH;
+        }
+        else if(!isalnum(*iter))
+        {
+          state = DONE;
+        }
+      }
+      break;
+      case HASH:
+      {
+        if( *iter == '#' || *iter == '9' )
+        {
+          state = HASH_DOT;
+        }
+        else
+        {
+          state = DONE;
+        }
+      }
+      break;
+      case HASH_DOT:
+      {
+        if(*iter == '.')
+        {
+          match = true;
+        }
+        state = DONE; // Stop testing characters
+      }
+      break;
+      case DONE:
+      {
+      }
+      break;
+    }
+
+    // Satisfy prevent
+    if( state == DONE )
+    {
+      break;
+    }
+
+    ++iter;
+  }
+  return match;
+}
+
+} // namespace NPatchBuffer
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --git a/dali-toolkit/devel-api/utility/npatch-utilities.h b/dali-toolkit/devel-api/utility/npatch-utilities.h
new file mode 100644 (file)
index 0000000..c85e6cd
--- /dev/null
@@ -0,0 +1,75 @@
+#ifndef DALI_TOOLKIT_NPATCH_UTILITIES_H
+#define DALI_TOOLKIT_NPATCH_UTILITIES_H
+
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/math/uint-16-pair.h>
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
+namespace Dali
+{
+
+namespace Toolkit
+{
+
+namespace NPatchUtility
+{
+
+/**
+ * The list that includes stretch pixel ranges
+ */
+using StretchRanges = Dali::Vector< Uint16Pair >;
+
+/**
+ * @brief Get the offset of the red channel for the format.
+ *
+ * @param[in] pixelFormat The pixel format
+ * @param[out] byteOffset The byte offset of the red channel.
+ * @param[out] bitMask The bit mask of the red channel.
+ */
+DALI_TOOLKIT_API void GetRedOffsetAndMask( Dali::Pixel::Format pixelFormat, int& byteOffset, int& bitMask );
+
+/**
+ * @brief Read the borders of the buffer and determine the child area and stretch borders.
+ *
+ * @param[in] pixelBuffer The npatch image buffer.
+ * @param[out] stretchPixelsX The horizontal stretchable pixels in the cropped image space.
+ * @param[out] stretchPixelsY The vertical stretchable pixels in the cropped image space.
+ */
+DALI_TOOLKIT_API void ParseBorders( Devel::PixelBuffer& pixelBuffer, StretchRanges& stretchPixelsX, StretchRanges& stretchPixelsY );
+
+/**
+ * @brief Helper method to determine if the filename indicates that the image has a 9 patch or n patch border.
+ *
+ * @param [in] url The URL of the image file.
+ * @return true if it is a 9 patch or n patch image
+ */
+DALI_TOOLKIT_API bool IsNinePatchUrl( const std::string& url );
+
+} // namespace NPatchUtility
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_NPATCH_UTILITIES_H
index 0c6409d..d4a1f0e 100644 (file)
@@ -18,8 +18,7 @@
 // CLASS HEADER
 #include <dali-toolkit/internal/visuals/npatch-loader.h>
 
-// EXTERNAL HEADER
-#include <dali/devel-api/adaptor-framework/image-loading.h>
+// EXTERNAL INCLUDES
 #include <dali/devel-api/common/hash.h>
 #include <dali/integration-api/debug.h>
 
@@ -35,226 +34,11 @@ namespace Internal
 namespace NPatchBuffer
 {
 
-void GetRedOffsetAndMask( Dali::Pixel::Format pixelFormat, int& byteOffset, int& bitMask )
-{
-  switch( pixelFormat )
-  {
-    case Dali::Pixel::A8:
-    case Dali::Pixel::L8:
-    case Dali::Pixel::LA88:
-    {
-      byteOffset = 0;
-      bitMask = 0;
-      break;
-    }
-    case Dali::Pixel::RGB888:
-    case Dali::Pixel::RGB8888:
-    case Dali::Pixel::RGBA8888:
-    {
-      byteOffset = 0;
-      bitMask = 0xFF;
-      break;
-    }
-    case Dali::Pixel::BGR8888:
-    case Dali::Pixel::BGRA8888:
-    {
-      byteOffset = 2;
-      bitMask = 0xff;
-      break;
-    }
-    case Dali::Pixel::RGB565:
-    {
-      byteOffset = 0;
-      bitMask = 0xf8;
-      break;
-    }
-    case Dali::Pixel::BGR565:
-    {
-      byteOffset = 1;
-      bitMask = 0x1f;
-      break;
-    }
-    case Dali::Pixel::RGBA4444:
-    {
-      byteOffset = 0;
-      bitMask = 0xf0;
-      break;
-    }
-    case Dali::Pixel::BGRA4444:
-    {
-      byteOffset = 1;
-      bitMask = 0xf0;
-      break;
-    }
-    case Dali::Pixel::RGBA5551:
-    {
-      byteOffset = 0;
-      bitMask = 0xf8;
-      break;
-    }
-    case Dali::Pixel::BGRA5551:
-    {
-      byteOffset = 1;
-      bitMask = 0x1e;
-      break;
-    }
-    case Dali::Pixel::INVALID:
-    case Dali::Pixel::COMPRESSED_R11_EAC:
-    case Dali::Pixel::COMPRESSED_SIGNED_R11_EAC:
-    case Dali::Pixel::COMPRESSED_RG11_EAC:
-    case Dali::Pixel::COMPRESSED_SIGNED_RG11_EAC:
-    case Dali::Pixel::COMPRESSED_RGB8_ETC2:
-    case Dali::Pixel::COMPRESSED_SRGB8_ETC2:
-    case Dali::Pixel::COMPRESSED_RGB8_ETC1:
-    case Dali::Pixel::COMPRESSED_RGB_PVRTC_4BPPV1:
-    case Dali::Pixel::COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
-    case Dali::Pixel::COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
-    case Dali::Pixel::COMPRESSED_RGBA8_ETC2_EAC:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_4x4_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_5x4_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_5x5_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_6x5_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_6x6_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_8x5_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_8x6_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_8x8_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_10x5_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_10x6_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_10x8_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_10x10_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_12x10_KHR:
-    case Dali::Pixel::COMPRESSED_RGBA_ASTC_12x12_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
-    case Dali::Pixel::COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
-    {
-      DALI_LOG_ERROR("Pixel formats for compressed images are not compatible with simple masking-out of per-pixel alpha.\n");
-      byteOffset=0;
-      bitMask=0;
-      break;
-    }
-    case Dali::Pixel::RGB16F:
-    case Dali::Pixel::RGB32F:
-    case Dali::Pixel::DEPTH_UNSIGNED_INT:
-    case Dali::Pixel::DEPTH_FLOAT:
-    case Dali::Pixel::DEPTH_STENCIL:
-    {
-      DALI_LOG_ERROR("Pixel format not compatible.\n");
-      byteOffset=0;
-      bitMask=0;
-      break;
-    }
-  }
-}
-
-Uint16Pair ParseRange( unsigned int& index, unsigned int width, unsigned char*& pixel, unsigned int pixelStride, int testByte, int testBits, int testValue )
-{
-  unsigned int start = 0xFFFF;
-  for( ; index < width; ++index, pixel += pixelStride )
-  {
-    if( ( pixel[ testByte ] & testBits ) == testValue )
-    {
-        start = index;
-        ++index;
-        pixel += pixelStride;
-        break;
-    }
-  }
-
-  unsigned int end = width;
-  for( ; index < width; ++index, pixel += pixelStride )
-  {
-    if( ( pixel[ testByte ] & testBits ) != testValue )
-    {
-        end = index;
-        ++index;
-        pixel += pixelStride;
-        break;
-    }
-  }
-
-  return Uint16Pair( start, end );
-}
-
-void ParseBorders( Devel::PixelBuffer& pixelBuffer, NPatchLoader::Data* data  )
-{
-  data->stretchPixelsX.Clear();
-  data->stretchPixelsY.Clear();
-
-  Pixel::Format pixelFormat = pixelBuffer.GetPixelFormat();
-
-  int alphaByte = 0;
-  int alphaBits = 0;
-  Pixel::GetAlphaOffsetAndMask( pixelFormat, alphaByte, alphaBits );
-
-  int testByte = alphaByte;
-  int testBits = alphaBits;
-  int testValue = alphaBits; // Opaque == stretch
-  if( !alphaBits )
-  {
-    GetRedOffsetAndMask( pixelFormat, testByte, testBits );
-    testValue = 0;           // Black == stretch
-  }
-
-  unsigned int bytesPerPixel = Pixel::GetBytesPerPixel( pixelFormat );
-  unsigned int width = pixelBuffer.GetWidth();
-  unsigned int height = pixelBuffer.GetHeight();
-  unsigned char* srcPixels = pixelBuffer.GetBuffer();
-  unsigned int srcStride = width * bytesPerPixel;
-
-  // TOP
-  unsigned char* top = srcPixels + bytesPerPixel;
-  unsigned int index = 0;
-
-  for( ; index < width - 2; )
-  {
-    Uint16Pair range = ParseRange( index, width - 2, top, bytesPerPixel, testByte, testBits, testValue );
-    if( range.GetX() != 0xFFFF )
-    {
-      data->stretchPixelsX.PushBack( range );
-    }
-  }
-
-  // LEFT
-  unsigned char* left  = srcPixels + srcStride;
-  index = 0;
-  for( ; index < height - 2; )
-  {
-    Uint16Pair range = ParseRange( index, height - 2, left, srcStride, testByte, testBits, testValue );
-    if( range.GetX() != 0xFFFF )
-    {
-      data->stretchPixelsY.PushBack( range );
-    }
-  }
-
-  // If there are no stretch pixels then make the entire image stretchable
-  if( data->stretchPixelsX.Size() == 0 )
-  {
-    data->stretchPixelsX.PushBack( Uint16Pair( 0, width - 2 ) );
-  }
-  if( data->stretchPixelsY.Size() == 0 )
-  {
-    data->stretchPixelsY.PushBack( Uint16Pair( 0, height - 2 ) );
-  }
-}
-
 void SetLoadedNPatchData( NPatchLoader::Data* data, Devel::PixelBuffer& pixelBuffer )
 {
   if( data->border == Rect< int >( 0, 0, 0, 0 ) )
   {
-    NPatchBuffer::ParseBorders( pixelBuffer, data );
+    NPatchUtility::ParseBorders( pixelBuffer, data->stretchPixelsX, data->stretchPixelsY );
 
     // Crop the image
     pixelBuffer.Crop( 1, 1, pixelBuffer.GetWidth() - 2, pixelBuffer.GetHeight() - 2 );
@@ -328,10 +112,10 @@ std::size_t NPatchLoader::Load( TextureManager& textureManager, TextureUploadObs
 
             data->textureSet = mCache[ index ]->textureSet;
 
-            StretchRanges stretchRangesX;
+            NPatchUtility::StretchRanges stretchRangesX;
             stretchRangesX.PushBack( Uint16Pair( border.left, ( (data->croppedWidth >= static_cast< unsigned int >( border.right )) ? data->croppedWidth - border.right : 0 ) ) );
 
-            StretchRanges stretchRangesY;
+            NPatchUtility::StretchRanges stretchRangesY;
             stretchRangesY.PushBack( Uint16Pair( border.top, ( (data->croppedHeight >= static_cast< unsigned int >( border.bottom )) ? data->croppedHeight - border.bottom : 0 ) ) );
 
             data->stretchPixelsX = stretchRangesX;
index 6bdc2f9..58bd73f 100644 (file)
 // EXTERNAL INCLUDES
 #include <string>
 #include <dali/public-api/rendering/texture-set.h>
-#include <dali/public-api/math/uint-16-pair.h>
 #include <dali/devel-api/common/owner-container.h>
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 
-// INTERNAL HEADERS
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/texture-manager-impl.h>
+#include <dali-toolkit/devel-api/utility/npatch-utilities.h>
 
 namespace Dali
 {
@@ -36,13 +36,6 @@ namespace Toolkit
 namespace Internal
 {
 
-namespace NPatchBuffer
-{
-
-void GetRedOffsetAndMask( Dali::Pixel::Format pixelFormat, int& byteOffset, int& bitMask );
-
-} // namespace NPatchBuffer
-
 /**
  * The manager for loading Npatch textures.
  * It caches them internally for better performance; i.e. to avoid loading and
@@ -56,8 +49,6 @@ class NPatchLoader
 {
 public:
 
-  typedef Dali::Vector< Uint16Pair > StretchRanges;
-
   enum
   {
     UNINITIALIZED_ID = 0 ///< uninitialised id, use to initialize ids
@@ -77,8 +68,8 @@ public:
 
     std::string url;                              ///< Url of the N-Patch
     TextureSet textureSet;                        ///< Texture containing the cropped image
-    StretchRanges stretchPixelsX;                 ///< X stretch pixels
-    StretchRanges stretchPixelsY;                 ///< Y stretch pixels
+    NPatchUtility::StretchRanges stretchPixelsX;  ///< X stretch pixels
+    NPatchUtility::StretchRanges stretchPixelsY;  ///< Y stretch pixels
     std::size_t hash;                             ///< Hash code for the Url
     uint32_t croppedWidth;                        ///< Width of the cropped middle part of N-patch
     uint32_t croppedHeight;                       ///< Height of the cropped middle part of N-patch
index 57b1293..6ba1a99 100644 (file)
@@ -220,13 +220,13 @@ void AddVertex( Vector< Vector2 >& vertices, unsigned int x, unsigned int y )
   vertices.PushBack( Vector2( x, y ) );
 }
 
-void RegisterStretchProperties( Renderer& renderer, const char * uniformName, const NPatchLoader::StretchRanges& stretchPixels, uint16_t imageExtent)
+void RegisterStretchProperties( Renderer& renderer, const char * uniformName, const NPatchUtility::StretchRanges& stretchPixels, uint16_t imageExtent)
 {
   uint16_t prevEnd = 0;
   uint16_t prevFix = 0;
   uint16_t prevStretch = 0;
   unsigned int i = 1;
-  for( NPatchLoader::StretchRanges::ConstIterator it = stretchPixels.Begin(); it != stretchPixels.End(); ++it, ++i )
+  for( NPatchUtility::StretchRanges::ConstIterator it = stretchPixels.Begin(); it != stretchPixels.End(); ++it, ++i )
   {
     uint16_t start = it->GetX();
     uint16_t end = it->GetY();
@@ -507,8 +507,8 @@ Shader NPatchVisual::CreateShader()
   const NPatchLoader::Data* data;
   // 0 is either no data (load failed?) or no stretch regions on image
   // for both cases we use the default shader
-  NPatchLoader::StretchRanges::SizeType xStretchCount = 0;
-  NPatchLoader::StretchRanges::SizeType yStretchCount = 0;
+  NPatchUtility::StretchRanges::SizeType xStretchCount = 0;
+  NPatchUtility::StretchRanges::SizeType yStretchCount = 0;
 
   auto fragmentShader = mAuxiliaryPixelBuffer ? FRAGMENT_MASK_SHADER
                                               : FRAGMENT_SHADER;