[oe-commits] org.oe.dreambox tuxbox-tuxtxt-32bpp: fix several off-by-one errors

[tmbinc commit]

tuxbox-tuxtxt-32bpp: fix several off-by-one errors

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: caeb17d09b47d485a0edfec038445a1bc136e9d5
ViewMTN: http://monotone.openembedded.org/revision/info/caeb17d09b47d485a0edfec038445a1bc136e9d5
Files:
1
packages/tuxbox/tuxbox-tuxtxt-32bpp/32bpp.diff
packages/tuxbox/tuxbox-tuxtxt-32bpp.bb
Diffs:

#
# mt diff -r7451e48e48e316616a2389a728aabf71245119ba -rcaeb17d09b47d485a0edfec038445a1bc136e9d5
#
#
#
# patch "packages/tuxbox/tuxbox-tuxtxt-32bpp/32bpp.diff"
#  from [4c30c7472039adf5842649e0f7e814fb84444527]
#    to [3541fc9c0e0e9ff57944cfcd0c21ed6d6a1ee69a]
# 
# patch "packages/tuxbox/tuxbox-tuxtxt-32bpp.bb"
#  from [092e7d42dba2e6457ee2d2a06f2704b0b50340f0]
#    to [78132ecf6bc7c6dd7b6dd31020a6f56a0030b2d5]
#
============================================================
--- packages/tuxbox/tuxbox-tuxtxt-32bpp/32bpp.diff	4c30c7472039adf5842649e0f7e814fb84444527
+++ packages/tuxbox/tuxbox-tuxtxt-32bpp/32bpp.diff	3541fc9c0e0e9ff57944cfcd0c21ed6d6a1ee69a
@@ -48,7 +48,7 @@ diff -Naur tuxtxt_org/tuxtxt.c tuxtxt/tu
  		{
 -			memset(p, color, w);
 -			p += var_screeninfo.xres;
-+			for (xtmp=0; xtmp<=w; xtmp++)
++			for (xtmp=0; xtmp<w; xtmp++)
 +			{
 +				memcpy(p+xtmp*4,bgra[color],4);
 +			}
@@ -61,19 +61,19 @@ diff -Naur tuxtxt_org/tuxtxt.c tuxtxt/tu
  void ClearBB(int color)
  {
 -	memset(lfb + (var_screeninfo.yres-var_screeninfo.yoffset)*var_screeninfo.xres, color, var_screeninfo.xres*var_screeninfo.yres);
-+	FillRect(0,(var_screeninfo.yres-var_screeninfo.yoffset),fix_screeninfo.line_length,var_screeninfo.yres, color);
++	FillRect(0, var_screeninfo.yres - var_screeninfo.yoffset, var_screeninfo.xres, var_screeninfo.yres, color);
  }
  
  void ClearFB(int color)
  {
 -	memset(lfb + var_screeninfo.xres*var_screeninfo.yoffset, color, var_screeninfo.xres*var_screeninfo.yres);
-+	FillRect(0,var_screeninfo.yoffset,fix_screeninfo.line_length,var_screeninfo.yres,color);
++	FillRect(0, var_screeninfo.yoffset, var_screeninfo.xres, var_screeninfo.yres, color);
  }
  
  void ClearB(int color)
  {
 -	memset(lfb, color, 2*var_screeninfo.xres*var_screeninfo.yres);
-+	FillRect(0,0,fix_screeninfo.line_length,var_screeninfo.yres*2,color);
++	FillRect(0, 0, var_screeninfo.xres, var_screeninfo.yres*2, color);
  }
  
  
@@ -394,7 +394,7 @@ diff -Naur tuxtxt_org/tuxtxt.c tuxtxt/tu
 -	close(saa);
  
 +	/* clear screen */
-+	memset(lfb,0, var_screeninfo.yres*fix_screeninfo.line_length);
++	memset(lfb, 0, var_screeninfo.yres * fix_screeninfo.line_length);
  
  	/* close freetype */
  	FTC_Manager_Done(manager);
@@ -560,7 +560,7 @@ diff -Naur tuxtxt_org/tuxtxt.c tuxtxt/tu
 -					memset(d + ax[x], f1, ax[x+1] - ax[x]);
 +				{
 +//					memset(d + ax[x], f1, ax[x+1] - ax[x]);
-+					for (ltmp=0 ; ltmp <= (ax[x+1]-ax[x]); ltmp++)
++					for (ltmp=0 ; ltmp < (ax[x+1]-ax[x]); ltmp++)
 +					{
 +						memcpy(d + ax[x]*4 +ltmp*4,bgra[f1],4);
 +					}
@@ -570,7 +570,7 @@ diff -Naur tuxtxt_org/tuxtxt.c tuxtxt/tu
 -				d += var_screeninfo.xres;
 +				{
 +//					memset(d + ax[x+6], f2, ax[x+7] - ax[x+6]); /* 2nd byte 6 pixels to the right */
-+					for (ltmp=0 ; ltmp <= (ax[x+7]-ax[x+6]); ltmp++)
++					for (ltmp=0 ; ltmp < (ax[x+7]-ax[x+6]); ltmp++)
 +					{
 +						memcpy(d + ax[x+6]*4 +ltmp*4,bgra[f2],4);
 +					}
@@ -607,7 +607,7 @@ diff -Naur tuxtxt_org/tuxtxt.c tuxtxt/tu
  	if (l > 0)
 -		memset(lfb + x + y * var_screeninfo.xres, color, l);
 +	{
-+		for (ltmp=0; ltmp <= l; ltmp++)
++		for (ltmp=0; ltmp < l; ltmp++)
 +		{
 +			memcpy(lfb + x*4 + ltmp*4 + y * fix_screeninfo.line_length, bgra[color], 4);
 +		}
@@ -633,7 +633,7 @@ diff -Naur tuxtxt_org/tuxtxt.c tuxtxt/tu
 -			memset(p + xoffset, color, l);
 -		p += var_screeninfo.xres;
 +		{
-+			for (ltmp=0; ltmp <= l; ltmp++)
++			for (ltmp=0; ltmp < l; ltmp++)
 +			{
 +				memcpy(p + xoffset*4 +ltmp*4, bgra[color], 4);
 +			}
@@ -852,7 +852,7 @@ diff -Naur tuxtxt_org/tuxtxt.c tuxtxt/tu
  
  	if (transpmode)
  		fillcolor = transp;
-@@ -5476,47 +5563,53 @@
+@@ -5476,47 +5563,54 @@
  		fillcolor = FullScrColor;
  
  	if (zoommode == 2)
@@ -887,7 +887,7 @@ diff -Naur tuxtxt_org/tuxtxt.c tuxtxt/tu
  	for (i = StartY; i>0;i--)
  	{
 -		memset(dst - i*var_screeninfo.xres, fillcolor, screenwidth);
-+		for (swtmp=0; swtmp<=screenwidth; swtmp++)
++		for (swtmp=0; swtmp<screenwidth/4; swtmp++)
 +		{
 +			memcpy(dst - i*fix_screeninfo.line_length+swtmp*4, bgra[fillcolor], 4);
 +		}
@@ -907,10 +907,12 @@ diff -Naur tuxtxt_org/tuxtxt.c tuxtxt/tu
  
  //	if (!pagecatching )
  //		memcpy(dst, lfb + (StartY+24*fontheight)*var_screeninfo.xres, var_screeninfo.xres*fontheight); /* copy line25 in normal height */
- 	for (i = var_screeninfo.yres - StartY - 25*fontheight; i >= 0;i--)
+-	for (i = var_screeninfo.yres - StartY - 25*fontheight; i >= 0;i--)
++	dst -= fix_screeninfo.line_length;
++	for (i = var_screeninfo.yres - StartY - 25 * fontheight; i >= 0;i--)
  	{
 -		memset(dst + var_screeninfo.xres*(fontheight+i), fillcolor, screenwidth);
-+		for (swtmp=0; swtmp<= screenwidth;swtmp++)
++		for (swtmp=0; swtmp < screenwidth/4;swtmp++)
 +		{
 +			memcpy(dst + fix_screeninfo.line_length*(fontheight+i)+swtmp*4, bgra[fillcolor], 4);
 +		}
============================================================
--- packages/tuxbox/tuxbox-tuxtxt-32bpp.bb	092e7d42dba2e6457ee2d2a06f2704b0b50340f0
+++ packages/tuxbox/tuxbox-tuxtxt-32bpp.bb	78132ecf6bc7c6dd7b6dd31020a6f56a0030b2d5
@@ -13,7 +13,7 @@ PV = "0.0+cvs${SRCDATE}"
 
 SRCDATE = "20060112"
 PV = "0.0+cvs${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 S = "${WORKDIR}/tuxtxt"