[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp [release_0
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp [release_0_7_2] |
Date: |
Mon, 06 Nov 2006 10:54:29 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Sandro Santilli <strk> 06/11/06 10:54:28
Modified files:
. : ChangeLog
server : edit_text_character.cpp
Log message:
* server/edit_text_character (format_text): properly handle empty-text.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.89&r2=1.1412.2.90
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.22.2.2&r2=1.22.2.3
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.89
retrieving revision 1.1412.2.90
diff -u -b -r1.1412.2.89 -r1.1412.2.90
--- ChangeLog 6 Nov 2006 00:52:47 -0000 1.1412.2.89
+++ ChangeLog 6 Nov 2006 10:54:28 -0000 1.1412.2.90
@@ -1,3 +1,8 @@
+2006-11-06 Sandro Santilli <address@hidden>
+
+ * server/edit_text_character (format_text): properly
+ handle empty-text.
+
2006-11-05 Rob Savoye <address@hidden>
* gnash/configure.ac: Add substitution variables for the build
Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -b -r1.22.2.2 -r1.22.2.3
--- server/edit_text_character.cpp 4 Nov 2006 13:45:43 -0000 1.22.2.2
+++ server/edit_text_character.cpp 6 Nov 2006 10:54:28 -0000 1.22.2.3
@@ -3,7 +3,7 @@
// This source code has been donated to the Public Domain. Do
// whatever you want with it.
-/* $Id: edit_text_character.cpp,v 1.22.2.2 2006/11/04 13:45:43 udog Exp $ */
+/* $Id: edit_text_character.cpp,v 1.22.2.3 2006/11/06 10:54:28 strk Exp $ */
#include "utf8.h"
#include "log.h"
@@ -541,6 +541,9 @@
{
m_text_glyph_records.resize(0);
+ // nothing to do if we have no text
+ if ( m_text.empty() ) return;
+
// FIXME: I don't think we should query the definition
// to find the appropriate font to use, as ActionScript
// code should be able to change the font of a TextField
@@ -614,6 +617,7 @@
m_xcursor = x;
m_ycursor = y;
+ assert ( ! m_text.empty() );
const char* text = &m_text[0];
while (uint32_t code = utf8::decode_next_unicode_character(&text))
{
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp [release_0_7_2],
Sandro Santilli <=