mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-26 08:05:38 +00:00
Fixed some Clang compiler warnings.
This commit is contained in:
parent
bb68e809f5
commit
947ab458ae
|
@ -19,8 +19,6 @@ RatingComponent::RatingComponent(bool colorizeChanges)
|
||||||
, mImageRatio {1.0f}
|
, mImageRatio {1.0f}
|
||||||
, mColorOriginalValue {DEFAULT_COLORSHIFT}
|
, mColorOriginalValue {DEFAULT_COLORSHIFT}
|
||||||
, mColorChangedValue {DEFAULT_COLORSHIFT}
|
, mColorChangedValue {DEFAULT_COLORSHIFT}
|
||||||
, mColorShift {DEFAULT_COLORSHIFT}
|
|
||||||
, mColorShiftEnd {DEFAULT_COLORSHIFT}
|
|
||||||
, mColorizeChanges {colorizeChanges}
|
, mColorizeChanges {colorizeChanges}
|
||||||
, mOverlay {true}
|
, mOverlay {true}
|
||||||
{
|
{
|
||||||
|
|
|
@ -56,8 +56,6 @@ private:
|
||||||
|
|
||||||
unsigned int mColorOriginalValue;
|
unsigned int mColorOriginalValue;
|
||||||
unsigned int mColorChangedValue;
|
unsigned int mColorChangedValue;
|
||||||
unsigned int mColorShift;
|
|
||||||
unsigned int mColorShiftEnd;
|
|
||||||
|
|
||||||
bool mColorizeChanges;
|
bool mColorizeChanges;
|
||||||
bool mOverlay;
|
bool mOverlay;
|
||||||
|
|
|
@ -130,7 +130,7 @@ void VideoComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||||
videoSize.x = glm::clamp(videoSize.x, 0.01f, 2.0f);
|
videoSize.x = glm::clamp(videoSize.x, 0.01f, 2.0f);
|
||||||
if (videoSize.y > 0.0f)
|
if (videoSize.y > 0.0f)
|
||||||
videoSize.y = glm::clamp(videoSize.y, 0.01f, 2.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;
|
mVideoAreaSize = videoSize * scale;
|
||||||
}
|
}
|
||||||
else if (elem->has("maxSize")) {
|
else if (elem->has("maxSize")) {
|
||||||
|
|
|
@ -79,7 +79,6 @@ public:
|
||||||
// zero, no resizing. This can be set before or after a video is loaded.
|
// zero, no resizing. This can be set before or after a video is loaded.
|
||||||
// setMaxSize() and setResize() are mutually exclusive.
|
// setMaxSize() and setResize() are mutually exclusive.
|
||||||
virtual void setResize(float width, float height) override = 0;
|
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.
|
// 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.
|
// This can be set before or after a video is loaded.
|
||||||
|
|
Loading…
Reference in a new issue