[aseprite] 18/134: Fix region_tests compilation (as now it depends on pixman library)

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit ec99866a23ddb302f0da36fa9ff800d4cecace8f
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Oct 29 10:37:44 2014 -0300

    Fix region_tests compilation (as now it depends on pixman library)
---
 src/CMakeLists.txt       |  2 +-
 src/gfx/region_tests.cpp | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 638f541..0d89e40 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -316,7 +316,7 @@ function(find_tests dir dependencies)
 endfunction()
 
 find_tests(base base-lib ${sys_libs})
-find_tests(gfx gfx-lib base-lib ${sys_libs})
+find_tests(gfx gfx-lib base-lib ${libs3rdparty} ${sys_libs})
 find_tests(raster raster-lib gfx-lib base-lib ${libs3rdparty} ${sys_libs})
 find_tests(doc doc-lib raster-lib gfx-lib base-lib ${libs3rdparty} ${sys_libs})
 find_tests(css css-lib gfx-lib base-lib ${libs3rdparty} ${sys_libs})
diff --git a/src/gfx/region_tests.cpp b/src/gfx/region_tests.cpp
index da29924..920b555 100644
--- a/src/gfx/region_tests.cpp
+++ b/src/gfx/region_tests.cpp
@@ -4,6 +4,10 @@
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtest/gtest.h>
 
 #include "gfx/region.h"
@@ -52,12 +56,12 @@ TEST(Region, Equal)
 {
   Region a;
   a = Rect(2, 3, 4, 5);
-  EXPECT_EQ(Rect(2, 3, 4, 5), a.getBounds());
+  EXPECT_EQ(Rect(2, 3, 4, 5), a.bounds());
   EXPECT_EQ(Rect(2, 3, 4, 5), a[0]);
   EXPECT_FALSE(a.isEmpty());
 
   a = Rect(6, 7, 8, 9);
-  EXPECT_EQ(Rect(6, 7, 8, 9), a.getBounds());
+  EXPECT_EQ(Rect(6, 7, 8, 9), a.bounds());
   EXPECT_EQ(Rect(6, 7, 8, 9), a[0]);
 
   Region b;
@@ -80,8 +84,8 @@ TEST(Region, Union)
 {
   Region a(Rect(2, 3, 4, 5));
   Region b(Rect(6, 3, 4, 5));
-  EXPECT_EQ(Rect(2, 3, 8, 5), Region().createUnion(a, b).getBounds());
-  EXPECT_EQ(Rect(2, 3, 8, 5), Region().createUnion(b, a).getBounds());
+  EXPECT_EQ(Rect(2, 3, 8, 5), Region().createUnion(a, b).bounds());
+  EXPECT_EQ(Rect(2, 3, 8, 5), Region().createUnion(b, a).bounds());
   ASSERT_EQ(1, Region().createUnion(a, b).size());
   ASSERT_EQ(1, Region().createUnion(b, a).size());
   EXPECT_EQ(Rect(2, 3, 8, 5), Region().createUnion(a, b)[0]);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git