Skip to content

Commit

Permalink
Fix indenting, whitespace errors and dependencies
Browse files Browse the repository at this point in the history 
(no code changes)
  • Loading branch information
Albrecht Schlosser committed Oct 27, 2021
1 parent b6b1fcc commit 14f8427
Show file tree
Hide file tree
Showing 6 changed files with 354 additions and 6 deletions.
1 change: 1 addition & 0 deletions cairo/makedepend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Fl_Cairo.o: ../FL/Enumerations.H
Fl_Cairo.o: ../FL/Fl.H
Fl_Cairo.o: ../FL/Fl_Bitmap.H
Fl_Cairo.o: ../FL/Fl_Cairo.H
Fl_Cairo.o: ../FL/fl_casts.H
Fl_Cairo.o: ../FL/Fl_Export.H
Fl_Cairo.o: ../FL/Fl_Group.H
Fl_Cairo.o: ../FL/Fl_Image.H
Expand Down
37 changes: 37 additions & 0 deletions fluid/makedepend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ about_panel.o: ../FL/Enumerations.H
about_panel.o: ../FL/Fl.H
about_panel.o: ../FL/Fl_Box.H
about_panel.o: ../FL/Fl_Button.H
about_panel.o: ../FL/fl_casts.H
about_panel.o: ../FL/Fl_Double_Window.H
about_panel.o: ../FL/Fl_Export.H
about_panel.o: ../FL/Fl_Image.H
Expand All @@ -22,9 +23,11 @@ alignment_panel.o: ../FL/Enumerations.H
alignment_panel.o: ../FL/filename.H
alignment_panel.o: ../FL/Fl.H
alignment_panel.o: ../FL/fl_ask.H
alignment_panel.o: ../FL/fl_attr.h
alignment_panel.o: ../FL/Fl_Bitmap.H
alignment_panel.o: ../FL/Fl_Box.H
alignment_panel.o: ../FL/Fl_Button.H
alignment_panel.o: ../FL/fl_casts.H
alignment_panel.o: ../FL/Fl_Check_Button.H
alignment_panel.o: ../FL/Fl_Choice.H
alignment_panel.o: ../FL/Fl_Device.H
Expand Down Expand Up @@ -65,7 +68,9 @@ alignment_panel.o: alignment_panel.h
align_widget.o: ../FL/abi-version.h
align_widget.o: ../FL/Enumerations.H
align_widget.o: ../FL/Fl.H
align_widget.o: ../FL/fl_attr.h
align_widget.o: ../FL/Fl_Bitmap.H
align_widget.o: ../FL/fl_casts.H
align_widget.o: ../FL/Fl_Choice.H
align_widget.o: ../FL/Fl_Device.H
align_widget.o: ../FL/fl_draw.H
Expand Down Expand Up @@ -104,9 +109,11 @@ code.o: ../FL/abi-version.h
code.o: ../FL/Enumerations.H
code.o: ../FL/filename.H
code.o: ../FL/Fl.H
code.o: ../FL/fl_attr.h
code.o: ../FL/Fl_Bitmap.H
code.o: ../FL/Fl_Box.H
code.o: ../FL/Fl_Button.H
code.o: ../FL/fl_casts.H
code.o: ../FL/Fl_Check_Button.H
code.o: ../FL/Fl_Choice.H
code.o: ../FL/Fl_Device.H
Expand Down Expand Up @@ -160,6 +167,7 @@ CodeEditor.o: ../FL/abi-version.h
CodeEditor.o: ../FL/Enumerations.H
CodeEditor.o: ../FL/Fl.H
CodeEditor.o: ../FL/Fl_Bitmap.H
CodeEditor.o: ../FL/fl_casts.H
CodeEditor.o: ../FL/Fl_Device.H
CodeEditor.o: ../FL/fl_draw.H
CodeEditor.o: ../FL/Fl_Export.H
Expand All @@ -186,6 +194,8 @@ ExternalCodeEditor_UNIX.o: ../FL/abi-version.h
ExternalCodeEditor_UNIX.o: ../FL/Enumerations.H
ExternalCodeEditor_UNIX.o: ../FL/Fl.H
ExternalCodeEditor_UNIX.o: ../FL/fl_ask.H
ExternalCodeEditor_UNIX.o: ../FL/fl_attr.h
ExternalCodeEditor_UNIX.o: ../FL/fl_casts.H
ExternalCodeEditor_UNIX.o: ../FL/Fl_Export.H
ExternalCodeEditor_UNIX.o: ../FL/fl_string.h
ExternalCodeEditor_UNIX.o: ../FL/fl_types.h
Expand All @@ -198,11 +208,13 @@ factory.o: ../FL/Enumerations.H
factory.o: ../FL/filename.H
factory.o: ../FL/Fl.H
factory.o: ../FL/Fl_Adjuster.H
factory.o: ../FL/fl_attr.h
factory.o: ../FL/Fl_Bitmap.H
factory.o: ../FL/Fl_Box.H
factory.o: ../FL/Fl_Browser.H
factory.o: ../FL/Fl_Browser_.H
factory.o: ../FL/Fl_Button.H
factory.o: ../FL/fl_casts.H
factory.o: ../FL/Fl_Check_Browser.H
factory.o: ../FL/Fl_Check_Button.H
factory.o: ../FL/Fl_Choice.H
Expand Down Expand Up @@ -275,9 +287,11 @@ file.o: ../FL/Enumerations.H
file.o: ../FL/filename.H
file.o: ../FL/Fl.H
file.o: ../FL/fl_ask.H
file.o: ../FL/fl_attr.h
file.o: ../FL/Fl_Bitmap.H
file.o: ../FL/Fl_Box.H
file.o: ../FL/Fl_Button.H
file.o: ../FL/fl_casts.H
file.o: ../FL/Fl_Check_Button.H
file.o: ../FL/Fl_Choice.H
file.o: ../FL/Fl_Device.H
Expand Down Expand Up @@ -335,11 +349,13 @@ fluid.o: ../FL/Enumerations.H
fluid.o: ../FL/filename.H
fluid.o: ../FL/Fl.H
fluid.o: ../FL/fl_ask.H
fluid.o: ../FL/fl_attr.h
fluid.o: ../FL/Fl_Bitmap.H
fluid.o: ../FL/Fl_Box.H
fluid.o: ../FL/Fl_Browser.H
fluid.o: ../FL/Fl_Browser_.H
fluid.o: ../FL/Fl_Button.H
fluid.o: ../FL/fl_casts.H
fluid.o: ../FL/Fl_Check_Button.H
fluid.o: ../FL/Fl_Choice.H
fluid.o: ../FL/Fl_Device.H
Expand Down Expand Up @@ -416,11 +432,13 @@ Fluid_Image.o: ../FL/Enumerations.H
Fluid_Image.o: ../FL/filename.H
Fluid_Image.o: ../FL/Fl.H
Fluid_Image.o: ../FL/fl_ask.H
Fluid_Image.o: ../FL/fl_attr.h
Fluid_Image.o: ../FL/Fl_Bitmap.H
Fluid_Image.o: ../FL/Fl_Box.H
Fluid_Image.o: ../FL/Fl_Browser.H
Fluid_Image.o: ../FL/Fl_Browser_.H
Fluid_Image.o: ../FL/Fl_Button.H
Fluid_Image.o: ../FL/fl_casts.H
Fluid_Image.o: ../FL/Fl_Check_Button.H
Fluid_Image.o: ../FL/Fl_Choice.H
Fluid_Image.o: ../FL/Fl_Device.H
Expand Down Expand Up @@ -472,11 +490,13 @@ Fl_Function_Type.o: ../FL/Enumerations.H
Fl_Function_Type.o: ../FL/filename.H
Fl_Function_Type.o: ../FL/Fl.H
Fl_Function_Type.o: ../FL/fl_ask.H
Fl_Function_Type.o: ../FL/fl_attr.h
Fl_Function_Type.o: ../FL/Fl_Bitmap.H
Fl_Function_Type.o: ../FL/Fl_Box.H
Fl_Function_Type.o: ../FL/Fl_Browser.H
Fl_Function_Type.o: ../FL/Fl_Browser_.H
Fl_Function_Type.o: ../FL/Fl_Button.H
Fl_Function_Type.o: ../FL/fl_casts.H
Fl_Function_Type.o: ../FL/Fl_Check_Button.H
Fl_Function_Type.o: ../FL/Fl_Choice.H
Fl_Function_Type.o: ../FL/Fl_Device.H
Expand Down Expand Up @@ -542,7 +562,9 @@ Fl_Group_Type.o: ../FL/abi-version.h
Fl_Group_Type.o: ../FL/Enumerations.H
Fl_Group_Type.o: ../FL/Fl.H
Fl_Group_Type.o: ../FL/fl_ask.H
Fl_Group_Type.o: ../FL/fl_attr.h
Fl_Group_Type.o: ../FL/Fl_Bitmap.H
Fl_Group_Type.o: ../FL/fl_casts.H
Fl_Group_Type.o: ../FL/Fl_Choice.H
Fl_Group_Type.o: ../FL/Fl_Device.H
Fl_Group_Type.o: ../FL/fl_draw.H
Expand Down Expand Up @@ -588,9 +610,11 @@ Fl_Menu_Type.o: ../FL/Enumerations.H
Fl_Menu_Type.o: ../FL/filename.H
Fl_Menu_Type.o: ../FL/Fl.H
Fl_Menu_Type.o: ../FL/fl_ask.H
Fl_Menu_Type.o: ../FL/fl_attr.h
Fl_Menu_Type.o: ../FL/Fl_Bitmap.H
Fl_Menu_Type.o: ../FL/Fl_Box.H
Fl_Menu_Type.o: ../FL/Fl_Button.H
Fl_Menu_Type.o: ../FL/fl_casts.H
Fl_Menu_Type.o: ../FL/Fl_Check_Button.H
Fl_Menu_Type.o: ../FL/Fl_Choice.H
Fl_Menu_Type.o: ../FL/Fl_Device.H
Expand Down Expand Up @@ -648,8 +672,10 @@ Fl_Type.o: ../config.h
Fl_Type.o: ../FL/abi-version.h
Fl_Type.o: ../FL/Enumerations.H
Fl_Type.o: ../FL/Fl.H
Fl_Type.o: ../FL/fl_attr.h
Fl_Type.o: ../FL/Fl_Bitmap.H
Fl_Type.o: ../FL/Fl_Browser_.H
Fl_Type.o: ../FL/fl_casts.H
Fl_Type.o: ../FL/Fl_Choice.H
Fl_Type.o: ../FL/Fl_Device.H
Fl_Type.o: ../FL/fl_draw.H
Expand Down Expand Up @@ -747,9 +773,11 @@ Fl_Widget_Type.o: ../FL/Enumerations.H
Fl_Widget_Type.o: ../FL/filename.H
Fl_Widget_Type.o: ../FL/Fl.H
Fl_Widget_Type.o: ../FL/fl_ask.H
Fl_Widget_Type.o: ../FL/fl_attr.h
Fl_Widget_Type.o: ../FL/Fl_Bitmap.H
Fl_Widget_Type.o: ../FL/Fl_Box.H
Fl_Widget_Type.o: ../FL/Fl_Button.H
Fl_Widget_Type.o: ../FL/fl_casts.H
Fl_Widget_Type.o: ../FL/Fl_Check_Button.H
Fl_Widget_Type.o: ../FL/Fl_Choice.H
Fl_Widget_Type.o: ../FL/Fl_Device.H
Expand Down Expand Up @@ -816,9 +844,11 @@ Fl_Window_Type.o: ../FL/Enumerations.H
Fl_Window_Type.o: ../FL/filename.H
Fl_Window_Type.o: ../FL/Fl.H
Fl_Window_Type.o: ../FL/fl_ask.H
Fl_Window_Type.o: ../FL/fl_attr.h
Fl_Window_Type.o: ../FL/Fl_Bitmap.H
Fl_Window_Type.o: ../FL/Fl_Box.H
Fl_Window_Type.o: ../FL/Fl_Button.H
Fl_Window_Type.o: ../FL/fl_casts.H
Fl_Window_Type.o: ../FL/Fl_Check_Button.H
Fl_Window_Type.o: ../FL/Fl_Choice.H
Fl_Window_Type.o: ../FL/Fl_Device.H
Expand Down Expand Up @@ -882,9 +912,11 @@ Fl_Window_Type.o: widget_panel.h
function_panel.o: ../FL/abi-version.h
function_panel.o: ../FL/Enumerations.H
function_panel.o: ../FL/Fl.H
function_panel.o: ../FL/fl_attr.h
function_panel.o: ../FL/Fl_Bitmap.H
function_panel.o: ../FL/Fl_Box.H
function_panel.o: ../FL/Fl_Button.H
function_panel.o: ../FL/fl_casts.H
function_panel.o: ../FL/Fl_Check_Button.H
function_panel.o: ../FL/Fl_Choice.H
function_panel.o: ../FL/Fl_Device.H
Expand Down Expand Up @@ -937,10 +969,12 @@ template_panel.o: ../FL/Enumerations.H
template_panel.o: ../FL/filename.H
template_panel.o: ../FL/Fl.H
template_panel.o: ../FL/fl_ask.H
template_panel.o: ../FL/fl_attr.h
template_panel.o: ../FL/Fl_Box.H
template_panel.o: ../FL/Fl_Browser.H
template_panel.o: ../FL/Fl_Browser_.H
template_panel.o: ../FL/Fl_Button.H
template_panel.o: ../FL/fl_casts.H
template_panel.o: ../FL/Fl_Double_Window.H
template_panel.o: ../FL/Fl_Export.H
template_panel.o: ../FL/Fl_Group.H
Expand All @@ -966,7 +1000,9 @@ undo.o: ../FL/abi-version.h
undo.o: ../FL/Enumerations.H
undo.o: ../FL/filename.H
undo.o: ../FL/Fl.H
undo.o: ../FL/fl_attr.h
undo.o: ../FL/Fl_Bitmap.H
undo.o: ../FL/fl_casts.H
undo.o: ../FL/Fl_Choice.H
undo.o: ../FL/Fl_Device.H
undo.o: ../FL/fl_draw.H
Expand Down Expand Up @@ -1006,6 +1042,7 @@ widget_panel.o: ../FL/Fl.H
widget_panel.o: ../FL/Fl_Bitmap.H
widget_panel.o: ../FL/Fl_Box.H
widget_panel.o: ../FL/Fl_Button.H
widget_panel.o: ../FL/fl_casts.H
widget_panel.o: ../FL/Fl_Choice.H
widget_panel.o: ../FL/Fl_Device.H
widget_panel.o: ../FL/Fl_Double_Window.H
Expand Down
2 changes: 1 addition & 1 deletion src/Fl_cocoa.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3503,7 +3503,7 @@ static void restore_window_title_and_icon(Fl_Window *pWindow, NSImage *icon) {
NSPasteboard *clip = [NSPasteboard generalPasteboard];
[clip declareTypes:[NSArray arrayWithObjects:PDF_pasteboard_type, TIFF_pasteboard_type, nil] owner:nil];
[clip setData:(NSData*)pdfdata forType:PDF_pasteboard_type];

//second, transform this PDF to a bitmap image and put it as tiff in clipboard with retina resolution
NSBitmapImageRep *bitmap = pdf_to_nsbitmapimagerep((NSData*)pdfdata);
CFRelease(pdfdata);
Expand Down
10 changes: 5 additions & 5 deletions src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ void Fl_Xlib_Graphics_Driver::line_style_unscaled(int style, int width, char* da
}
char* p = dashes = buf;
switch (style & 0xff) {
case FL_DASH: *p++ = dash; *p++ = gap; break;
case FL_DOT: *p++ = dot; *p++ = gap; break;
case FL_DASHDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; break;
case FL_DASHDOTDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; *p++ = dot; *p++ = gap; break;
case FL_DASH: *p++ = dash; *p++ = gap; break;
case FL_DOT: *p++ = dot; *p++ = gap; break;
case FL_DASHDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; break;
case FL_DASHDOTDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; *p++ = dot; *p++ = gap; break;
}
ndashes = p-buf;
if (*dashes == 0) ndashes = 0;//against error with very small scaling
if (*dashes == 0) ndashes = 0; // against error with very small scaling
}
static int Cap[4] = {CapButt, CapButt, CapRound, CapProjecting};
static int Join[4] = {JoinMiter, JoinMiter, JoinRound, JoinBevel};
Expand Down

0 comments on commit 14f8427

Please sign in to comment.