nathan/slide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

- fix build after merge

Browse Source
This commit is contained in:
Alfred Reynolds
2021-08-03 09:18:34 +12:00
parent c3086ab4ce
commit e09c4d4f9f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/imageselector.cpp
View File

@@ -50,7 +50,7 @@ int ImageSelector::getImageRotation(const std::string& fileName)
return degrees; 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()))) if(!QFileInfo::exists(QString(fileName.c_str())))
{ {
@@ -200,8 +200,8 @@ void ShuffleImageSelector::reloadImagesIfNoneLeft()
} }
} }
SortedImageSelector::SortedImageSelector(std::unique_ptr<PathTraverser>& pathTraverser, char aspect): SortedImageSelector::SortedImageSelector(std::unique_ptr<PathTraverser>& pathTraverser, char aspect, bool fitAspectAxisToWindow):
ImageSelector(pathTraverser, aspect), ImageSelector(pathTraverser, aspect, fitAspectAxisToWindow),
images() images()
{ {
srand (time(NULL)); srand (time(NULL));

2
src/imageselector.h
View File

@@ -26,7 +26,7 @@ public:
protected: protected:
int getImageRotation(const std::string &fileName); int getImageRotation(const std::string &fileName);
bool imageValidForAspect(const std::string &fileName, const int rotation); 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>& pathTraverser; std::unique_ptr<PathTraverser>& pathTraverser;
char aspect; char aspect;
bool fitAspectAxisToWindow = false; bool fitAspectAxisToWindow = false;