Fixed minor compiler warning, and bumped version #.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2990 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-09-03 15:23:36 +00:00
parent 4b6f589a4e
commit b7cdaad634
3 changed files with 3 additions and 3 deletions

View File

@ -190,7 +190,7 @@ void FBSurfaceSDL2::resize(uInt32 width, uInt32 height)
{
// We will only resize when necessary, and not using static textures
if((myTexAccess == SDL_TEXTUREACCESS_STATIC) ||
(width <= mySurface->w && height <= mySurface->h))
(int(width) <= mySurface->w && int(height) <= mySurface->h))
return; // don't need to resize at all
if(mySurface)

View File

@ -22,7 +22,7 @@
#include <cstdlib>
#define STELLA_VERSION "4.1"
#define STELLA_VERSION "4.2_pre"
#define STELLA_BUILD atoi("$Rev$" + 6)
#endif

View File

@ -41,7 +41,7 @@ CartridgeMDMWidget::CartridgeMDMWidget(
ypos = addBaseInformation(size, "Edwin Blink", info.str(), 15) + myLineHeight;
VariantList items;
for(uInt32 i = 0x800; i < 0x800 + myCart.bankCount(); ++i)
for(uInt32 i = 0x800; i < (0x800 + myCart.bankCount()); ++i)
{
info.str("");
info << dec << (i & 0xFF) << " ($" << Common::Base::HEX4 << i << ")";