diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 22:57:00 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 22:57:00 +0000 |
| commit | b2e9308751ec0bc90dfbae69bc7309df62672e9f (patch) | |
| tree | 19a56f1e83990f98f36a9b970ecac46d22570bc0 /src/gl_draw.cxx | |
| parent | 050919103f76dbe4aebaa8ac8a1e2633713ee571 (diff) | |
More shadowed variables in FLUID, plus use snprintf, strlcpy, and strlcat.
Don't use extra warning flags for normal compiles.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2568 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/gl_draw.cxx')
| -rw-r--r-- | src/gl_draw.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 5d8fa6d5c..9175126e3 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -1,5 +1,5 @@ // -// "$Id: gl_draw.cxx,v 1.7.2.5.2.8 2002/06/27 04:29:39 matthiaswm Exp $" +// "$Id: gl_draw.cxx,v 1.7.2.5.2.9 2002/08/09 22:57:00 easysw Exp $" // // OpenGL drawing support routines for the Fast Light Tool Kit (FLTK). // @@ -47,21 +47,21 @@ void gl_font(int fontid, int size) { if (!fl_fontsize->listbase) { #ifdef WIN32 int base = fl_fontsize->metr.tmFirstChar; - int size = fl_fontsize->metr.tmLastChar-base+1; + int count = fl_fontsize->metr.tmLastChar-base+1; HFONT oldFid = (HFONT)SelectObject(fl_gc, fl_fontsize->fid); fl_fontsize->listbase = glGenLists(256); - wglUseFontBitmaps(fl_gc, base, size, fl_fontsize->listbase+base); + wglUseFontBitmaps(fl_gc, base, count, fl_fontsize->listbase+base); SelectObject(fl_gc, oldFid); #elif defined(__APPLE__) - // undefined characters automatically receive an empty GL LIst in aglUseFont + // undefined characters automatically receive an empty GL list in aglUseFont fl_fontsize->listbase = glGenLists(256); aglUseFont(aglGetCurrentContext(), fl_fontsize->font, fl_fontsize->face, fl_fontsize->size, 0, 256, fl_fontsize->listbase); #else int base = fl_xfont->min_char_or_byte2; - int size = fl_xfont->max_char_or_byte2-base+1; + int count = fl_xfont->max_char_or_byte2-base+1; fl_fontsize->listbase = glGenLists(256); - glXUseXFont(fl_xfont->fid, base, size, fl_fontsize->listbase+base); + glXUseXFont(fl_xfont->fid, base, count, fl_fontsize->listbase+base); #endif } glListBase(fl_fontsize->listbase); @@ -159,5 +159,5 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) { #endif // -// End of "$Id: gl_draw.cxx,v 1.7.2.5.2.8 2002/06/27 04:29:39 matthiaswm Exp $". +// End of "$Id: gl_draw.cxx,v 1.7.2.5.2.9 2002/08/09 22:57:00 easysw Exp $". // |