Fixed Image & Model problems with TypeRegistry

[problem]      A lot of error messages shown with images & model related to type-registry which
               can slow startup time due to a lot of error logging
[cause]        Image types not registering with type-registry
[solution]     Register with type-registry

Change-Id: Id38bf29974e672a00171ec803707ff23c1610d5a
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>

diff --git a/dali/internal/event/images/bitmap-image-impl.cpp b/dali/internal/event/images/bitmap-image-impl.cpp
index 4a8445e..43a433b 100644 (file)
--- a/dali/internal/event/images/bitmap-image-impl.cpp
+++ b/dali/internal/event/images/bitmap-image-impl.cpp
@@ -18,6 +18,7 @@
 #include <dali/internal/event/images/bitmap-image-impl.h>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/object/type-registry.h>
 #include <dali/integration-api/bitmap.h>
 #include <dali/internal/event/images/bitmap-external.h>
 #include <dali/internal/event/common/thread-local-storage.h>
@@ -30,6 +31,11 @@ namespace Dali
 namespace Internal
 {
 
+namespace
+{
+TypeRegistration mType( typeid( Dali::BitmapImage ), typeid( Dali::Image ), NULL );
+} // unnamed namespace
+
 BitmapImagePtr BitmapImage::New( unsigned int width, unsigned int height, Pixel::Format pixelformat, LoadPolicy loadPol, ReleasePolicy releasePol )
 {
   BitmapImagePtr internal = new BitmapImage( width, height, pixelformat, loadPol, releasePol );

diff --git a/dali/internal/event/images/encoded-buffer-image-impl.cpp b/dali/internal/event/images/encoded-buffer-image-impl.cpp
index ef62388..f5e3c5e 100644 (file)
--- a/dali/internal/event/images/encoded-buffer-image-impl.cpp
+++ b/dali/internal/event/images/encoded-buffer-image-impl.cpp
@@ -18,6 +18,7 @@
 #include <dali/internal/event/images/encoded-buffer-image-impl.h>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/object/type-registry.h>
 #include <dali/internal/event/common/thread-local-storage.h>
 #include <dali/internal/event/resources/resource-client.h>
 #include <dali/integration-api/platform-abstraction.h>
@@ -27,6 +28,11 @@ namespace Dali
 namespace Internal
 {
 
+namespace
+{
+TypeRegistration mType( typeid( Dali::EncodedBufferImage ), typeid( Dali::Image ), NULL );
+} // unnamed namespace
+
 EncodedBufferImagePtr EncodedBufferImage::New( const uint8_t * const encodedImage,
                                                const std::size_t encodedImageByteCount,
                                                const ImageAttributes& attributes,

diff --git a/dali/internal/event/images/frame-buffer-image-impl.cpp b/dali/internal/event/images/frame-buffer-image-impl.cpp
index e20e2c4..e27bad1 100644 (file)
--- a/dali/internal/event/images/frame-buffer-image-impl.cpp
+++ b/dali/internal/event/images/frame-buffer-image-impl.cpp
@@ -18,6 +18,7 @@
 #include <dali/internal/event/images/frame-buffer-image-impl.h>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/object/type-registry.h>
 #include <dali/internal/event/common/thread-local-storage.h>
 #include <dali/internal/event/resources/resource-client.h>
 
@@ -27,6 +28,11 @@ namespace Dali
 namespace Internal
 {
 
+namespace
+{
+TypeRegistration mType( typeid( Dali::FrameBufferImage ), typeid( Dali::Image ), NULL );
+} // unnamed namespace
+
 FrameBufferImage::~FrameBufferImage()
 {
 }

diff --git a/dali/internal/event/images/nine-patch-image-impl.cpp b/dali/internal/event/images/nine-patch-image-impl.cpp
index 1e660ef..b54b482 100644 (file)
--- a/dali/internal/event/images/nine-patch-image-impl.cpp
+++ b/dali/internal/event/images/nine-patch-image-impl.cpp
@@ -18,6 +18,7 @@
 #include <dali/internal/event/images/nine-patch-image-impl.h>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/object/type-registry.h>
 #include <dali/integration-api/bitmap.h>
 #include <dali/internal/event/images/bitmap-external.h>
 #include <dali/internal/event/common/thread-local-storage.h>
@@ -128,6 +129,10 @@ namespace Dali
 namespace Internal
 {
 
+namespace
+{
+TypeRegistration mType( typeid( Dali::NinePatchImage ), typeid( Dali::Image ), NULL );
+} // unnamed namespace
 
 NinePatchImagePtr NinePatchImage::New( const std::string& filename, const Dali::ImageAttributes& attributes, LoadPolicy loadPol, ReleasePolicy releasePol )
 {

diff --git a/dali/internal/event/modeling/model-impl.cpp b/dali/internal/event/modeling/model-impl.cpp
index 498e3fb..270fb37 100644 (file)
--- a/dali/internal/event/modeling/model-impl.cpp
+++ b/dali/internal/event/modeling/model-impl.cpp
@@ -29,6 +29,7 @@
 #include <dali/internal/event/modeling/model-logger.h>
 #include <dali/internal/event/modeling/model-data-impl.h>
 #include <dali/public-api/modeling/model-animation-map.h>
+#include <dali/public-api/object/type-registry.h>
 
 #include <dali/internal/event/resources/resource-client.h>
 #include <dali/internal/update/resources/resource-manager.h>
@@ -43,6 +44,11 @@ using Integration::PlatformAbstraction;
 namespace Internal
 {
 
+namespace
+{
+TypeRegistration mType( typeid( Dali::Model ), typeid( Dali::BaseHandle ), NULL );
+} // unnamed namespace
+
 using Dali::Vector4;
 
 ModelPtr Model::New(const std::string& name)