From 26eca9f1dcc8beebbf068c7135a5fa7fc1810acd Mon Sep 17 00:00:00 2001 From: Sjoerd van der Berg Date: Sat, 7 Feb 2004 18:50:27 +0000 Subject: [PATCH] No longer use pitch when setting size Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1660 --- include/render.h | 2 +- src/gui/render.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/render.h b/include/render.h index dd1adfc7..9782f6a8 100644 --- a/include/render.h +++ b/include/render.h @@ -28,7 +28,7 @@ enum RENDER_Operation { typedef void (* RENDER_Line_Handler)(Bit8u * src); -void RENDER_SetSize(Bitu width,Bitu height,Bitu bpp,Bitu pitch,double ratio,Bitu scalew,Bitu scaleh); +void RENDER_SetSize(Bitu width,Bitu height,Bitu bpp,double ratio,Bitu scalew,Bitu scaleh); bool RENDER_StartUpdate(void); void RENDER_EndUpdate(void); void RENDER_SetPal(Bit8u entry,Bit8u red,Bit8u green,Bit8u blue); diff --git a/src/gui/render.cpp b/src/gui/render.cpp index 7061bc0c..2fcaab42 100644 --- a/src/gui/render.cpp +++ b/src/gui/render.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: render.cpp,v 1.25 2004-01-31 22:38:27 harekiet Exp $ */ +/* $Id: render.cpp,v 1.26 2004-02-07 18:50:10 harekiet Exp $ */ #include #include @@ -56,7 +56,6 @@ static struct { Bitu width; Bitu height; Bitu bpp; - Bitu pitch; Bitu scalew; Bitu scaleh; double ratio; @@ -450,15 +449,14 @@ normalop: } -void RENDER_SetSize(Bitu width,Bitu height,Bitu bpp,Bitu pitch,double ratio,Bitu scalew,Bitu scaleh) { - if ((!width) || (!height) || (!pitch)) { +void RENDER_SetSize(Bitu width,Bitu height,Bitu bpp,double ratio,Bitu scalew,Bitu scaleh) { + if (!width || !height) { render.active=false; return; } render.src.width=width; render.src.height=height; render.src.bpp=bpp; - render.src.pitch=pitch; render.src.ratio=render.aspect ? ratio : 1.0; render.src.scalew=scalew; render.src.scaleh=scaleh;