projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trigger svg loading early
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-vector-image-renderer.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.cpp
index
b0365ff
..
3093fcb
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-image-renderer.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,29
+18,28
@@
#include <dali/devel-api/adaptor-framework/vector-image-renderer.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/rendering/renderer.h>
#include <dali/devel-api/adaptor-framework/vector-image-renderer.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/rendering/renderer.h>
+#include <sys/stat.h>
#include <toolkit-application.h>
#include <toolkit-event-thread-callback.h>
#include <toolkit-application.h>
#include <toolkit-event-thread-callback.h>
-#include <
memory
>
+#include <
toolkit-vector-image-renderer.h
>
#include <cstring>
#include <cstring>
-#include <
sys/stat.h
>
+#include <
memory
>
namespace Dali
{
namespace Dali
{
-
namespace Internal
{
namespace Internal
{
-
namespace Adaptor
{
namespace Adaptor
{
+namespace
+{
+Dali::Internal::Adaptor::VectorImageRenderer* gVectorImageRenderer = nullptr;
+}
-class VectorImageRenderer: public Dali::BaseObject
+class VectorImageRenderer
: public Dali::BaseObject
{
public:
{
public:
-
VectorImageRenderer()
VectorImageRenderer()
- : mWidth(0),
- mHeight(0),
- mRasterizeSuccess(true)
{
}
{
}
@@
-50,6
+49,7
@@
public:
bool Load(const Vector<uint8_t>& data, float dpi)
{
bool Load(const Vector<uint8_t>& data, float dpi)
{
+ mLoadCount++;
if(strncmp(reinterpret_cast<char*>(data.Begin()), "invalid", 7) == 0)
{
return false;
if(strncmp(reinterpret_cast<char*>(data.Begin()), "invalid", 7) == 0)
{
return false;
@@
-58,46
+58,57
@@
public:
{
mRasterizeSuccess = false;
}
{
mRasterizeSuccess = false;
}
+ mLoadSuccess = true;
return true;
}
return true;
}
- bool Rasterize(Dali::Devel::PixelBuffer& buffer, float scale)
+ bool IsLoaded() const
+ {
+ return mLoadSuccess;
+ }
+
+ Dali::Devel::PixelBuffer Rasterize(uint32_t width, uint32_t height)
{
{
- return mRasterizeSuccess;
+ if(mRasterizeSuccess)
+ {
+ Devel::PixelBuffer pixelBuffer = Devel::PixelBuffer::New(width, height, Dali::Pixel::RGBA8888);
+ return pixelBuffer;
+ }
+ return Dali::Devel::PixelBuffer();
}
void GetDefaultSize(uint32_t& width, uint32_t& height) const
{
}
void GetDefaultSize(uint32_t& width, uint32_t& height) const
{
- width = 100;
+ width
= 100;
height = 100;
}
public:
height = 100;
}
public:
-
- uint32_t mWidth;
- uint32_t mHeight;
- bool mRasterizeSuccess;
+ uint32_t mWidth{0};
+ uint32_t mHeight{0};
+ uint32_t mLoadCount{0};
+ bool mLoadSuccess{false};
+ bool mRasterizeSuccess{true};
};
};
-inline VectorImageRenderer& GetImplementation(
Dali::VectorImageRenderer& renderer
)
+inline VectorImageRenderer& GetImplementation(
Dali::VectorImageRenderer& renderer
)
{
{
- DALI_ASSERT_ALWAYS(
renderer && "VectorImageRenderer handle is empty."
);
+ DALI_ASSERT_ALWAYS(
renderer && "VectorImageRenderer handle is empty."
);
BaseObject& handle = renderer.GetBaseObject();
BaseObject& handle = renderer.GetBaseObject();
- return static_cast<
Internal::Adaptor::VectorImageRenderer& >( handle
);
+ return static_cast<
Internal::Adaptor::VectorImageRenderer&>(handle
);
}
}
-inline const VectorImageRenderer& GetImplementation(
const Dali::VectorImageRenderer& renderer
)
+inline const VectorImageRenderer& GetImplementation(
const Dali::VectorImageRenderer& renderer
)
{
{
- DALI_ASSERT_ALWAYS(
renderer && "VectorImageRenderer handle is empty."
);
+ DALI_ASSERT_ALWAYS(
renderer && "VectorImageRenderer handle is empty."
);
const BaseObject& handle = renderer.GetBaseObject();
const BaseObject& handle = renderer.GetBaseObject();
- return static_cast<
const Internal::Adaptor::VectorImageRenderer& >( handle
);
+ return static_cast<
const Internal::Adaptor::VectorImageRenderer&>(handle
);
}
} // namespace Adaptor
} // namespace Internal
}
} // namespace Adaptor
} // namespace Internal
-
/********************************************************************************/
/********************************* PUBLIC CLASS *******************************/
/********************************************************************************/
/********************************************************************************/
/********************************* PUBLIC CLASS *******************************/
/********************************************************************************/
@@
-106,7
+117,9
@@
VectorImageRenderer VectorImageRenderer::New()
{
Internal::Adaptor::VectorImageRenderer* imageRenderer = new Internal::Adaptor::VectorImageRenderer();
{
Internal::Adaptor::VectorImageRenderer* imageRenderer = new Internal::Adaptor::VectorImageRenderer();
- return VectorImageRenderer( imageRenderer );
+ Internal::Adaptor::gVectorImageRenderer = imageRenderer;
+
+ return VectorImageRenderer(imageRenderer);
}
VectorImageRenderer::VectorImageRenderer()
}
VectorImageRenderer::VectorImageRenderer()
@@
-117,8
+130,8
@@
VectorImageRenderer::~VectorImageRenderer()
{
}
{
}
-VectorImageRenderer::VectorImageRenderer(
Internal::Adaptor::VectorImageRenderer* internal
)
-: BaseHandle(
internal
)
+VectorImageRenderer::VectorImageRenderer(
Internal::Adaptor::VectorImageRenderer* internal
)
+: BaseHandle(
internal
)
{
}
{
}
@@
-127,14
+140,31
@@
bool VectorImageRenderer::Load(const Vector<uint8_t>& data, float dpi)
return Internal::Adaptor::GetImplementation(*this).Load(data, dpi);
}
return Internal::Adaptor::GetImplementation(*this).Load(data, dpi);
}
-bool VectorImageRenderer::Rasterize(Dali::Devel::PixelBuffer& buffer, float scale)
+bool VectorImageRenderer::IsLoaded() const
+{
+ return Internal::Adaptor::GetImplementation(*this).IsLoaded();
+}
+
+Dali::Devel::PixelBuffer VectorImageRenderer::Rasterize(uint32_t width, uint32_t height)
{
{
- return Internal::Adaptor::GetImplementation(*this).Rasterize(
buffer, scale
);
+ return Internal::Adaptor::GetImplementation(*this).Rasterize(
width, height
);
}
}
-void VectorImageRenderer::GetDefaultSize(
uint32_t& width, uint32_t& height
) const
+void VectorImageRenderer::GetDefaultSize(
uint32_t& width, uint32_t& height
) const
{
{
- Internal::Adaptor::GetImplementation(
*this ).GetDefaultSize( width, height
);
+ Internal::Adaptor::GetImplementation(
*this).GetDefaultSize(width, height
);
}
} // namespace Dali
}
} // namespace Dali
+
+namespace Test
+{
+namespace VectorImageRenderer
+{
+uint32_t GetLoadCount()
+{
+ return Dali::Internal::Adaptor::gVectorImageRenderer->mLoadCount;
+}
+
+} // namespace VectorImageRenderer
+} // namespace Test