From 947ab458aeb3869439199c8e4e0a930b53b4e99d Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sat, 3 Sep 2022 16:39:59 +0200
Subject: [PATCH] Fixed some Clang compiler warnings.
---
es-core/src/components/RatingComponent.cpp | 2 --
es-core/src/components/RatingComponent.h | 2 --
es-core/src/components/VideoComponent.cpp | 2 +-
es-core/src/components/VideoComponent.h | 1 -
4 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/es-core/src/components/RatingComponent.cpp b/es-core/src/components/RatingComponent.cpp
index 5946c5230..adb1e6b79 100644
--- a/es-core/src/components/RatingComponent.cpp
+++ b/es-core/src/components/RatingComponent.cpp
@@ -19,8 +19,6 @@ RatingComponent::RatingComponent(bool colorizeChanges)
, mImageRatio {1.0f}
, mColorOriginalValue {DEFAULT_COLORSHIFT}
, mColorChangedValue {DEFAULT_COLORSHIFT}
- , mColorShift {DEFAULT_COLORSHIFT}
- , mColorShiftEnd {DEFAULT_COLORSHIFT}
, mColorizeChanges {colorizeChanges}
, mOverlay {true}
{
diff --git a/es-core/src/components/RatingComponent.h b/es-core/src/components/RatingComponent.h
index 9a1659d4a..138a2cb9e 100644
--- a/es-core/src/components/RatingComponent.h
+++ b/es-core/src/components/RatingComponent.h
@@ -56,8 +56,6 @@ private:
unsigned int mColorOriginalValue;
unsigned int mColorChangedValue;
- unsigned int mColorShift;
- unsigned int mColorShiftEnd;
bool mColorizeChanges;
bool mOverlay;
diff --git a/es-core/src/components/VideoComponent.cpp b/es-core/src/components/VideoComponent.cpp
index 3e0d46ab0..878745621 100644
--- a/es-core/src/components/VideoComponent.cpp
+++ b/es-core/src/components/VideoComponent.cpp
@@ -130,7 +130,7 @@ void VideoComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
videoSize.x = glm::clamp(videoSize.x, 0.01f, 2.0f);
if (videoSize.y > 0.0f)
videoSize.y = glm::clamp(videoSize.y, 0.01f, 2.0f);
- setResize(videoSize * scale);
+ setResize(videoSize.x * scale.x, videoSize.y * scale.y);
mVideoAreaSize = videoSize * scale;
}
else if (elem->has("maxSize")) {
diff --git a/es-core/src/components/VideoComponent.h b/es-core/src/components/VideoComponent.h
index 96000837b..b1e59da1e 100644
--- a/es-core/src/components/VideoComponent.h
+++ b/es-core/src/components/VideoComponent.h
@@ -79,7 +79,6 @@ public:
// zero, no resizing. This can be set before or after a video is loaded.
// setMaxSize() and setResize() are mutually exclusive.
virtual void setResize(float width, float height) override = 0;
- void setResize(const glm::vec2& size) { setResize(size.x, size.y); }
// Resize the video to be as large as possible but fit within a box of this size.
// This can be set before or after a video is loaded.