From: Matthew Fernandez Date: Sat, 5 Jun 2021 23:55:34 +0000 (-0700) Subject: remove commented out glcompfont code X-Git-Tag: 2.47.3~7^2~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc1725da46b989c313f3ce62f577c3b0d62d0ed3;p=graphviz remove commented out glcompfont code --- diff --git a/lib/glcomp/glcompfont.c b/lib/glcomp/glcompfont.c index 78a512c3f..5d832fd5b 100644 --- a/lib/glcomp/glcompfont.c +++ b/lib/glcomp/glcompfont.c @@ -21,7 +21,6 @@ static void print_bitmap_string(void *font, char *s) if (s && strlen(s)) { while (*s) { glutBitmapCharacter(font, *s); -// glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, *s); s++; } } @@ -142,7 +141,6 @@ void glCompDrawText3D(glCompFont * f,GLfloat x,GLfloat y,GLfloat z,GLfloat w,GLf void glCompDrawText(glCompFont * f,GLfloat x,GLfloat y) { -// change_fontC(f->tex->data,f->tex->width,f->tex->height,&f->color); glRasterPos2f(x, y); glDrawPixels(f->tex->width, f->tex->height, GL_RGBA, GL_UNSIGNED_BYTE, f->tex->data); } diff --git a/lib/glcomp/glcompfont.h b/lib/glcomp/glcompfont.h index 178b79409..33e7224ae 100644 --- a/lib/glcomp/glcompfont.h +++ b/lib/glcomp/glcompfont.h @@ -24,17 +24,6 @@ typedef float GLfloat; #ifdef __cplusplus extern "C" { -#endif -#if 0 - void copy_font(glCompFont * targetfont, const glCompFont * sourcefont); - fontset_t *fontset_init(void); - void free_font_set(fontset_t * fontset); - glCompFont *add_font(fontset_t * fontset, char *fontdesc, int fs); - glCompFont *add_glut_font(fontset_t * fontset, void *glutfont); - void fontColor(glCompFont * font, float r, float g, float b, float a); - glCompFont *font_init(void); - int glCompLoadFontPNG(char *name, int id); - void glprintf(glCompFont *, GLfloat, GLfloat, GLfloat, GLfloat, char *); #endif void glprintfglut(void *font, GLfloat xpos, GLfloat ypos, GLfloat zpos, char *bf);