From: Adeel Kazmi Date: Thu, 9 Jan 2020 17:23:57 +0000 (+0000) Subject: Merge "Fix random crash in TCT when stderr is closed but we try to write to it" into... X-Git-Tag: dali_1.4.53~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6f410ceca1ec96e6cb1fdc482ae222ab58a824de;hp=9f83976fa4a70fe7f64398568efb3212a5a7024b Merge "Fix random crash in TCT when stderr is closed but we try to write to it" into devel/master --- diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 691ed18..07344eb 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -151,7 +151,7 @@ IF( NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) ADD_COMPILE_OPTIONS( -Werror ) ENDIF() -ADD_COMPILE_OPTIONS( -Wall -Wno-unused-parameter -Wno-float-equal ) +ADD_COMPILE_OPTIONS( -Wall -Wno-unused-parameter -Wno-float-equal -Wno-class-memaccess ) IF( ENABLE_COVERAGE OR "$ENV{CXXFLAGS}" MATCHES --coverage ) ADD_COMPILE_OPTIONS( --coverage ) diff --git a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp index 0f69edc..291b95f 100644 --- a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp +++ b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -236,7 +236,7 @@ void FitBuffer( Dali::Vector& bufferDestination, Dali::Vector& buffe template bool ReadBinFile( Vector &dataBuffer, std::string url, int32_t offset, int32_t count ) { - Dali::FileStream fileStream( url, FileStream::READ || FileStream::BINARY ); + Dali::FileStream fileStream( url, FileStream::READ | FileStream::BINARY ); FILE* fp = fileStream.GetFile(); if( !fp ) {