From bd68e2e7d803b5535023a3480836ceba3855d7e1 Mon Sep 17 00:00:00 2001 From: "joogab.yun" Date: Tue, 23 Jul 2024 13:59:52 +0900 Subject: [PATCH] Revert "[Tizen] Make GetTexture() method" This reverts commit 3f60750ac69e47975673b5a6b7630cc4a517b73a. --- dali/internal/system/common/capture-impl.cpp | 10 ++-------- dali/internal/system/common/capture-impl.h | 5 ----- dali/public-api/capture/capture.cpp | 5 ----- dali/public-api/capture/capture.h | 8 -------- 4 files changed, 2 insertions(+), 26 deletions(-) diff --git a/dali/internal/system/common/capture-impl.cpp b/dali/internal/system/common/capture-impl.cpp index 961774a..0ea8f40 100644 --- a/dali/internal/system/common/capture-impl.cpp +++ b/dali/internal/system/common/capture-impl.cpp @@ -40,8 +40,8 @@ namespace Adaptor { namespace { -constexpr int32_t SHADER_VERSION_NATIVE_IMAGE_SOURCE_AVAILABLE = 300; -constexpr uint32_t TIME_OUT_DURATION = 1000; +constexpr int32_t GL_VERSION_NATIVE_IMAGE_SOURCE_AVAILABLE = 30; +constexpr uint32_t TIME_OUT_DURATION = 1000; } // namespace Capture::Capture() @@ -123,11 +123,6 @@ Dali::NativeImageSourcePtr Capture::GetNativeImageSource() const return mNativeImageSourcePtr; } -Dali::Texture Capture::GetTexture() const -{ - return mTexture; -} - Dali::Devel::PixelBuffer Capture::GetCapturedBuffer() { if(!mPixelBuffer || (mPixelBuffer && !mPixelBuffer.GetBuffer())) @@ -353,7 +348,6 @@ bool Capture::SaveFile() { return Dali::DevelNativeImageSource::EncodeToFile(*mNativeImageSourcePtr, mPath, mQuality); } - return false; } diff --git a/dali/internal/system/common/capture-impl.h b/dali/internal/system/common/capture-impl.h index af143e2..5f6e594 100644 --- a/dali/internal/system/common/capture-impl.h +++ b/dali/internal/system/common/capture-impl.h @@ -91,11 +91,6 @@ public: Dali::Devel::PixelBuffer GetCapturedBuffer(); /** - * @copydoc Dali::Capture::GetTexture - */ - Dali::Texture GetTexture() const; - - /** * @copydoc Dali::Capture::FinishedSignal */ Dali::Capture::CaptureFinishedSignalType& FinishedSignal(); diff --git a/dali/public-api/capture/capture.cpp b/dali/public-api/capture/capture.cpp index e19a88c..faa5c1e 100644 --- a/dali/public-api/capture/capture.cpp +++ b/dali/public-api/capture/capture.cpp @@ -88,11 +88,6 @@ Dali::NativeImageSourcePtr Capture::GetNativeImageSource() const return GetImpl(*this).GetNativeImageSource(); } -Dali::Texture Capture::GetTexture() const -{ - return GetImpl(*this).GetTexture(); -} - Capture::CaptureFinishedSignalType& Capture::FinishedSignal() { return GetImpl(*this).FinishedSignal(); diff --git a/dali/public-api/capture/capture.h b/dali/public-api/capture/capture.h index 79b1a55..3dd9275 100644 --- a/dali/public-api/capture/capture.h +++ b/dali/public-api/capture/capture.h @@ -21,7 +21,6 @@ // EXTERNAL HEADERS #include #include -#include #include // INTERNAL INCLUDES @@ -261,13 +260,6 @@ public: Dali::NativeImageSourcePtr GetNativeImageSource() const; /** - * @brief Get Texture of captured image. - * - * @return Texture Captured result - */ - Dali::Texture GetTexture() const; - - /** * @brief Get finished signal. * * @SINCE_1_3_4 -- 2.7.4