src/Graphics/LargeImageData.cpp in gosu-0.8.7.2 vs src/Graphics/LargeImageData.cpp in gosu-0.9.0.pre1

- old
+ new

@@ -4,13 +4,12 @@ #include <Gosu/Graphics.hpp> #include <Gosu/Math.hpp> #include <cmath> using namespace std; -Gosu::LargeImageData::LargeImageData(Graphics& graphics, - const Bitmap& source, unsigned partWidth, unsigned partHeight, - unsigned borderFlags) +Gosu::LargeImageData::LargeImageData(const Bitmap& source, + unsigned partWidth, unsigned partHeight, unsigned flags) { fullWidth = source.width(); fullHeight = source.height(); partsX = static_cast<unsigned>(trunc(ceil(1.0 * source.width() / partWidth))); partsY = static_cast<unsigned>(trunc(ceil(1.0 * source.height() / partHeight))); @@ -30,22 +29,22 @@ // Same for the parts on the bottom. unsigned srcHeight = partHeight; if (y == partsY - 1 && source.height() % partHeight != 0) srcHeight = source.height() % partHeight; - unsigned localBorderFlags = bfTileable; + unsigned localFlags = ifTileable; if (x == 0) - localBorderFlags = (localBorderFlags & ~bfTileableLeft) | (borderFlags & bfTileableLeft); + localFlags = (localFlags & ~ifTileableLeft) | (flags & ifTileableLeft); if (x == partsX - 1) - localBorderFlags = (localBorderFlags & ~bfTileableRight) | (borderFlags & bfTileableRight); + localFlags = (localFlags & ~ifTileableRight) | (flags & ifTileableRight); if (y == 0) - localBorderFlags = (localBorderFlags & ~bfTileableTop) | (borderFlags & bfTileableTop); + localFlags = (localFlags & ~ifTileableTop) | (flags & ifTileableTop); if (y == partsY - 1) - localBorderFlags = (localBorderFlags & ~bfTileableBottom) | (borderFlags & bfTileableBottom); + localFlags = (localFlags & ~ifTileableBottom) | (flags & ifTileableBottom); - parts[y * partsX + x].reset(graphics.createImage(source, + parts[y * partsX + x].reset(Graphics::createImage(source, x * partWidth, y * partHeight, srcWidth, srcHeight, - localBorderFlags).release()); + localFlags).release()); } } int Gosu::LargeImageData::width() const {