mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-09 18:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gfx::SizeT::createUnion() function

Browse Source
This commit is contained in:
David Capello 2016-04-19 14:09:18 -03:00
parent 82f4d21507
commit c9c4838641
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gfx/size.h
View File

@ -1,5 +1,5 @@
// Aseprite Gfx Library // Aseprite Gfx Library
// Copyright (C) 2001-2013, 2015 David Capello // Copyright (C) 2001-2016 David Capello
// //
// This file is released under the terms of the MIT license. // This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information. // Read LICENSE.txt for more information.
@ -40,8 +40,8 @@ public:
} }
SizeT createUnion(const SizeT& sz) const { SizeT createUnion(const SizeT& sz) const {
return Size(std::max(w, sz.w), return SizeT(std::max(w, sz.w),
std::max(h, sz.h)); std::max(h, sz.h));
} }
SizeT createIntersection(const SizeT& sz) const { SizeT createIntersection(const SizeT& sz) const {