From d7b00f15081e017886eaffe782578d99afebd89d Mon Sep 17 00:00:00 2001 From: Wonsik Jung Date: Wed, 28 Aug 2019 09:32:29 +0900 Subject: [PATCH] Revert "[Tizen] Add environment variable to manually set DPI" This reverts commit ad4898808c2dc87aeb6c3338872529c05f27d73d. --- dali/internal/system/common/environment-variables.h | 4 ---- dali/internal/window-system/common/window-render-surface.cpp | 11 +---------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/dali/internal/system/common/environment-variables.h b/dali/internal/system/common/environment-variables.h index 3d63c00..0947bdb 100644 --- a/dali/internal/system/common/environment-variables.h +++ b/dali/internal/system/common/environment-variables.h @@ -118,10 +118,6 @@ namespace Adaptor #define DALI_ENV_WEB_ENGINE_NAME "DALI_WEB_ENGINE_NAME" -#define DALI_ENV_DPI_HORIZONTAL "DALI_DPI_HORIZONTAL" - -#define DALI_ENV_DPI_VERTICAL "DALI_DPI_VERTICAL" - } // namespace Adaptor } // namespace Internal diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp index bd335f6..3a316f8 100644 --- a/dali/internal/window-system/common/window-render-surface.cpp +++ b/dali/internal/window-system/common/window-render-surface.cpp @@ -184,16 +184,7 @@ PositionSize WindowRenderSurface::GetPositionSize() const void WindowRenderSurface::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { - const char* environmentDpiX = std::getenv("DALI_ENV_DPI_HORIZONTAL"); - dpiHorizontal = environmentDpiX ? std::atoi(environmentDpiX) : 0; - - const char* environmentDpiY = std::getenv("DALI_ENV_DPI_VERTICAL"); - dpiVertical = environmentDpiY ? std::atoi(environmentDpiY) : 0; - - if( dpiHorizontal == 0 || dpiVertical == 0 ) - { - mWindowBase->GetDpi( dpiHorizontal, dpiVertical ); - } + mWindowBase->GetDpi( dpiHorizontal, dpiVertical ); } void WindowRenderSurface::InitializeGraphics() -- 2.7.4