summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Fl_BMP_Image.cxx2
-rw-r--r--src/Fl_Browser.cxx6
-rw-r--r--src/Fl_File_Icon2.cxx12
-rw-r--r--src/Fl_Help_View.cxx6
-rw-r--r--src/Fl_Image_Reader.h2
-rw-r--r--src/Fl_MacOS_Sys_Menu_Bar.mm10
-rw-r--r--src/Fl_Native_File_Chooser_MAC.mm2
-rw-r--r--src/Fl_PNM_Image.cxx6
-rw-r--r--src/Fl_Table.cxx8
-rw-r--r--src/Fl_cocoa.mm63
-rw-r--r--src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx24
-rw-r--r--src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx2
-rw-r--r--src/drivers/Darwin/Fl_Darwin_System_Driver.cxx8
-rw-r--r--src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx4
-rw-r--r--src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx4
-rw-r--r--src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx4
-rw-r--r--src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx8
-rw-r--r--src/fl_utf8.cxx2
18 files changed, 87 insertions, 86 deletions
diff --git a/src/Fl_BMP_Image.cxx b/src/Fl_BMP_Image.cxx
index 95a467a3a..a0d3e00cc 100644
--- a/src/Fl_BMP_Image.cxx
+++ b/src/Fl_BMP_Image.cxx
@@ -274,7 +274,7 @@ void Fl_BMP_Image::load_bmp_(Fl_Image_Reader &rdr, int ico_height, int ico_width
bDepth = 4;
// Setup image and buffers...
- if (offbits) rdr.seek(offbits);
+ if (offbits) rdr.seek((unsigned int)offbits);
CHECK_ERROR
if (((size_t)width) * height * bDepth > max_size() ) {
diff --git a/src/Fl_Browser.cxx b/src/Fl_Browser.cxx
index 4534729bc..80d6af811 100644
--- a/src/Fl_Browser.cxx
+++ b/src/Fl_Browser.cxx
@@ -387,7 +387,7 @@ int Fl_Browser::item_height(void *item) const {
case 'B':
case 'C': while (isdigit(*str & 255)) str++; break; // skip a color number
case 'F': font = (Fl_Font)strtol(str,&str,10); break;
- case 'S': tsize = strtol(str,&str,10); break;
+ case 'S': tsize = (int)strtol(str,&str,10); break;
case '.': goto END_FORMAT;
}
}
@@ -450,7 +450,7 @@ int Fl_Browser::item_width(void *item) const {
case 'B':
case 'C': while (isdigit(*str & 255)) str++; break; // skip a color number
case 'F': font = (Fl_Font)strtol(str, &str, 10); break;
- case 'S': tsize = strtol(str, &str, 10); break;
+ case 'S': tsize = (int)strtol(str, &str, 10); break;
case '.':
done = 1;
break;
@@ -556,7 +556,7 @@ void Fl_Browser::item_draw(void* item, int X, int Y, int W, int H) const {
lcol = FL_INACTIVE_COLOR;
break;
case 'S':
- tsize = strtol(str, &str, 10);
+ tsize = (int)strtol(str, &str, 10);
break;
case '-':
fl_color(FL_DARK3);
diff --git a/src/Fl_File_Icon2.cxx b/src/Fl_File_Icon2.cxx
index 5b6334771..f81fa8af0 100644
--- a/src/Fl_File_Icon2.cxx
+++ b/src/Fl_File_Icon2.cxx
@@ -455,15 +455,15 @@ int Fl_File_Icon::load_image(const char *ifile) // I - File to read from
case 3 :
val[0] = lineptr[0];
val[1] = '\0';
- red = 255 * strtol(val, NULL, 16) / 15;
+ red = 255 * (int)strtol(val, NULL, 16) / 15;
val[0] = lineptr[1];
val[1] = '\0';
- green = 255 * strtol(val, NULL, 16) / 15;
+ green = 255 * (int)strtol(val, NULL, 16) / 15;
val[0] = lineptr[2];
val[1] = '\0';
- blue = 255 * strtol(val, NULL, 16) / 15;
+ blue = 255 * (int)strtol(val, NULL, 16) / 15;
break;
case 6 :
@@ -474,17 +474,17 @@ int Fl_File_Icon::load_image(const char *ifile) // I - File to read from
val[0] = lineptr[0];
val[1] = lineptr[1];
val[2] = '\0';
- red = strtol(val, NULL, 16);
+ red = (int)strtol(val, NULL, 16);
val[0] = lineptr[j + 0];
val[1] = lineptr[j + 1];
val[2] = '\0';
- green = strtol(val, NULL, 16);
+ green = (int)strtol(val, NULL, 16);
val[0] = lineptr[2 * j + 0];
val[1] = lineptr[2 * j + 1];
val[2] = '\0';
- blue = strtol(val, NULL, 16);
+ blue = (int)strtol(val, NULL, 16);
break;
}
diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx
index 68b92690d..67ce82a36 100644
--- a/src/Fl_Help_View.cxx
+++ b/src/Fl_Help_View.cxx
@@ -1557,7 +1557,7 @@ void Fl_Help_View::format() {
if (get_attr(attrs, "START", attr, sizeof(attr)) != NULL) {
errno = 0;
char *endptr = 0;
- ol_num = strtol(attr, &endptr, 10);
+ ol_num = (int)strtol(attr, &endptr, 10);
if (errno || endptr == attr || ol_num < 0)
ol_num = 1;
}
@@ -2765,7 +2765,7 @@ Fl_Help_View::get_color(const char *n, // I - Color name
if (n[0] == '#') {
// Do hex color lookup
- rgb = strtol(n + 1, NULL, 16);
+ rgb = (int)strtol(n + 1, NULL, 16);
if (strlen(n) > 4) {
r = rgb >> 16;
@@ -3757,7 +3757,7 @@ quote_char(const char *p) { // I - Quoted string
if (!strchr(p, ';')) return -1;
if (*p == '#') {
- if (*(p+1) == 'x' || *(p+1) == 'X') return strtol(p+2, NULL, 16);
+ if (*(p+1) == 'x' || *(p+1) == 'X') return (int)strtol(p+2, NULL, 16);
else return atoi(p+1);
}
for (i = (int)(sizeof(names) / sizeof(names[0])), nameptr = names; i > 0; i --, nameptr ++)
diff --git a/src/Fl_Image_Reader.h b/src/Fl_Image_Reader.h
index ef327922a..4a20d6602 100644
--- a/src/Fl_Image_Reader.h
+++ b/src/Fl_Image_Reader.h
@@ -81,7 +81,7 @@ public:
const char *name() const { return name_; }
// skip a given number of bytes
- void skip(unsigned int n) { seek(tell() + n); }
+ void skip(unsigned int n) { seek((unsigned int)tell() + n); }
private:
// open() sets this if we read from a file
diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm
index 939a3a3d4..6fdebdaef 100644
--- a/src/Fl_MacOS_Sys_Menu_Bar.mm
+++ b/src/Fl_MacOS_Sys_Menu_Bar.mm
@@ -120,14 +120,14 @@ const char *Fl_Mac_App_Menu::quit = "Quit %@";
NSMenu* this_menu = [self menu];
NSInteger flRank = [this_menu indexOfItem:self];
NSInteger last = [this_menu numberOfItems] - 1;
- int from = flRank;
+ int from = (int)flRank;
while(from > 0) {
if ([[this_menu itemAtIndex:from-1] isSeparatorItem]) break;
item = [(FLMenuItem*)[this_menu itemAtIndex:from-1] getFlItem];
if ( !(item->flags & FL_MENU_RADIO) ) break;
from--;
}
- int to = flRank;
+ int to = (int)flRank;
while (to < last) {
if ([[this_menu itemAtIndex:to+1] isSeparatorItem]) break;
item = [(FLMenuItem*)[this_menu itemAtIndex:to+1] getFlItem];
@@ -228,7 +228,7 @@ const char *Fl_Mac_App_Menu::quit = "Quit %@";
}
[menu addItem:item];
[item setTarget:item];
- int retval = [menu indexOfItem:item];
+ int retval = (int)[menu indexOfItem:item];
[item release];
return retval;
}
@@ -355,7 +355,7 @@ static void createSubMenu( NSMenu *mh, pFl_Menu_Item &mm, const Fl_Menu_Item *m
[submenu setAutoenablesItems:NO];
int cnt;
- cnt = [mh numberOfItems];
+ cnt = (int)[mh numberOfItems];
cnt--;
menuItem = [mh itemAtIndex:cnt];
[menuItem setSubmenu:submenu];
@@ -401,7 +401,7 @@ static void convertToMenuBar(const Fl_Menu_Item *mm)
{
NSMenu *fl_system_menu = [NSApp mainMenu];
int count;//first, delete all existing system menus
- count = [fl_system_menu numberOfItems];
+ count = (int)[fl_system_menu numberOfItems];
for(int i = count - 1; i > 0; i--) {
[fl_system_menu removeItem:[fl_system_menu itemAtIndex:i]];
}
diff --git a/src/Fl_Native_File_Chooser_MAC.mm b/src/Fl_Native_File_Chooser_MAC.mm
index df4808cb2..fbf97abed 100644
--- a/src/Fl_Native_File_Chooser_MAC.mm
+++ b/src/Fl_Native_File_Chooser_MAC.mm
@@ -434,7 +434,7 @@ static char *prepareMacFilter(int count, const char *filter, char **patterns) {
l += strlen(patterns[i]) + 3;
}
const char *p = filter;
- const int t_size = strlen(p) + l + 1;
+ const int t_size = (int)strlen(p) + l + 1;
char *q; q = new char[t_size];
const char *r, *s;
char *t;
diff --git a/src/Fl_PNM_Image.cxx b/src/Fl_PNM_Image.cxx
index 9d2945bc7..7b1b3c54a 100644
--- a/src/Fl_PNM_Image.cxx
+++ b/src/Fl_PNM_Image.cxx
@@ -100,7 +100,7 @@ Fl_PNM_Image::Fl_PNM_Image(const char *filename) // I - File to read
if (*lineptr == '\0' || *lineptr == '#') {
lineptr = fgets(line, sizeof(line), fp);
} else if (isdigit(*lineptr)) {
- w(strtol(lineptr, &lineptr, 10));
+ w((int)strtol(lineptr, &lineptr, 10));
} else lineptr ++;
}
@@ -108,7 +108,7 @@ Fl_PNM_Image::Fl_PNM_Image(const char *filename) // I - File to read
if (*lineptr == '\0' || *lineptr == '#') {
lineptr = fgets(line, sizeof(line), fp);
} else if (isdigit(*lineptr)) {
- h(strtol(lineptr, &lineptr, 10));
+ h((int)strtol(lineptr, &lineptr, 10));
} else lineptr ++;
}
@@ -119,7 +119,7 @@ Fl_PNM_Image::Fl_PNM_Image(const char *filename) // I - File to read
if (*lineptr == '\0' || *lineptr == '#') {
lineptr = fgets(line, sizeof(line), fp);
} else if (isdigit(*lineptr)) {
- maxval = strtol(lineptr, &lineptr, 10);
+ maxval = (int)strtol(lineptr, &lineptr, 10);
} else lineptr ++;
}
} else maxval = 1;
diff --git a/src/Fl_Table.cxx b/src/Fl_Table.cxx
index baf06249e..91ebe262e 100644
--- a/src/Fl_Table.cxx
+++ b/src/Fl_Table.cxx
@@ -394,8 +394,8 @@ int Fl_Table::find_cell(TableContext context, int R, int C, int &X, int &Y, int
X=Y=W=H=0;
return(-1);
}
- X = col_scroll_position(C) - hscrollbar->value() + tix;
- Y = row_scroll_position(R) - vscrollbar->value() + tiy;
+ X = (int)col_scroll_position(C) - hscrollbar->value() + tix;
+ Y = (int)row_scroll_position(R) - vscrollbar->value() + tiy;
W = col_width(C);
H = row_height(R);
@@ -580,8 +580,8 @@ void Fl_Table::table_scrolled() {
Calls recall_dimensions(), and recalculates scrollbar sizes.
*/
void Fl_Table::table_resized() {
- table_h = row_scroll_position(rows());
- table_w = col_scroll_position(cols());
+ table_h = (int)row_scroll_position(rows());
+ table_w = (int)col_scroll_position(cols());
recalc_dimensions();
// Recalc scrollbar sizes
// Clamp scrollbar value() after a resize.
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 81178d2f0..f0163b9d4 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -145,7 +145,7 @@ static unsigned short* macKeyLookUp = NULL;
*/
static unsigned int mods_to_e_state( NSUInteger mods )
{
- long state = 0;
+ unsigned int state = 0;
if ( mods & NSCommandKeyMask ) state |= FL_META;
if ( mods & NSAlternateKeyMask ) state |= FL_ALT;
if ( mods & NSControlKeyMask ) state |= FL_CTRL;
@@ -1179,8 +1179,8 @@ static void CocoatoFLTK(Fl_Window *win, int &x, int &y) {
FLWindow *nsw = fl_xid(win);
ori = [nsw convertBaseToScreen:NSMakePoint(0, [[nsw contentView] frame].size.height)];
float s = Fl::screen_driver()->scale(0);
- x = lround(ori.x / s);
- y = lround((main_screen_height - ori.y) / s);
+ x = (int)lround(ori.x / s);
+ y = (int)lround((main_screen_height - ori.y) / s);
while (win->parent()) {win = win->window(); x -= win->x(); y -= win->y();}
}
@@ -1262,12 +1262,12 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
plugin = (Fl_Cocoa_Plugin*)pm.plugin("gl.cocoa.fltk.org");
}
// calls Fl_Gl_Window::resize() without including Fl_Gl_Window.H
- plugin->resize(window->as_gl_window(), X, Y, lround(r.size.width/s), lround(r.size.height/s));
+ plugin->resize(window->as_gl_window(), X, Y, (int)lround(r.size.width/s), (int)lround(r.size.height/s));
} else {
- Fl_Cocoa_Window_Driver::driver(window)->resize(X, Y, lround(r.size.width/s), lround(r.size.height/s));
+ Fl_Cocoa_Window_Driver::driver(window)->resize(X, Y, (int)lround(r.size.width/s), (int)lround(r.size.height/s));
}
} else
- window->resize(X, Y, lround(r.size.width/s), lround(r.size.height/s));
+ window->resize(X, Y, (int)lround(r.size.width/s), (int)lround(r.size.height/s));
Fl_Cocoa_Window_Driver::driver(window)->view_resized(0);
update_e_xy_and_e_xy_root(nsw);
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
@@ -2031,7 +2031,7 @@ Fl_Window *fl_dnd_target_window = 0;
static void q_set_window_title(NSWindow *nsw, const char * name, const char *mininame) {
CFStringRef title = CFStringCreateWithCString(NULL, (name ? name : ""), kCFStringEncodingUTF8);
if(!title) { // fallback when name contains malformed UTF-8
- int l = strlen(name);
+ int l = (int)strlen(name);
unsigned short* utf16 = new unsigned short[l + 1];
l = fl_utf8toUtf16(name, l, utf16, l + 1);
title = CFStringCreateWithCharacters(NULL, utf16, l);
@@ -2471,10 +2471,10 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
- (void)flagsChanged:(NSEvent *)theEvent {
//NSLog(@"flagsChanged: ");
fl_lock_function();
- static UInt32 prevMods = 0;
- NSUInteger mods = [theEvent modifierFlags];
+ static NSEventModifierFlags prevMods = 0;
+ NSEventModifierFlags mods = [theEvent modifierFlags];
Fl_Window *window = (Fl_Window*)[(FLWindow*)[theEvent window] getFl_Window];
- UInt32 tMods = prevMods ^ mods;
+ NSEventModifierFlags tMods = prevMods ^ mods;
int sendEvent = 0;
if ( tMods )
{
@@ -2537,7 +2537,7 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
if ( [[pboard types] containsObject:NSFilenamesPboardType] ) {
CFArrayRef files = (CFArrayRef)[pboard propertyListForType:NSFilenamesPboardType];
CFStringRef all = CFStringCreateByCombiningStrings(NULL, files, CFSTR("\n"));
- int l = CFStringGetMaximumSizeForEncoding(CFStringGetLength(all), kCFStringEncodingUTF8);
+ int l = (int)CFStringGetMaximumSizeForEncoding(CFStringGetLength(all), kCFStringEncodingUTF8);
DragData = (char *)malloc(l + 1);
CFStringGetCString(all, DragData, l + 1, kCFStringEncodingUTF8);
CFRelease(all);
@@ -2555,7 +2555,7 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
return NO;
}
Fl::e_text = DragData;
- Fl::e_length = strlen(DragData);
+ Fl::e_length = (int)strlen(DragData);
int old_event = Fl::e_number;
Fl::belowmouse()->handle(Fl::e_number = FL_PASTE);
Fl::e_number = old_event;
@@ -2586,7 +2586,7 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
static char *received_utf8 = NULL;
static int lreceived = 0;
char *p = (char*)[aString UTF8String];
- int l = strlen(p);
+ int l = (int)strlen(p);
if (l > 0) {
if (lreceived == 0) {
received_utf8 = (char*)malloc(l + 1);
@@ -2704,7 +2704,7 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
}
if (in_key_event && Fl::e_length) [FLView concatEtext:received];
else [FLView prepareEtext:received];
- Fl_Cocoa_Screen_Driver::next_marked_length = strlen([received UTF8String]);
+ Fl_Cocoa_Screen_Driver::next_marked_length = (int)strlen([received UTF8String]);
if (!in_key_event) Fl::handle( FL_KEYBOARD, target);
else need_handle = YES;
selectedRange = NSMakeRange(100, newSelection.length);
@@ -3539,7 +3539,7 @@ static int get_plain_text_from_clipboard(int clipboard)
len = strlen(aux_c) + 1;
}
else len = [data length] + 1;
- resize_selection_buffer(len, clipboard);
+ resize_selection_buffer((int)len, clipboard);
if (![found isEqualToString:UTF8_pasteboard_type]) {
strcpy(fl_selection_buffer[clipboard], aux_c);
free(aux_c);
@@ -3552,7 +3552,7 @@ static int get_plain_text_from_clipboard(int clipboard)
Fl::e_clipboard_type = Fl::clipboard_plain_text;
}
}
- return length;
+ return (int)length;
}
static Fl_RGB_Image* get_image_from_clipboard(Fl_Widget *receiver)
@@ -3581,10 +3581,10 @@ static Fl_RGB_Image* get_image_from_clipboard(Fl_Widget *receiver)
bitmap = pdf_to_nsbitmapimagerep(data);
}
if (!bitmap) return NULL;
- int bytesPerPixel([bitmap bitsPerPixel]/8);
- int bpr([bitmap bytesPerRow]);
- int hh([bitmap pixelsHigh]);
- int ww([bitmap pixelsWide]);
+ int bytesPerPixel((int)[bitmap bitsPerPixel]/8);
+ int bpr((int)[bitmap bytesPerRow]);
+ int hh((int)[bitmap pixelsHigh]);
+ int ww((int)[bitmap pixelsWide]);
uchar *imagedata = new uchar[bpr * hh];
memcpy(imagedata, [bitmap bitmapData], bpr * hh);
Fl_RGB_Image *image = new Fl_RGB_Image(imagedata, ww, hh, bytesPerPixel, (bpr == ww * bytesPerPixel ? 0 : bpr) );
@@ -3966,13 +3966,13 @@ void Fl_Cocoa_Window_Driver::set_key_window()
static NSImage *imageFromText(const char *text, int *pwidth, int *pheight)
{
const char *p, *q;
- int width = 0, height, w2, ltext = strlen(text);
+ int width = 0, height, w2, ltext = (int)strlen(text);
fl_font(FL_HELVETICA, 10);
p = text;
int nl = 0;
while(nl < 100 && (q=strchr(p, '\n')) != NULL) {
nl++;
- w2 = int(fl_width(p, q - p));
+ w2 = (int)fl_width(p, (int)(q - p));
if (w2 > width) width = w2;
p = q + 1;
}
@@ -3994,7 +3994,7 @@ static NSImage *imageFromText(const char *text, int *pwidth, int *pheight)
while(TRUE) {
q = strchr(p, '\n');
if (q) {
- fl_draw(p, q - p, 3, y);
+ fl_draw(p, (int)(q - p), 3, y);
} else {
fl_draw(p, 3, y);
break;
@@ -4101,8 +4101,8 @@ int Fl_Cocoa_Screen_Driver::dnd(int use_selection)
// rescales an NSBitmapImageRep (and also rewrites it with integer pixels)
static NSBitmapImageRep *scale_nsbitmapimagerep(NSBitmapImageRep *img, float scale)
{
- int w = [img pixelsWide];
- int h = [img pixelsHigh];
+ int w = (int)[img pixelsWide];
+ int h = (int)[img pixelsHigh];
long int scaled_w = lround(scale * w);
long int scaled_h = lround(scale * h);
NSBitmapImageRep *scaled = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
@@ -4153,8 +4153,9 @@ static void write_bitmap_inside(NSBitmapImageRep *to, int to_width, NSBitmapImag
#endif
int to_w = (int)[to pixelsWide]; // pixel width of "to"
int from_w = (int)[from pixelsWide]; // pixel width of "from"
- int from_h = [from pixelsHigh]; // pixel height of "from"
- int to_depth = [to samplesPerPixel], from_depth = [from samplesPerPixel];
+ int from_h = (int)[from pixelsHigh]; // pixel height of "from"
+ int to_depth = (int)[to samplesPerPixel];
+ int from_depth = (int)[from samplesPerPixel];
int depth = 0;
if (to_depth > from_depth) depth = from_depth;
else if (from_depth > to_depth) depth = to_depth;
@@ -4397,14 +4398,14 @@ void Fl_Cocoa_Window_Driver::draw_titlebar_to_context(CGContextRef gc, int w, in
*/
int Fl_Darwin_System_Driver::calc_mac_os_version() {
if (fl_mac_os_version) return fl_mac_os_version;
- int M, m, b = 0;
+ int M = 0, m = 0, b = 0;
NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init];
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
if ([NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)]) {
NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
- M = version.majorVersion;
- m = version.minorVersion;
- b = version.patchVersion;
+ M = (int)version.majorVersion;
+ m = (int)version.minorVersion;
+ b = (int)version.patchVersion;
}
else
#endif
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
index 94e0f0104..e2ccbe969 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
@@ -355,8 +355,8 @@ int Fl_Cocoa_Screen_Driver::input_widget_handle_key(int key, unsigned mods, unsi
void Fl_Cocoa_Screen_Driver::offscreen_size(Fl_Offscreen off, int &width, int &height)
{
- width = CGBitmapContextGetWidth((CGContextRef)off);
- height = CGBitmapContextGetHeight((CGContextRef)off);
+ width = (int)CGBitmapContextGetWidth((CGContextRef)off);
+ height = (int)CGBitmapContextGetHeight((CGContextRef)off);
}
Fl_RGB_Image *Fl_Cocoa_Screen_Driver::read_win_rectangle(int X, int Y, int w, int h, Fl_Window *window,
@@ -369,11 +369,11 @@ Fl_RGB_Image *Fl_Cocoa_Screen_Driver::read_win_rectangle(int X, int Y, int w, in
CGContextRef src = (CGContextRef)Fl_Surface_Device::surface()->driver()->gc(); // get bitmap context
base = (uchar *)CGBitmapContextGetData(src); // get data
if(!base) return NULL;
- int sw = CGBitmapContextGetWidth(src);
- int sh = CGBitmapContextGetHeight(src);
+ int sw = (int)CGBitmapContextGetWidth(src);
+ int sh = (int)CGBitmapContextGetHeight(src);
if( (sw - X < w) || (sh - Y < h) ) return NULL;
- bpr = CGBitmapContextGetBytesPerRow(src);
- bpp = CGBitmapContextGetBitsPerPixel(src)/8;
+ bpr = (int)CGBitmapContextGetBytesPerRow(src);
+ bpp = (int)CGBitmapContextGetBitsPerPixel(src)/8;
Fl_Image_Surface *imgs = (Fl_Image_Surface*)Fl_Surface_Device::surface();
int fltk_w, fltk_h;
imgs->printable_rect(&fltk_w, &fltk_h);
@@ -400,16 +400,16 @@ Fl_RGB_Image *Fl_Cocoa_Screen_Driver::read_win_rectangle(int X, int Y, int w, in
if (!cgimg) {
return NULL;
}
- w = CGImageGetWidth(cgimg);
- h = CGImageGetHeight(cgimg);
+ w = (int)CGImageGetWidth(cgimg);
+ h = (int)CGImageGetHeight(cgimg);
Fl_Image_Surface *surf = new Fl_Image_Surface(w, h);
Fl_Surface_Device::push_current(surf);
((Fl_Quartz_Graphics_Driver*)fl_graphics_driver)->draw_CGImage(cgimg, 0, 0, w, h, 0, 0, w, h);
CGContextRef gc = (CGContextRef)fl_graphics_driver->gc();
- w = CGBitmapContextGetWidth(gc);
- h = CGBitmapContextGetHeight(gc);
- bpr = CGBitmapContextGetBytesPerRow(gc);
- bpp = CGBitmapContextGetBitsPerPixel(gc)/8;
+ w = (int)CGBitmapContextGetWidth(gc);
+ h = (int)CGBitmapContextGetHeight(gc);
+ bpr = (int)CGBitmapContextGetBytesPerRow(gc);
+ bpp = (int)CGBitmapContextGetBitsPerPixel(gc)/8;
base = (uchar*)CGBitmapContextGetData(gc);
p = new uchar[bpr * h];
memcpy(p, base, bpr * h);
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
index 825056e44..22b6af0f8 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
@@ -243,7 +243,7 @@ int Fl_Cocoa_Window_Driver::scroll(int src_x, int src_y, int src_w, int src_h, i
// the current surface is generally the display, but is an Fl_Image_Surface when scrolling an Fl_Overlay_Window
Fl_Quartz_Graphics_Driver *qgd = (Fl_Quartz_Graphics_Driver*)Fl_Surface_Device::surface()->driver();
float s = qgd->scale();
- qgd->draw_CGImage(img, dest_x, dest_y, lround(s*src_w), lround(s*src_h), 0, 0, src_w, src_h);
+ qgd->draw_CGImage(img, dest_x, dest_y, (int)lround(s*src_w), (int)lround(s*src_h), 0, 0, src_w, src_h);
CFRelease(img);
return 0;
}
diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
index 2d1e4d4e4..aa5ccbe0a 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
@@ -131,7 +131,7 @@ int Fl_Darwin_System_Driver::filename_list(const char *d, dirent ***list,
int dirlen;
char *dirloc;
// Assume that locale encoding is no less dense than UTF-8
- dirlen = strlen(d);
+ dirlen = (int)strlen(d);
dirloc = (char *)d;
# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
int n = scandir(dirloc, list, 0, (int(*)(const struct dirent**,const struct dirent**))sort);
@@ -153,7 +153,7 @@ int Fl_Darwin_System_Driver::filename_list(const char *d, dirent ***list,
for (i=0; i<n; i++) {
int newlen;
dirent *de = (*list)[i];
- int len = strlen(de->d_name);
+ int len = (int)strlen(de->d_name);
newlen = len;
dirent *newde = (dirent*)malloc(de->d_name - (char*)de + newlen + 2); // Add space for a / and a nul
// Conversion to UTF-8
@@ -298,7 +298,7 @@ static int n_buf = 0;
const char *Fl_Darwin_System_Driver::latin1_to_local(const char *t, int n)
{
- if (n==-1) n = strlen(t);
+ if (n==-1) n = (int)strlen(t);
if (n<=n_buf) {
n_buf = (n + 257) & 0x7fffff00;
if (buf) free(buf);
@@ -319,7 +319,7 @@ const char *Fl_Darwin_System_Driver::latin1_to_local(const char *t, int n)
const char *Fl_Darwin_System_Driver::local_to_latin1(const char *t, int n)
{
- if (n==-1) n = strlen(t);
+ if (n==-1) n = (int)strlen(t);
if (n<=n_buf) {
n_buf = (n + 257) & 0x7fffff00;
if (buf) free(buf);
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
index 552da03f9..d3f3d343a 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
@@ -92,8 +92,8 @@ void Fl_Quartz_Graphics_Driver::copy_offscreen(int x, int y, int w, int h, Fl_Of
// draw portion srcx,srcy,w,h of osrc to position x,y (top-left) of the graphics driver's surface
CGContextRef src = (CGContextRef)osrc;
void *data = CGBitmapContextGetData(src);
- int sw = CGBitmapContextGetWidth(src);
- int sh = CGBitmapContextGetHeight(src);
+ int sw = (int)CGBitmapContextGetWidth(src);
+ int sh = (int)CGBitmapContextGetHeight(src);
CGImageRef img;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if (fl_mac_os_version >= 100400) img = CGBitmapContextCreateImage(src); // requires 10.4
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
index b97cfbba7..87d4d4f32 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
@@ -252,8 +252,8 @@ void Fl_Quartz_Graphics_Driver::cache(Fl_Pixmap *img) {
Fl_Surface_Device::pop_current();
CGContextRef src = (CGContextRef)Fl_Graphics_Driver::get_offscreen_and_delete_image_surface(surf);
void *cgdata = CGBitmapContextGetData(src);
- int sw = CGBitmapContextGetWidth(src);
- int sh = CGBitmapContextGetHeight(src);
+ int sw = (int)CGBitmapContextGetWidth(src);
+ int sh = (int)CGBitmapContextGetHeight(src);
CGImageAlphaInfo alpha = CGBitmapContextGetAlphaInfo(src);
CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB();
CGDataProviderRef src_bytes = CGDataProviderCreateWithData(src, cgdata, sw*sh*4, pmProviderRelease);
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
index 8e17f87c5..6a63ae483 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
@@ -54,7 +54,7 @@ void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) {
CGFloat *pDst = pattern;
while (*d) { *pDst++ = (float)*d++; }
quartz_line_pattern = pattern;
- quartz_line_pattern_size = d-dashes;
+ quartz_line_pattern_size = (int)(d-dashes);
} else if (style & 0xff) {
char dash, dot, gap;
// adjust lengths to account for cap:
@@ -73,7 +73,7 @@ void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) {
case FL_DASHDOT: *pDst++ = dash; *pDst++ = gap; *pDst++ = dot; *pDst++ = gap; break;
case FL_DASHDOTDOT: *pDst++ = dash; *pDst++ = gap; *pDst++ = dot; *pDst++ = gap; *pDst++ = dot; *pDst++ = gap; break;
}
- quartz_line_pattern_size = pDst-pattern;
+ quartz_line_pattern_size = (int)(pDst-pattern);
quartz_line_pattern = pattern;
} else {
quartz_line_pattern = 0;
diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx
index 2f1acc5d9..451078484 100644
--- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx
@@ -79,10 +79,10 @@ void Fl_Quartz_Image_Surface_Driver::untranslate() {
Fl_RGB_Image* Fl_Quartz_Image_Surface_Driver::image()
{
CGContextFlush((CGContextRef)offscreen);
- int W = CGBitmapContextGetWidth((CGContextRef)offscreen);
- int H = CGBitmapContextGetHeight((CGContextRef)offscreen);
- int bpr = CGBitmapContextGetBytesPerRow((CGContextRef)offscreen);
- int bpp = CGBitmapContextGetBitsPerPixel((CGContextRef)offscreen)/8;
+ int W = (int)CGBitmapContextGetWidth((CGContextRef)offscreen);
+ int H = (int)CGBitmapContextGetHeight((CGContextRef)offscreen);
+ int bpr = (int)CGBitmapContextGetBytesPerRow((CGContextRef)offscreen);
+ int bpp = (int)CGBitmapContextGetBitsPerPixel((CGContextRef)offscreen)/8;
uchar *base = (uchar*)CGBitmapContextGetData((CGContextRef)offscreen);
int idx, idy;
uchar *pdst, *psrc;
diff --git a/src/fl_utf8.cxx b/src/fl_utf8.cxx
index 6028f3172..fcbb63ee0 100644
--- a/src/fl_utf8.cxx
+++ b/src/fl_utf8.cxx
@@ -40,7 +40,7 @@
#define NBC 0xFFFF + 1
static int Toupper(int ucs) {
- long i;
+ int i;
static unsigned short *table = NULL;
if (!table) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 12:41:16 +0000