diff options
Diffstat (limited to 'src/mesa/main/texutil.c')
| -rw-r--r-- | src/mesa/main/texutil.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/texutil.c b/src/mesa/main/texutil.c index 1d0da731c9..6ccc2f215a 100644 --- a/src/mesa/main/texutil.c +++ b/src/mesa/main/texutil.c @@ -1,21 +1,21 @@ -/* $Id: texutil.c,v 1.9 2000/11/09 22:41:25 brianp Exp $ */ +/* $Id: texutil.c,v 1.10 2000/11/22 07:32:17 joukj Exp $ */ /* * Mesa 3-D graphics library * Version: 3.4 - * + * * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -33,7 +33,7 @@ #include "image.h" #include "mem.h" #include "texutil.h" -#include "types.h" +#include "mtypes.h" #endif @@ -802,7 +802,7 @@ _mesa_convert_texsubimage(MesaIntTexFormat dstFormat, dstYoffset *= hScale; /* XXX hscale != 1 and wscale != 1 not tested!!!! */ - + switch (dstFormat) { case MESA_I8: case MESA_L8: |