From: Marten Richter <marten.richter@freenet.de>
Date: Sat, 9 Nov 2013 08:49:10 +0000 (+0100)
Subject: Merge branch '0-4-1-dev' of http://git.vomp.tv/vompclient
X-Git-Tag: 0-4-1~1^2~11
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=1dea83483971d4844322adab652b3f8eddf8ef38;p=vompclient.git

Merge branch '0-4-1-dev' of http://git.vomp.tv/vompclient

Conflicts:
	boxx.cc
---

1dea83483971d4844322adab652b3f8eddf8ef38
diff --cc boxx.cc
index 08683a5,e6b76a1..dd12024
--- a/boxx.cc
+++ b/boxx.cc
@@@ -397,16 -399,16 +399,16 @@@ void Boxx::drawBitmap(UINT x, UINT y, c
    else  if (surface) surface->drawBitmap(x, y, bm, region);
  }
  
- void Boxx::drawJpeg(const char *fileName,int x, int y,int *width, int *height)
+ void Boxx::drawJpeg(const char *fileName, int x, int y, int *width, int *height)
  {
- 	if (parent) parent->drawJpeg(fileName,area.x +x,area.y +y,width,height);
- 	else if (surface) surface->drawJpeg(fileName,x,y,width,height);
+   if (parent) parent->drawJpeg(fileName, area.x + x, area.y + y, width, height);
+   else if (surface) surface->drawJpeg(fileName, x, y, width, height);
  }
  
 -void Boxx::drawMonoBitmap(UCHAR*base, int dx, int dy, UINT height, UINT width, Colour& nextColour)
 +void Boxx::drawMonoBitmap(UCHAR*base, int dx, int dy, unsigned int height,unsigned int width, DrawStyle& nextColour)
  {
- 	if (parent) parent->drawMonoBitmap(base, area.x +dx,area.y +dy, height,width, nextColour);
- 	else if (surface) surface->drawMonoBitmap(base, dx,dy, height,width, nextColour);
+   if (parent) parent->drawMonoBitmap(base, area.x +dx, area.y + dy, height, width, nextColour);
+   else if (surface) surface->drawMonoBitmap(base, dx,dy, height, width, nextColour);
  }
  
  int Boxx::getFontHeight()