mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
fix Geom:combine when sizeof rect is zero
This commit is contained in:
@@ -74,6 +74,17 @@ function Geom:transformByScale(zx, zy)
|
||||
self:scaleBy(zx, zy)
|
||||
end
|
||||
|
||||
--[[
|
||||
return size of geom
|
||||
]]--
|
||||
function Geom:sizeof()
|
||||
if not self.w or not self.h then
|
||||
return 0
|
||||
else
|
||||
return self.w * self.h
|
||||
end
|
||||
end
|
||||
|
||||
--[[
|
||||
enlarges or shrinks dimensions or rectangles
|
||||
|
||||
@@ -91,7 +102,8 @@ return the outer rectangle that contains both us and a given rectangle
|
||||
works for rectangles, dimensions and points
|
||||
]]--
|
||||
function Geom:combine(rect_b)
|
||||
local combined = Geom:new(self)
|
||||
local combined = self:copy()
|
||||
if not rect_b or rect_b:sizeof() == 0 then return combined end
|
||||
if combined.x > rect_b.x then
|
||||
combined.x = rect_b.x
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user