summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2016-02-10 10:31:43 +0000
committerMatthias Melcher <fltk@matthiasm.com>2016-02-10 10:31:43 +0000
commit4079e7590b6307e7811671388291577dbeef17f6 (patch)
tree4181acf2312230e5f4abb2f65e70f596f1195f68 /src/drivers
parent94f0278d4771c816f3303efd2e8fa10fc6c41b7a (diff)
Fix MSWindows compile issues.
Fixed a few warnings and a compilation issue introduced from previous reorganization. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11143 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx2
-rw-r--r--src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx6
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);
}
}