diff options
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx index 0eaf23752..3bc9fedbe 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx @@ -112,7 +112,7 @@ void Fl_GDI_Graphics_Driver::copy_offscreen_with_alpha(int x,int y,int w,int h,H SelectObject(new_gc, bitmap); BOOL alpha_ok = 0; // first try to alpha blend - if ( fl_can_do_alpha_blending() ) { + if ( can_do_alpha_blending() ) { alpha_ok = fl_alpha_blend(fl_gc, x, y, w, h, new_gc, srcx, srcy, w, h, blendfunc); } // if that failed (it shouldn't), still copy the bitmap over, but now alpha is 1 diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx index 909242cd2..7209cbd7b 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx @@ -88,7 +88,7 @@ void Fl_OpenGL_Graphics_Driver::text_extents(const char *str, int n, int& dx, in { dx = 0; dy = descent(); - w = width(str, n); + w = (int)width(str, n); h = size_; } @@ -120,8 +120,8 @@ void Fl_OpenGL_Graphics_Driver::draw(const char *str, int n, int x, int y) if (!rendering) { glBegin(GL_LINE_STRIP); rendering = 1; } int vx = (cmd & '\70')>>3; int vy = (cmd & '\07'); - px = 0.5+x+vx*size_*0.5/8.0; - py = 0.5+y+vy*size_/8.0-0.8*size_; + px = (int)(0.5+x+vx*size_*0.5/8.0); + py = (int)(0.5+y+vy*size_/8.0-0.8*size_); glVertex2f(px, py); } } |