[dali_1.4.46] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / image-loader / atlas-upload-observer.h

diff --git a/dali-toolkit/devel-api/image-loader/atlas-upload-observer.h b/dali-toolkit/devel-api/image-loader/atlas-upload-observer.h
index 2688c1a..53d1c0e 100644 (file)
--- a/dali-toolkit/devel-api/image-loader/atlas-upload-observer.h
+++ b/dali-toolkit/devel-api/image-loader/atlas-upload-observer.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_ATLAS_UPLOAD_OBSERVER_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -18,7 +18,7 @@
  *
  */
 
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/signals/callback.h>
 
@@ -39,7 +39,7 @@ class ImageAtlas;
  *
  * Derived class should implement the UploadCompleted method which would get executed once the texture is ready.
  */
-class DALI_IMPORT_API AtlasUploadObserver
+class DALI_TOOLKIT_API AtlasUploadObserver
 {
 public: