From ee48e90682dca382ac1155b89703e8dfeb78bfea Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Thu, 19 Sep 2024 09:28:49 +0200 Subject: [PATCH] U++: Fixes for C++23 in Linux --- uppsrc/Core/Stream.cpp | 2 +- uppsrc/CtrlCore/GtkDrawImage.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/Core/Stream.cpp b/uppsrc/Core/Stream.cpp index e96d795a3..a39545c74 100644 --- a/uppsrc/Core/Stream.cpp +++ b/uppsrc/Core/Stream.cpp @@ -1223,7 +1223,7 @@ String LoadFile(const char *filename) { if(len >= 0) s.SetCount(n + len); close(fd); - return s; + return String(s); } } } diff --git a/uppsrc/CtrlCore/GtkDrawImage.cpp b/uppsrc/CtrlCore/GtkDrawImage.cpp index e1dee0472..b438e5f43 100644 --- a/uppsrc/CtrlCore/GtkDrawImage.cpp +++ b/uppsrc/CtrlCore/GtkDrawImage.cpp @@ -168,14 +168,14 @@ ImageDraw::operator Image() const ImageBuffer img(isz); FetchStraight(img); Premultiply(img); - return img; + return Image(img); } Image ImageDraw::GetStraight() const { ImageBuffer img(isz); FetchStraight(img); - return img; + return Image(img); } void ImageDraw::Init(Size sz)