Skip to content

Commit fe2f7bb

Browse files
author
Christian Feldmann
committed
Fix linux compilation
1 parent eb9ec32 commit fe2f7bb

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

YUViewLib/src/handler/ItemMemoryHandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct ItemData
5656
return QString("File: %1 Last Changed: %2 Format: %3")
5757
.arg(filePath)
5858
.arg(itemChangedLast.toString("yy-M-d H-m-s"))
59-
.arg(format);
59+
.arg(QString::fromStdString(format));
6060
}
6161
};
6262

YUViewLib/src/video/rgb/videoHandlerRGB.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ bool videoHandlerRGB::setFormatFromString(const std::string_view format)
234234
if (split.size() != 4 || split.at(2) != "RGB")
235235
return false;
236236

237-
if (!FrameHandler::setFormatFromString(std::string(split.at(0) + ";" + split.at(1))))
237+
if (!FrameHandler::setFormatFromString(std::string(split.at(0)) + ";" + std::string(split.at(1))))
238238
return false;
239239

240240
auto fmt = PixelFormatRGB(split.at(3));

YUViewLib/src/video/yuv/videoHandlerYUV.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3159,7 +3159,7 @@ bool videoHandlerYUV::setFormatFromString(const std::string_view format)
31593159
if (split.size() != 4 || split[2] != "YUV")
31603160
return false;
31613161

3162-
const auto frameFormat = std::string(split.at(0) + ";" + split.at(1));
3162+
const auto frameFormat = std::string(split.at(0)) + ";" + std::string(split.at(1));
31633163
if (!FrameHandler::setFormatFromString(frameFormat))
31643164
return false;
31653165

YUViewUnitTest/video/rgb/videoHandlerRGBTest.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
* along with this program. If not, see <http://www.gnu.org/licenses/>.
3131
*/
3232

33-
#include "video/rgb/PixelFormatRGB.h"
3433
#include "gtest/gtest.h"
3534
#include <common/Testing.h>
3635
#include <video/rgb/videoHandlerRGB.h>

0 commit comments

Comments
 (0)