X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftexture-manager%2Ftexture-cache-manager.cpp;h=2dfd16f58671baf451fb7a6cb83f06b82607f4ac;hb=6a5b3abad8f924a0266b2dce03816b66c38d0cd2;hp=095f21f7ae2bce6283509162056559ba7a3d6a0d;hpb=f6e18b0390831af3b1f12cb6667a4c59256ed2c5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/texture-manager/texture-cache-manager.cpp b/dali-toolkit/internal/texture-manager/texture-cache-manager.cpp index 095f21f..2dfd16f 100644 --- a/dali-toolkit/internal/texture-manager/texture-cache-manager.cpp +++ b/dali-toolkit/internal/texture-manager/texture-cache-manager.cpp @@ -36,18 +36,22 @@ namespace { const std::string_view& GetEncodedImageBufferExtensions(Dali::EncodedImageBuffer::ImageType imageType) { + static constexpr std::string_view emptyString = ""; static const std::unordered_map gEncodedImageBufferExtensionMap = { - {Dali::EncodedImageBuffer::ImageType::REGULAR_IMAGE, ""}, + {Dali::EncodedImageBuffer::ImageType::REGULAR_IMAGE, emptyString}, {Dali::EncodedImageBuffer::ImageType::VECTOR_IMAGE, ".svg"}, {Dali::EncodedImageBuffer::ImageType::ANIMATED_VECTOR_IMAGE, ".json"}, }; const auto iter = gEncodedImageBufferExtensionMap.find(imageType); - DALI_ASSERT_DEBUG(iter != gEncodedImageBufferExtensionMap.end()); + if(DALI_LIKELY(iter != gEncodedImageBufferExtensionMap.end())) + { + return iter->second; + } - return iter->second; + return emptyString; } } // namespace #ifdef DEBUG_ENABLED