mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix several compiler warnings

Browse Source
This commit is contained in:
Albrecht Schlosser 2023-12-04 17:40:31 +01:00
parent 5a5baca1e2
commit 7c3489061e
5 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cairo/Fl_Cairo.cxx
View File

@ -120,9 +120,9 @@ static cairo_surface_t * cairo_create_surface(void * gc, int W, int H) {
cairo_t * Fl::cairo_make_current(void *gc) {
int W=0,H=0;
#if defined(USE_X11)
//FIXME X11 get W,H
// FIXME X11 get W,H
// gc will be the window handle here
# warning FIXME get W,H for cairo_make_current(void*)
// # warning FIXME get W,H for cairo_make_current(void*)
#elif defined(__APPLE_QUARTZ__)
if (fl_window) {
W = Fl_Window::current()->w();

9
fluid/undo.cxx
View File

@ -1,9 +1,7 @@
//
// "$Id$"
//
// FLUID undo support for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2010 by Bill Spitzak and others.
// Copyright 1998-2023 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -60,8 +58,9 @@ static int undo_paused = 0; // Undo checkpointing paused?
// Return the undo filename
static char *undo_filename(int level, char *buf, int bufsize) {
static char undo_path[FL_PATH_MAX] = ""; // Undo path
// Undo path. Note: smaller than FL_PATH_MAX to silence compiler
// warning and to prevent potential buffer overflow
static char undo_path[FL_PATH_MAX-32] = "";
if (!undo_path[0]) fluid_prefs.getUserdataPath(undo_path, sizeof(undo_path));

6
src/fl_font_x.cxx
View File

@ -118,15 +118,15 @@ static const char *find_best_font(const char *fname, int size) {
if (!list) return "fixed";
// search for largest <= font size:
char* name = list[0]; int ptsize = 0; // best one found so far
char* name = list[0]; int ptsize = 0; // best one found so far
int matchedlength = 32767;
char namebuffer[1024]; // holds scalable font name
static char namebuffer[1024]; // holds scalable font name
int found_encoding = 0;
int m = cnt; if (m<0) m = -m;
for (int n=0; n < m; n++) {
char* thisname = list[n];
if (fl_correct_encoding(thisname)) {
if (!found_encoding) ptsize = 0; // force it to choose this
if (!found_encoding) ptsize = 0; // force it to choose this
found_encoding = 1;
} else {
if (found_encoding) continue;

4
src/fl_set_fonts_x.cxx
View File

@ -124,7 +124,9 @@ const char* Fl::get_font_name(Fl_Font fnum, int* ap) {
// collect all the attribute words:
for (int n = 3; n <= 6; n++) {
// get the next word:
if (*e) e++; x = e; e = fl_font_word(x,1);
if (*e) e++;
x = e;
e = fl_font_word(x,1);
int t = attribute(n,x);
if (t < 0) {
if (o < (f->fontname + ENDOFBUFFER - 1)) *o++ = ' ';

32
src/gl_draw.cxx
View File

@ -116,7 +116,8 @@ void gl_font(int fontid, int size) {
gl_fontsize = fl_fontsize;
}
#ifndef __APPLE__
#if !defined(__APPLE__)
#if !(defined(USE_X11) || USE_XFT)
static void get_list(int r) {
gl_fontsize->glok[r] = 1;
#if defined(USE_X11)
@ -141,7 +142,8 @@ static void get_list(int r) {
# error unsupported platform
#endif
} // get_list
#endif
#endif // !(defined(USE_X11) || USE_XFT)
#endif // !defined(__APPLE__)
void gl_remove_displaylist_fonts()
{
@ -191,7 +193,7 @@ static void gl_draw_textures(const char* str, int n);
\see On the Mac OS X platform, see gl_texture_pile_height(int)
*/
void gl_draw(const char* str, int n) {
#ifdef __APPLE__
#ifdef __APPLE__
gl_draw_textures(str, n);
#else
static unsigned short *buf = NULL;
@ -203,7 +205,7 @@ void gl_draw(const char* str, int n) {
wn = fl_utf8toUtf16(str, n, buf, l);
}
#if !( defined(USE_X11) || USE_XFT )
#if !(defined(USE_X11) || USE_XFT)
for (unsigned i = 0; i < wn; i++) {
unsigned int r;
r = (buf[i] & 0xFC00) >> 10;
@ -215,7 +217,7 @@ void gl_draw(const char* str, int n) {
}
/**
Draws n characters of the string in the current font at the given position
Draws n characters of the string in the current font at the given position
\see On the Mac OS X platform, see gl_texture_pile_height(int)
*/
void gl_draw(const char* str, int n, int x, int y) {
@ -224,7 +226,7 @@ void gl_draw(const char* str, int n, int x, int y) {
}
/**
Draws n characters of the string in the current font at the given position
Draws n characters of the string in the current font at the given position
\see On the Mac OS X platform, see gl_texture_pile_height(int)
*/
void gl_draw(const char* str, int n, float x, float y) {
@ -241,7 +243,7 @@ void gl_draw(const char* str) {
}
/**
Draws a nul-terminated string in the current font at the given position
Draws a nul-terminated string in the current font at the given position
\see On the Mac OS X platform, see gl_texture_pile_height(int)
*/
void gl_draw(const char* str, int x, int y) {
@ -249,7 +251,7 @@ void gl_draw(const char* str, int x, int y) {
}
/**
Draws a nul-terminated string in the current font at the given position
Draws a nul-terminated string in the current font at the given position
\see On the Mac OS X platform, see gl_texture_pile_height(int)
*/
void gl_draw(const char* str, float x, float y) {
@ -410,7 +412,7 @@ void gl_texture_fifo::display_texture(int rank)
float winw = gl_scale * Fl_Window::current()->w();
float winh = gl_scale * Fl_Window::current()->h();
// GL_COLOR_BUFFER_BIT for glBlendFunc, GL_ENABLE_BIT for glEnable / glDisable
glPushAttrib(GL_ENABLE_BIT | GL_TEXTURE_BIT | GL_COLOR_BUFFER_BIT);
glPushAttrib(GL_ENABLE_BIT | GL_TEXTURE_BIT | GL_COLOR_BUFFER_BIT);
glDisable (GL_DEPTH_TEST); // ensure text is not removed by depth buffer test.
glEnable (GL_BLEND); // for text fading
glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); // ditto
@ -433,13 +435,13 @@ void gl_texture_fifo::display_texture(int rank)
glBegin (GL_QUADS);
glTexCoord2f (0.0f, 0.0f); // draw lower left in world coordinates
glVertex2f (bounds.origin.x, bounds.origin.y);
glTexCoord2f (0.0f, height); // draw upper left in world coordinates
glVertex2f (bounds.origin.x, bounds.origin.y + bounds.size.height);
glTexCoord2f (fifo[rank].width, height); // draw upper right in world coordinates
glVertex2f (bounds.origin.x + bounds.size.width, bounds.origin.y + bounds.size.height);
glTexCoord2f (fifo[rank].width, 0.0f); // draw lower right in world coordinates
glVertex2f (bounds.origin.x + bounds.size.width, bounds.origin.y);
glEnd ();
@ -448,13 +450,13 @@ void gl_texture_fifo::display_texture(int rank)
glutStrokeString(GLUT_STROKE_ROMAN, (uchar*)fifo[rank].utf8);
}
glPopAttrib();
// reset original matrices
glPopMatrix(); // GL_MODELVIEW
glMatrixMode (GL_PROJECTION);
glPopMatrix();
glMatrixMode (matrixMode);
//set the raster position to end of string
pos[0] += fifo[rank].width;
GLdouble modelmat[16];
@ -529,7 +531,7 @@ int gl_texture_fifo::already_known(const char *str, int n)
static gl_texture_fifo *gl_fifo = NULL; // points to the texture pile class instance
// draws a utf8 string using pre-computed texture if available
static void gl_draw_textures(const char* str, int n)
static void gl_draw_textures(const char* str, int n)
{
Fl_Gl_Window *gwin = Fl_Window::current()->as_gl_window();
gl_scale = (gwin ? gwin->pixels_per_unit() : 1);