From 3a1cd896c536c61e40098859d499032180deee5b Mon Sep 17 00:00:00 2001
From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 29 May 2015 11:32:15 +0100
Subject: [PATCH] Support moving of native-image-interface and image-operations
 to public-api

Change-Id: I46f03e922dcb2c90dfeef27e68c45f7a403e8513
---
 adaptors/common/native-bitmap-buffer-impl.h                             | 2 +-
 adaptors/public-api/adaptor-framework/pixmap-image.h                    | 2 +-
 .../src/dali-adaptor/dali-test-suite-utils/test-native-image.h          | 2 +-
 .../src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h  | 2 +-
 platform-abstractions/portable/image-operations.h                       | 2 +-
 platform-abstractions/tizen/image-loaders/image-loader-input.h          | 2 +-
 platform-abstractions/tizen/image-loaders/image-loader.h                | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/adaptors/common/native-bitmap-buffer-impl.h b/adaptors/common/native-bitmap-buffer-impl.h
index 6873348..b7f4dc3 100644
--- a/adaptors/common/native-bitmap-buffer-impl.h
+++ b/adaptors/common/native-bitmap-buffer-impl.h
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL HEADERS
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/public-api/images/pixel.h>
 #include <dali/integration-api/gl-abstraction.h>
 #include <dali/integration-api/lockless-buffer.h>
diff --git a/adaptors/public-api/adaptor-framework/pixmap-image.h b/adaptors/public-api/adaptor-framework/pixmap-image.h
index 22e05dc..4207089 100644
--- a/adaptors/public-api/adaptor-framework/pixmap-image.h
+++ b/adaptors/public-api/adaptor-framework/pixmap-image.h
@@ -22,7 +22,7 @@
 #include <string>
 
 #include <dali/public-api/common/vector-wrapper.h>
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/public-api/images/pixel.h>
 #include <dali/public-api/object/any.h>
 
diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
index 30f559c..720b429 100644
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 
 namespace Dali
 {
diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h
index e9e6131..9ff1142 100644
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <stdint.h>
 #include <cstring>
-#include <dali/devel-api/images/image-operations.h>
+#include <dali/public-api/images/image-operations.h>
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/common/set-wrapper.h>
diff --git a/platform-abstractions/portable/image-operations.h b/platform-abstractions/portable/image-operations.h
index 075b345..2deb110 100644
--- a/platform-abstractions/portable/image-operations.h
+++ b/platform-abstractions/portable/image-operations.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/bitmap.h>
-#include <dali/devel-api/images/image-operations.h>
+#include <dali/public-api/images/image-operations.h>
 
 namespace Dali
 {
diff --git a/platform-abstractions/tizen/image-loaders/image-loader-input.h b/platform-abstractions/tizen/image-loaders/image-loader-input.h
index fb9bbc7..7aecffe 100644
--- a/platform-abstractions/tizen/image-loaders/image-loader-input.h
+++ b/platform-abstractions/tizen/image-loaders/image-loader-input.h
@@ -19,7 +19,7 @@
 
 // EXTERNAL INCLUDES
 #include <cstdio>
-#include <dali/devel-api/images/image-operations.h>
+#include <dali/public-api/images/image-operations.h>
 
 // INTERNAL INCLUDES
 
diff --git a/platform-abstractions/tizen/image-loaders/image-loader.h b/platform-abstractions/tizen/image-loaders/image-loader.h
index 443165c..15e3318 100644
--- a/platform-abstractions/tizen/image-loaders/image-loader.h
+++ b/platform-abstractions/tizen/image-loaders/image-loader.h
@@ -18,7 +18,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/images/image-operations.h>
+#include <dali/public-api/images/image-operations.h>
 #include <dali/integration-api/resource-cache.h>
 #include <dali/integration-api/resource-types.h>
 #include <dali/integration-api/bitmap.h>
-- 
2.7.4