Update copyright year to 2015 for public api: core

[platform/core/uifw/dali-core.git] / dali / public-api / images / encoded-buffer-image.cpp

diff --git a/dali/public-api/images/encoded-buffer-image.cpp b/dali/public-api/images/encoded-buffer-image.cpp
index 489ff1e..5c53e14 100644 (file)
--- a/dali/public-api/images/encoded-buffer-image.cpp
+++ b/dali/public-api/images/encoded-buffer-image.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) 2015 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/public-api/images/encoded-buffer-image.h>
@@ -20,6 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/common/dali-common.h>
+#include <dali/internal/common/image-attributes.h>
 #include <dali/internal/event/images/encoded-buffer-image-impl.h>
 
 namespace Dali
@@ -34,17 +36,23 @@ EncodedBufferImage::EncodedBufferImage(Internal::EncodedBufferImage* internal)
 {
 }
 
-EncodedBufferImage EncodedBufferImage::New(const uint8_t * const encodedImage, const std::size_t encodedImageByteCount, const ImageAttributes& attributes, const ReleasePolicy releasePol)
+EncodedBufferImage EncodedBufferImage::New( const uint8_t * const encodedImage,
+                                            std::size_t encodedImageByteCount,
+                                            ImageDimensions size, FittingMode::Type fittingMode, SamplingMode::Type samplingMode,
+                                            ReleasePolicy releasePol,
+                                            bool orientationCorrection )
 {
-  Internal::EncodedBufferImagePtr internal=Internal::EncodedBufferImage::New(encodedImage, encodedImageByteCount, attributes, releasePol);
+  Internal::EncodedBufferImagePtr internal = Internal::EncodedBufferImage::New( encodedImage, encodedImageByteCount, size, fittingMode, samplingMode, orientationCorrection, releasePol );
   EncodedBufferImage image(internal.Get());
   return image;
 }
 
-EncodedBufferImage EncodedBufferImage::New(const uint8_t * const encodedImage, const std::size_t encodedImageByteCount)
+EncodedBufferImage EncodedBufferImage::New( const uint8_t * const encodedImage, const std::size_t encodedImageByteCount )
 {
-  ImageAttributes attributes;
-  Internal::EncodedBufferImagePtr internal = Internal::EncodedBufferImage::New(encodedImage, encodedImageByteCount, attributes, Dali::Image::Never);
+  ImageDimensions size(0, 0);
+  FittingMode::Type fittingMode = FittingMode::DEFAULT;
+  SamplingMode::Type samplingMode = SamplingMode::DEFAULT;
+  Internal::EncodedBufferImagePtr internal = Internal::EncodedBufferImage::New( encodedImage, encodedImageByteCount, size, fittingMode, samplingMode, true, Dali::Image::NEVER );
   EncodedBufferImage image( internal.Get() );
   return image;
 }
@@ -58,4 +66,15 @@ EncodedBufferImage::~EncodedBufferImage()
 {
 }
 
+EncodedBufferImage::EncodedBufferImage( const EncodedBufferImage& handle )
+: Image(handle)
+{
+}
+
+EncodedBufferImage& EncodedBufferImage::operator=( const EncodedBufferImage& rhs )
+{
+  BaseHandle::operator=(rhs);
+  return *this;
+}
+
 } // namespace Dali