Remove dead code: BitmapExternal; not been used for a while, not even included in...

Change-Id: I9e47e8ef7d14ee97e4aa5d037439cba0e24c0e49

diff --git a/dali/integration-api/bitmap.h b/dali/integration-api/bitmap.h
index fb099ef..a6a2523 100644 (file)
--- a/dali/integration-api/bitmap.h
+++ b/dali/integration-api/bitmap.h
@@ -48,8 +48,6 @@ typedef unsigned char                 PixelBuffer;  ///< Pixel data buffers are
 /**
  * Bitmap class.
  * An abstract container for image data.
- * \sa{BitmapPackedPixel BitmapCompressed BitmapExternal} for concrete
- * subclasses.
  */
 class DALI_IMPORT_API Bitmap : public Dali::RefObject
 {

diff --git a/dali/internal/event/images/bitmap-compressed.h b/dali/internal/event/images/bitmap-compressed.h
index 85241e9..4f8e20c 100644 (file)
--- a/dali/internal/event/images/bitmap-compressed.h
+++ b/dali/internal/event/images/bitmap-compressed.h
@@ -36,7 +36,6 @@ typedef IntrusivePtr<BitmapCompressed>        BitmapCompressedPtr;
  * A container for image data that remains in compresssed form as an opaque blob
  * in memory rather than being decompressed at load time.
  * Used for formats that are supported as GLES texture data directly.
- * \sa{Bitmap BitmapPackedPixel BitmapExternal}
  */
 class BitmapCompressed : public Dali::Integration::Bitmap, Dali::Integration::Bitmap::CompressedProfile
 {

diff --git a/dali/internal/event/images/bitmap-external.cpp b/dali/internal/event/images/bitmap-external.cpp
deleted file mode 100644 (file)
index d4a81dd..0000000
--- a/dali/internal/event/images/bitmap-external.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/event/images/bitmap-external.h>
-
-// INTERNAL INCLUDES
-#include <dali/internal/common/core-impl.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-// use power of two bufferWidth and bufferHeight for better performance
-BitmapExternal::BitmapExternal(Dali::Integration::PixelBuffer* pixBuf,
-               unsigned int width,
-               unsigned int height,
-               Pixel::Format pixelFormat,
-               unsigned int bufferWidth,
-               unsigned int bufferHeight)
-: BitmapPackedPixel(ResourcePolicy::NOT_OWNED, NULL/*pixBuf is externally owned*/),
-  mExternalData(pixBuf)
-{
-  mImageWidth   = width;
-  mImageHeight  = height;
-  mBufferWidth  = (bufferWidth  != 0) ? bufferWidth  : width;
-  mBufferHeight = (bufferHeight != 0) ? bufferHeight : height;
-  mPixelFormat  = pixelFormat;
-
-  mBytesPerPixel = Pixel::GetBytesPerPixel(pixelFormat);
-  mHasAlphaChannel = Pixel::HasAlpha(pixelFormat);
-  mAlphaChannelUsed = mHasAlphaChannel;
-
-  DALI_ASSERT_DEBUG(mBufferWidth >= mImageWidth && mBufferHeight >= mImageHeight);
-}
-
-BitmapExternal::~BitmapExternal()
-{
-  DALI_LOG_TRACE_METHOD(Debug::Filter::gImage);
-}
-
-} //namespace Internal
-
-} //namespace Dali

diff --git a/dali/internal/event/images/bitmap-external.h b/dali/internal/event/images/bitmap-external.h
deleted file mode 100644 (file)
index b822934..0000000
--- a/dali/internal/event/images/bitmap-external.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#ifndef __DALI_INTERNAL_BITMAP_EXTERNAL_H__
-#define __DALI_INTERNAL_BITMAP_EXTERNAL_H__
-
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-
-// INTERNAL INCLUDES
-#include <dali/internal/event/images/bitmap-packed-pixel.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-/**
- * Bitmap class.
- * A container for external image data
- */
-class BitmapExternal : public BitmapPackedPixel
-{
-public:
-  /**
-   * Constructor
-   */
-
-  /**
-   * Creates new BitmapExternal instance with pixel buffer pointer and details.
-   * Application has ownership of the buffer, its contents can be modified.
-   * Bitmap stores given size information about the image.
-   * @pre bufferWidth, bufferHeight have to be power of two
-   * @param[in] pixBuf        pointer to external pixel buffer
-   * @param[in] width         Image width in pixels
-   * @param[in] height        Image height in pixels
-   * @param[in] pixelformat   pixel format
-   * @param[in] bufferWidth   Buffer width in pixels
-   * @param[in] bufferHeight  Buffer height in pixels
-   */
-  BitmapExternal(Dali::Integration::PixelBuffer* pixBuf,
-                 unsigned int width,
-                 unsigned int height,
-                 Pixel::Format pixelformat,
-                 unsigned int bufferWidth  = 0,
-                 unsigned int bufferHeight = 0);
-
-  /**
-   * This does nothing, data is owned by external application.
-   */
-  virtual Dali::Integration::PixelBuffer* ReserveBuffer(Pixel::Format pixelFormat,
-                                     unsigned int width,
-                                     unsigned int height,
-                                     unsigned int bufferWidth = 0,
-                                     unsigned int bufferHeight = 0)
-  {
-    return NULL;
-  }
-
-  /**
-   * Get the pixel buffer
-   * @return The buffer. You can modify its contents.
-   */
-  virtual Dali::Integration::PixelBuffer* GetBuffer()
-  {
-    return mExternalData;
-  }
-
-protected:
-  /**
-   * A reference counted object may only be deleted by calling Unreference()
-   */
-  virtual ~BitmapExternal();
-
-private:
-
-  Dali::Integration::PixelBuffer* mExternalData; ///< Externally owned pixel data
-
-private:
-  BitmapExternal();  ///< defined private to prevent use
-  BitmapExternal(const BitmapExternal& other);  ///< defined private to prevent use
-  BitmapExternal& operator = (const BitmapExternal& other); ///< defined private to prevent use
-
-  // Changes scope, should be at end of class
-  DALI_LOG_OBJECT_STRING_DECLARATION;
-};
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // __DALI_INTERNAL_BITMAP_EXTERNAL_H__

diff --git a/dali/internal/event/images/bitmap-packed-pixel.h b/dali/internal/event/images/bitmap-packed-pixel.h
index 4fc6967..1cac21b 100644 (file)
--- a/dali/internal/event/images/bitmap-packed-pixel.h
+++ b/dali/internal/event/images/bitmap-packed-pixel.h
@@ -38,8 +38,6 @@ typedef IntrusivePtr<BitmapPackedPixel>        BitmapPackedPixelPtr;
  * number of bytes.
  * This is a vanilla Bitmap class, typically used to hold data decompressed
  * from PNG and JPEG file formats for example.
- *
- * \sa{Bitmap BitmapCompressed BitmapExternal}
  */
 class BitmapPackedPixel : public Dali::Integration::Bitmap, Dali::Integration::Bitmap::PackedPixelsProfile
 {