Revert "recover PixmapImage::GetPixmap() without any parameter"

This reverts commit df7703c49db2bee2adea2bbfa7515882b3ced370.

Change-Id: I3c4a792f6db39b7799871e037a574ae4bb802ab5

diff --git a/adaptors/public-api/adaptor-framework/pixmap-image.cpp b/adaptors/public-api/adaptor-framework/pixmap-image.cpp
index fcc8715..e4b16eb 100644 (file)
--- a/adaptors/public-api/adaptor-framework/pixmap-image.cpp
+++ b/adaptors/public-api/adaptor-framework/pixmap-image.cpp
@@ -34,11 +34,6 @@ PixmapImagePtr PixmapImage::New( unsigned int width, unsigned int height, ColorD
   return image;
 }
 
-Any PixmapImage::GetPixmap()
-{
-  return mImpl->GetPixmap();
-}
-
 PixmapImagePtr PixmapImage::New( Any pixmap )
 {
   PixmapImagePtr image = new PixmapImage(0, 0, COLOR_DEPTH_DEFAULT, pixmap);

diff --git a/adaptors/public-api/adaptor-framework/pixmap-image.h b/adaptors/public-api/adaptor-framework/pixmap-image.h
index 4960a65..e0425a7 100644 (file)
--- a/adaptors/public-api/adaptor-framework/pixmap-image.h
+++ b/adaptors/public-api/adaptor-framework/pixmap-image.h
@@ -85,13 +85,6 @@ public:
   static PixmapImagePtr New( Any pixmap );
 
   /**
-   * @brief Retrieve the internal pixmap
-   *
-   * @return pixmap any object containing the internal pixmap
-   */
-  Any GetPixmap();
-
-  /**
    * @brief Get a copy of the pixels used by PixmapImage.
    *
    * This is only supported for 24 bit RGB and 32 bit RGBA internal formats

diff --git a/adaptors/x11/pixmap-image-impl-x.cpp b/adaptors/x11/pixmap-image-impl-x.cpp
index 3f96cc6..c200b64 100644 (file)
--- a/adaptors/x11/pixmap-image-impl-x.cpp
+++ b/adaptors/x11/pixmap-image-impl-x.cpp
@@ -136,12 +136,6 @@ PixmapImage::~PixmapImage()
   }
 }
 
-Any PixmapImage::GetPixmap() const
-{
-  // return ecore x11 type
-  return Any(mPixmap);
-}
-
 bool PixmapImage::GetPixels(std::vector<unsigned char>& pixbuf, unsigned& width, unsigned& height, Pixel::Format& pixelFormat) const
 {
   DALI_ASSERT_DEBUG(sizeof(unsigned) == 4);

diff --git a/adaptors/x11/pixmap-image-impl.h b/adaptors/x11/pixmap-image-impl.h
index 215323d..bd47110 100644 (file)
--- a/adaptors/x11/pixmap-image-impl.h
+++ b/adaptors/x11/pixmap-image-impl.h
@@ -54,10 +54,6 @@ public:
                           unsigned int height,
                           Dali::PixmapImage::ColorDepth depth,
                           Any pixmap);
-  /**
-   * @copydoc Dali::PixmapImage::GetPixmap()
-   */
-  Any GetPixmap() const;
 
   /**
    * @copydoc Dali::PixmapImage::GetPixels()