From e09c4d4f9faa728eaf2d219767cb3598d212d8fb Mon Sep 17 00:00:00 2001 From: Alfred Reynolds Date: Tue, 3 Aug 2021 09:18:34 +1200 Subject: [PATCH] - fix build after merge --- src/imageselector.cpp | 6 +++--- src/imageselector.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/imageselector.cpp b/src/imageselector.cpp index c39e6a5..3a4347d 100644 --- a/src/imageselector.cpp +++ b/src/imageselector.cpp @@ -50,7 +50,7 @@ int ImageSelector::getImageRotation(const std::string& fileName) return degrees; } -bool ImageSelector::imageMatchesFilter(const std::string& fileName, int rotation) +bool ImageSelector::imageMatchesFilter(const std::string& fileName, const int rotation) { if(!QFileInfo::exists(QString(fileName.c_str()))) { @@ -200,8 +200,8 @@ void ShuffleImageSelector::reloadImagesIfNoneLeft() } } -SortedImageSelector::SortedImageSelector(std::unique_ptr& pathTraverser, char aspect): - ImageSelector(pathTraverser, aspect), +SortedImageSelector::SortedImageSelector(std::unique_ptr& pathTraverser, char aspect, bool fitAspectAxisToWindow): + ImageSelector(pathTraverser, aspect, fitAspectAxisToWindow), images() { srand (time(NULL)); diff --git a/src/imageselector.h b/src/imageselector.h index 50207a3..38f7b2e 100644 --- a/src/imageselector.h +++ b/src/imageselector.h @@ -26,7 +26,7 @@ public: protected: int getImageRotation(const std::string &fileName); bool imageValidForAspect(const std::string &fileName, const int rotation); - bool imageMatchesFilter(const std::string& fileName); + bool imageMatchesFilter(const std::string& fileName, const int rotation); std::unique_ptr& pathTraverser; char aspect; bool fitAspectAxisToWindow = false;