[Gemrb-commits] gemrb: branch master updated. v0.6.6-43-g2743c08

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  2743c08fbac8a6fd18af10b4063f270cc5144e15 (commit)
       via  25a31f36ff9c6981844ebebf18b1a531d1149cda (commit)

Summary of changes:
 gemrb/core/Font.cpp         |    2 +-
 gemrb/core/GUI/TextArea.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
      from  a5d21ea6b1ff66233935c98b42df71b8db7996e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=2743c08fbac8a6fd18af10b4063f270cc5144e15

commit 2743c08fbac8a6fd18af10b4063f270cc5144e15
Author: Brad Allred <bra...@me...>
Date:   Sat Oct 22 23:03:29 2011 -0600

    TextArea: prevent possible divide by 0

diff --git a/gemrb/core/GUI/TextArea.cpp b/gemrb/core/GUI/TextArea.cpp
index 36464c9..49acd15 100644
--- a/gemrb/core/GUI/TextArea.cpp
+++ b/gemrb/core/GUI/TextArea.cpp
@@ -773,7 +773,7 @@ void TextArea::CalcRowCount()
 		return;
 	}
 	ScrollBar* bar = ( ScrollBar* ) sb;
-	tr = rows - Height/ftext->size[1].h + 1;
+	tr = rows - Height/ftext->maxHeight + 1;
 	if (tr<0) {
 		tr = 0;
 	}

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=25a31f36ff9c6981844ebebf18b1a531d1149cda

commit 25a31f36ff9c6981844ebebf18b1a531d1149cda
Author: Brad Allred <bra...@me...>
Date:   Sat Oct 22 22:58:19 2011 -0600

    Font: safer SetPalette

diff --git a/gemrb/core/Font.cpp b/gemrb/core/Font.cpp
index 4e1f5d9..364ef09 100644
--- a/gemrb/core/Font.cpp
+++ b/gemrb/core/Font.cpp
@@ -599,8 +599,8 @@ Palette* Font::GetPalette() const
 
 void Font::SetPalette(Palette* pal)
 {
+	if (pal) pal->IncRef();
 	if (palette) palette->Release();
-	pal->IncRef();
 	palette = pal;
 }
 

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator