From 953ac7b534deec0d6288bd9d53e718e583b1a32e Mon Sep 17 00:00:00 2001 From: Yoonsang Lee Date: Sun, 17 May 2015 11:49:52 +0900 Subject: [PATCH] Move PixmapImage to public-api - Move pixmap-image.h from devel-api to public-api Change-Id: I9887502326a1b8aad050d3882d5569392fabf07a Signed-off-by: Adeel Kazmi --- adaptors/devel-api/file.list | 2 -- adaptors/{devel-api => public-api}/adaptor-framework/pixmap-image.cpp | 0 adaptors/{devel-api => public-api}/adaptor-framework/pixmap-image.h | 0 adaptors/public-api/dali.h | 1 + adaptors/public-api/file.list | 2 ++ 5 files changed, 3 insertions(+), 2 deletions(-) rename adaptors/{devel-api => public-api}/adaptor-framework/pixmap-image.cpp (100%) rename adaptors/{devel-api => public-api}/adaptor-framework/pixmap-image.h (100%) diff --git a/adaptors/devel-api/file.list b/adaptors/devel-api/file.list index fca885c..e5035d5 100644 --- a/adaptors/devel-api/file.list +++ b/adaptors/devel-api/file.list @@ -11,7 +11,6 @@ devel_api_src_files = \ $(adaptor_devel_api_dir)/adaptor-framework/imf-manager.cpp \ $(adaptor_devel_api_dir)/adaptor-framework/performance-logger.cpp \ $(adaptor_devel_api_dir)/adaptor-framework/physical-keyboard.cpp \ - $(adaptor_devel_api_dir)/adaptor-framework/pixmap-image.cpp \ $(adaptor_devel_api_dir)/adaptor-framework/singleton-service.cpp \ $(adaptor_devel_api_dir)/adaptor-framework/sound-player.cpp \ $(adaptor_devel_api_dir)/adaptor-framework/style-monitor.cpp \ @@ -37,7 +36,6 @@ devel_api_adaptor_framework_header_files = \ $(adaptor_devel_api_dir)/adaptor-framework/imf-manager.h \ $(adaptor_devel_api_dir)/adaptor-framework/lifecycle-controller.h \ $(adaptor_devel_api_dir)/adaptor-framework/performance-logger.h \ - $(adaptor_devel_api_dir)/adaptor-framework/pixmap-image.h \ $(adaptor_devel_api_dir)/adaptor-framework/render-surface.h \ $(adaptor_devel_api_dir)/adaptor-framework/singleton-service.h \ $(adaptor_devel_api_dir)/adaptor-framework/sound-player.h \ diff --git a/adaptors/devel-api/adaptor-framework/pixmap-image.cpp b/adaptors/public-api/adaptor-framework/pixmap-image.cpp similarity index 100% rename from adaptors/devel-api/adaptor-framework/pixmap-image.cpp rename to adaptors/public-api/adaptor-framework/pixmap-image.cpp diff --git a/adaptors/devel-api/adaptor-framework/pixmap-image.h b/adaptors/public-api/adaptor-framework/pixmap-image.h similarity index 100% rename from adaptors/devel-api/adaptor-framework/pixmap-image.h rename to adaptors/public-api/adaptor-framework/pixmap-image.h diff --git a/adaptors/public-api/dali.h b/adaptors/public-api/dali.h index 10b1550..e69f1bc 100644 --- a/adaptors/public-api/dali.h +++ b/adaptors/public-api/dali.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #endif //__DALI_H__ diff --git a/adaptors/public-api/file.list b/adaptors/public-api/file.list index 2054c8c..f0f756b 100644 --- a/adaptors/public-api/file.list +++ b/adaptors/public-api/file.list @@ -4,6 +4,7 @@ public_api_src_files = \ $(adaptor_public_api_dir)/adaptor-framework/orientation.cpp \ $(adaptor_public_api_dir)/adaptor-framework/window.cpp \ $(adaptor_public_api_dir)/adaptor-framework/timer.cpp \ + $(adaptor_public_api_dir)/adaptor-framework/pixmap-image.cpp \ $(adaptor_public_api_dir)/dali-adaptor-version.cpp @@ -18,6 +19,7 @@ public_api_adaptor_framework_header_files = \ $(adaptor_public_api_dir)/adaptor-framework/orientation.h \ $(adaptor_public_api_dir)/adaptor-framework/style-change.h \ $(adaptor_public_api_dir)/adaptor-framework/timer.h \ + $(adaptor_public_api_dir)/adaptor-framework/pixmap-image.h \ $(adaptor_public_api_dir)/adaptor-framework/window.h adaptor_dali_header_file = \ -- 2.7.4