diff --git a/src/modules/graphics/opengl/GLBuffer.cpp b/src/modules/graphics/opengl/GLBuffer.cpp index 3d76e9dc0..679a4794b 100644 --- a/src/modules/graphics/opengl/GLBuffer.cpp +++ b/src/modules/graphics/opengl/GLBuffer.cpp @@ -264,7 +264,7 @@ QuadIndices::QuadIndices(size_t size) } catch (std::bad_alloc &) { - delete[] newbuffer; + delete newbuffer; delete[] newindices; throw love::Exception("Out of memory."); } diff --git a/src/modules/image/wrap_ImageData.lua b/src/modules/image/wrap_ImageData.lua index 53ba0e964..2f1ee5f28 100644 --- a/src/modules/image/wrap_ImageData.lua +++ b/src/modules/image/wrap_ImageData.lua @@ -27,6 +27,7 @@ local ImageData = ImageData_mt.__index local tonumber, assert, error = tonumber, assert, error local type, pcall = type, pcall +local floor = math.floor local function inside(x, y, w, h) return x >= 0 and x < w and y >= 0 and y < h @@ -204,6 +205,11 @@ function ImageData:_mapPixelUnsafe(func, ix, iy, iw, ih) local p = objectcache[self] local idw, idh = p.width, p.height + ix = floor(ix) + iy = floor(iy) + iw = floor(iw) + ih = floor(ih) + local pixels = p.pointer local tolua = p.tolua local fromlua = p.fromlua @@ -221,6 +227,9 @@ function ImageData:getPixel(x, y) if type(x) ~= "number" then error("bad argument #1 to ImageData:getPixel (expected number)", 2) end if type(y) ~= "number" then error("bad argument #2 to ImageData:getPixel (expected number)", 2) end + x = floor(x) + y = floor(y) + local p = objectcache[self] if not inside(x, y, p.width, p.height) then error("Attempt to get out-of-range pixel!", 2) end @@ -236,6 +245,9 @@ function ImageData:setPixel(x, y, r, g, b, a) if type(x) ~= "number" then error("bad argument #1 to ImageData:setPixel (expected number)", 2) end if type(y) ~= "number" then error("bad argument #2 to ImageData:setPixel (expected number)", 2) end + x = floor(x) + y = floor(y) + if type(r) == "table" then local t = r r, g, b, a = t[1], t[2], t[3], t[4] diff --git a/src/modules/sound/wrap_SoundData.lua b/src/modules/sound/wrap_SoundData.lua index 023236a17..2a4d95f49 100644 --- a/src/modules/sound/wrap_SoundData.lua +++ b/src/modules/sound/wrap_SoundData.lua @@ -35,6 +35,7 @@ local status, ffi = pcall(require, "ffi") if not status then return end local tonumber, assert, error = tonumber, assert, error +local floor = math.floor local float = ffi.typeof("float") local datatypes = {ffi.typeof("uint8_t *"), ffi.typeof("int16_t *")} @@ -78,6 +79,8 @@ local objectcache = setmetatable({}, { function SoundData:getSample(i) if type(i) ~= "number" then error("bad argument #1 to SoundData:getSample (expected number)", 2) end + i = floor(i) + local p = objectcache[self] if not (i >= 0 and i < p.size/p.bytedepth) then @@ -97,6 +100,8 @@ function SoundData:setSample(i, sample) if type(i) ~= "number" then error("bad argument #1 to SoundData:setSample (expected number)", 2) end if type(sample) ~= "number" then error("bad argument #2 to SoundData:setSample (expected number)", 2) end + i = floor(i) + local p = objectcache[self] if not (i >= 0 and i < p.size/p.bytedepth) then