projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/fs: Fix CSE temporary copy for some LOAD_PAYLOAD corner cases.
[mesa.git]
/
src
/
mesa
/
drivers
/
x11
/
xfonts.c
diff --git
a/src/mesa/drivers/x11/xfonts.c
b/src/mesa/drivers/x11/xfonts.c
index f732c945865671c3295f2d1288d17089c3e8a3c7..8405013b85c707deb43179c961d359a9255517eb 100644
(file)
--- a/
src/mesa/drivers/x11/xfonts.c
+++ b/
src/mesa/drivers/x11/xfonts.c
@@
-1,7
+1,6
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 3.5
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@
-18,9
+17,10
@@
* 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
* 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
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
*/
@@
-28,10
+28,7
@@
* Copyright (C) 1995 Thorsten.Ohl @ Physik.TH-Darmstadt.de
*/
* Copyright (C) 1995 Thorsten.Ohl @ Physik.TH-Darmstadt.de
*/
-#ifdef __VMS
-#include <GL/vms_x_fix.h>
-#endif
-
+#include <stdio.h>
#include "glxheader.h"
#include "main/context.h"
#include "main/imports.h"
#include "glxheader.h"
#include "main/context.h"
#include "main/imports.h"
@@
-41,9
+38,6
@@
/* Some debugging info. */
#ifdef DEBUG
/* Some debugging info. */
#ifdef DEBUG
-#undef _R
-#undef _G
-#undef _B
#include <ctype.h>
int debug_xfonts = 0;
#include <ctype.h>
int debug_xfonts = 0;
@@
-247,7
+241,7
@@
Fake_glXUseXFont(Font font, int first, int count, int listbase)
max_bm_width = (max_width + 7) / 8;
max_bm_height = max_height;
max_bm_width = (max_width + 7) / 8;
max_bm_height = max_height;
- bm =
(GLubyte *) MALLOC
((max_bm_width * max_bm_height) * sizeof(GLubyte));
+ bm =
malloc
((max_bm_width * max_bm_height) * sizeof(GLubyte));
if (!bm) {
XFreeFontInfo(NULL, fs, 1);
_mesa_error(NULL, GL_OUT_OF_MEMORY,
if (!bm) {
XFreeFontInfo(NULL, fs, 1);
_mesa_error(NULL, GL_OUT_OF_MEMORY,
@@
-345,7
+339,7
@@
Fake_glXUseXFont(Font font, int first, int count, int listbase)
glNewList(list, GL_COMPILE);
if (valid && (bm_width > 0) && (bm_height > 0)) {
glNewList(list, GL_COMPILE);
if (valid && (bm_width > 0) && (bm_height > 0)) {
-
MEMSET
(bm, '\0', bm_width * bm_height);
+
memset
(bm, '\0', bm_width * bm_height);
fill_bitmap(dpy, win, gc, bm_width, bm_height, x, y, c, bm);
glBitmap(width, height, x0, y0, dx, dy, bm);
fill_bitmap(dpy, win, gc, bm_width, bm_height, x, y, c, bm);
glBitmap(width, height, x0, y0, dx, dy, bm);
@@
-363,7
+357,7
@@
Fake_glXUseXFont(Font font, int first, int count, int listbase)
glEndList();
}
glEndList();
}
-
FREE
(bm);
+
free
(bm);
XFreeFontInfo(NULL, fs, 1);
XFreeGC(dpy, gc);
XFreeFontInfo(NULL, fs, 1);
XFreeGC(dpy, gc);