- more c++98 fixes

diff --git a/c++98.patch b/c++98.patch
index 508c3095ebcea52ecff6f4e6c612df1e83b1d4fa..926654d713bedfb130f4fc18983bf76d7c88b562 100644 (file)
--- a/c++98.patch
+++ b/c++98.patch
@@ -1,9 +1,3 @@
-commit 5a5791ca4ab0237f81fd2c180471bc20cf109c2a
-Author: Tarik Sekmen <tarik@directfb.org>
-Date:   Tue Apr 15 13:40:07 2014 +0300
-
-    Surface: Minor fix for C++98 compiler error.
-
 diff --git a/ilixi/graphics/Surface.cpp b/ilixi/graphics/Surface.cpp
 index 7489725..84b789f 100644
 --- a/ilixi/graphics/Surface.cpp
@@ -80,3 +74,32 @@ index 7489725..84b789f 100644
      if (_parentSurface)
      {
          r.x += zIndex;
+diff --git a/ilixi/types/Rectangle.cpp b/ilixi/types/Rectangle.cpp
+index 9aa5171..1de5b91 100644
+--- a/ilixi/types/Rectangle.cpp
++++ b/ilixi/types/Rectangle.cpp
+@@ -341,14 +341,22 @@ DFBBox Rectangle::dfbBox() const
+ DFBRectangle
+ Rectangle::dfbRect() const
+ {
+-    DFBRectangle r = { x(), y(), width(), height() };
++    DFBRectangle r;
++    r.x = x();
++    r.y = y();
++    r.w = width();
++    r.h = height();
+     return r;
+ }
+ 
+ DFBRegion
+ Rectangle::dfbRegion() const
+ {
+-    DFBRegion r = { x(), y(), right() - 1, bottom() - 1 };
++    DFBRegion r;
++    r.x1 = x();
++    r.y1 = y();
++    r.x2 = right() - 1;
++    r.y2 = bottom() - 1;
+     return r;
+ }
+