[dasher] Comment out a couple of overzelous assertions.



commit a9e61c34072dafa695d250fb0506deae5b0c33ac
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Sat Mar 13 20:00:07 2010 +0000

    Comment out a couple of overzelous assertions.

 ChangeLog                           |    1 +
 Src/DasherCore/DasherViewSquare.cpp |    2 +-
 Src/Gtk2/dasher_internal_buffer.cpp |    6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d14bab0..8f119ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	* Win32: Remove Visual Studio 2002 and 2003 project files.
 	* Win32: Remove xsltproc from repository.
 	* Win32: Avoid zero smoothing.
+	* Gtk: Comment out a couple of overzelous assertions.
 
 	From Tom Lawton:
 	* Win32: ModuleControl.h - correct header location
diff --git a/Src/DasherCore/DasherViewSquare.cpp b/Src/DasherCore/DasherViewSquare.cpp
index 3f92923..2b157fc 100644
--- a/Src/DasherCore/DasherViewSquare.cpp
+++ b/Src/DasherCore/DasherViewSquare.cpp
@@ -677,7 +677,7 @@ void CDasherViewSquare::Dasher2Screen(myint iDasherX, myint iDasherY, screenint
 
 
   // Note that integer division is rounded *away* from zero here to
-  // enesure that this really is the inverse of the map the other way
+  // ensure that this really is the inverse of the map the other way
   // around.
 
   switch( eOrientation ) {
diff --git a/Src/Gtk2/dasher_internal_buffer.cpp b/Src/Gtk2/dasher_internal_buffer.cpp
index d288436..265b800 100644
--- a/Src/Gtk2/dasher_internal_buffer.cpp
+++ b/Src/Gtk2/dasher_internal_buffer.cpp
@@ -132,7 +132,8 @@ void dasher_internal_buffer_insert(DasherInternalBuffer *pSelf, const gchar *szT
 
   //  std::cout << "i: " << szText << " (" << iOffset << " " << gtk_text_buffer_get_char_count(pPrivate->pBuffer) << ")" << std::endl;
 
-  DASHER_ASSERT(gtk_text_buffer_get_char_count(pPrivate->pBuffer) == iOffset);
+  // This seems overzelous.
+  // DASHER_ASSERT(gtk_text_buffer_get_char_count(pPrivate->pBuffer) == iOffset);
 
   gtk_text_buffer_delete_selection(pPrivate->pBuffer, false, true );
 
@@ -184,7 +185,8 @@ void dasher_internal_buffer_delete(DasherInternalBuffer *pSelf, int iLength, int
   delete end;
 
   //  std::cout << "d: " << iLength << " (" << iOffset << " " << gtk_text_buffer_get_char_count(pPrivate->pBuffer) << ")" << std::endl; 
-  DASHER_ASSERT(gtk_text_buffer_get_char_count(pPrivate->pBuffer) == iOffset);
+  // This seems overzelous.
+  // DASHER_ASSERT(gtk_text_buffer_get_char_count(pPrivate->pBuffer) == iOffset);
 }
 
 gchar *dasher_internal_buffer_get_context(DasherInternalBuffer *pSelf, gint iOffset, gint iLength) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]