r3753 - packages/trunk/hex-a-hop/debian/patches

[Jens Seidel]

Author: jseidel-guest
Date: 2007-08-22 02:57:19 +0000 (Wed, 22 Aug 2007)
New Revision: 3753

Modified:
   packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch
Log:
Explicit workaround for #439071. The code is currently not affected
but let's better check for this bug.


Modified: packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch	2007-08-22 02:40:27 UTC (rev 3752)
+++ packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch	2007-08-22 02:57:19 UTC (rev 3753)
@@ -44,7 +44,7 @@
  		16, 0xf800, 0x07e0, 0x001f, 0);
  
  	screen = SDL_DisplayFormat(tempscreen);
-@@ -157,6 +168,63 @@
+@@ -157,6 +168,71 @@
  }
  String base_path;
  
@@ -72,6 +72,10 @@
 +/// Display the specified UTF-8 text left aligned at (x,y)
 +void Print_Pango(int x, int y, const std::string &text_utf8)
 +{
++	// Workaround for possible crash, see
++	// http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439071
++	if (text_utf8.size() == 0 || text_utf8.size() == 1 && text_utf8[0]==127)
++		return;
 +	assert(text_utf8.find("\n") == std::string::npos);
 +	SDLPango_SetText(context, text_utf8.c_str(), -1);
 +	SDL_Surface *surface = SDLPango_CreateSurfaceDraw(context);
@@ -93,6 +97,10 @@
 + * */
 +void PrintC_Pango(int x, int y, int width, const std::string &text_utf8)
 +{
++	// Workaround for possible crash, see
++	// http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439071
++	if (text_utf8.size() == 0 || text_utf8.size() == 1 && text_utf8[0]==127)
++		return;
 +	assert(width>0);
 +	SDLPango_SetMinimumSize(context, width, 0);
 +
@@ -108,7 +116,7 @@
  int TickTimer()
  {
  	static int time = SDL_GetTicks();
-@@ -204,6 +272,10 @@
+@@ -204,6 +280,10 @@
  */
  
  	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
@@ -119,7 +127,7 @@
  
  	SDL_Surface* icon = SDL_LoadBMP("graphics/icon.bmp");
  	if (icon)
-@@ -378,7 +450,7 @@
+@@ -378,7 +458,7 @@
  						if (!td.isValid())
  							 printf("No tablet/driver found\n");
  					#endif
@@ -128,7 +136,7 @@
  				if (m->msg == WM_DROPFILES)
  				{
  					HDROP h = (HDROP)m->wParam;
-@@ -476,6 +548,7 @@
+@@ -476,6 +556,7 @@
  		}
  	}