Merge "Ensure synchronous buffer decode when using encoded buffer image." into devel...

[platform/core/uifw/dali-core.git] / dali / integration-api / image-data.cpp

diff --git a/dali/integration-api/image-data.cpp b/dali/integration-api/image-data.cpp
index 067d4b4..a0d772a 100644 (file)
--- a/dali/integration-api/image-data.cpp
+++ b/dali/integration-api/image-data.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.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://floralicense.org/license/
-//
-// 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.
-//
+/*
+ * 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/integration-api/image-data.h>
@@ -68,14 +69,6 @@ ImageDataPtr ImageData::New( uint8_t * const imageBuffer, const BufferSize numBy
   return ImageDataPtr( new ImageData( imageBuffer, numBytes, imageWidth, imageHeight, pixelFormat ) );
 }
 
-uint8_t * ImageData::ReleaseImageBuffer()
-{
-  DALI_ASSERT_DEBUG( mData && "The buffer was released already." );
-  uint8_t * const data = mData;
-  mData = 0;
-  return data;
-}
-
 ImageDataPtr NewBitmapImageData( unsigned imageWidth, unsigned imageHeight, Pixel::Format pixelFormat )
 {
   DALI_ASSERT_DEBUG( pixelFormat <= Pixel::BGRA8888 && "Pixel format must be an addressable one." );