libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 18:27:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Fix compiler warning

Browse Source 
../scummvm/gui/options.cpp: In member function 'virtual void GUI::OptionsDialog::apply()':
../scummvm/gui/options.cpp:647:82: warning: comparison of integer expressions of different signedness: 'uint' {aka 'unsigned int'} and 'int' [-Wsign-compare]
  647 |     else if (scalerPlugins[defaultScaler]->get<ScalerPluginObject>().getFactor() != g_system->getDefaultScaleFactor())
      |              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
Orgad Shaneh 2021-06-24 11:34:15 +03:00
parent 9198d7364a
commit 780c4568c1
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/graphics/graphics.h
View File

@ -64,7 +64,7 @@ public:
virtual bool setStretchMode(int mode) { return false; }
virtual int getStretchMode() const { return 0; }
virtual uint getDefaultScaler() const { return 0; }
virtual int getDefaultScaleFactor() const { return 1; }
virtual uint getDefaultScaleFactor() const { return 1; }
virtual bool setScaler(uint mode, int factor) { return false; }
virtual uint getScaler() const { return 0; }

2
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View File

@ -557,7 +557,7 @@ uint SurfaceSdlGraphicsManager::getDefaultScaler() const {
return ScalerMan.findScalerPluginIndex("normal");
}
int SurfaceSdlGraphicsManager::getDefaultScaleFactor() const {
uint SurfaceSdlGraphicsManager::getDefaultScaleFactor() const {
#ifdef USE_SCALERS
return 2;
#else

2
backends/graphics/surfacesdl/surfacesdl-graphics.h
View File

@ -74,7 +74,7 @@ public:
virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
virtual int getGraphicsMode() const override;
virtual uint getDefaultScaler() const override;
virtual int getDefaultScaleFactor() const override;
virtual uint getDefaultScaleFactor() const override;
virtual bool setScaler(uint mode, int factor) override;
virtual uint getScaler() const override;
#ifdef USE_RGB_COLOR

2
backends/modular-backend.cpp
View File

@ -112,7 +112,7 @@ uint ModularGraphicsBackend::getDefaultScaler() const {
return _graphicsManager->getDefaultScaler();
}
int ModularGraphicsBackend::getDefaultScaleFactor() const {
uint ModularGraphicsBackend::getDefaultScaleFactor() const {
return _graphicsManager->getDefaultScaleFactor();
}

2
backends/modular-backend.h
View File

@ -77,7 +77,7 @@ public:
virtual bool setStretchMode(int mode) override final;
virtual int getStretchMode() const override final;
virtual uint getDefaultScaler() const override final;
virtual int getDefaultScaleFactor() const override final;
virtual uint getDefaultScaleFactor() const override final;
virtual bool setScaler(uint mode, int factor) override final;
virtual uint getScaler() const override final;
#ifdef USE_RGB_COLOR

2
common/system.h
View File

@ -886,7 +886,7 @@ public:
*
* @return The 'default' scale factor.
*/
virtual int getDefaultScaleFactor() const { return 1; }
virtual uint getDefaultScaleFactor() const { return 1; }
/**
* Switch to the specified scaler.