[aseprite] 22/128: Fix gfx::SizeT::createUnion() function
Tobias Hansen
thansen at moszumanska.debian.org
Mon May 9 21:24:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository aseprite.
commit c9c48386415b619073064ba534692724db11f2ba
Author: David Capello <davidcapello at gmail.com>
Date: Tue Apr 19 14:09:18 2016 -0300
Fix gfx::SizeT::createUnion() function
---
src/gfx/size.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gfx/size.h b/src/gfx/size.h
index fa1f40f..a031972 100644
--- a/src/gfx/size.h
+++ b/src/gfx/size.h
@@ -1,5 +1,5 @@
// 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.
// Read LICENSE.txt for more information.
@@ -40,8 +40,8 @@ public:
}
SizeT createUnion(const SizeT& sz) const {
- return Size(std::max(w, sz.w),
- std::max(h, sz.h));
+ return SizeT(std::max(w, sz.w),
+ std::max(h, sz.h));
}
SizeT createIntersection(const SizeT& sz) const {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git
More information about the Pkg-games-commits
mailing list