From: curt Date: Fri, 24 Jul 1998 21:36:55 +0000 (+0000) Subject: Ran dos2unix to get rid of extraneous ^M's. Tweaked parameter in X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9e301558c97329c3cf2dc17a1b17f6b3ffe0a051;p=flightgear.git Ran dos2unix to get rid of extraneous ^M's. Tweaked parameter in ImageGetRawData() to match usage. --- diff --git a/Cockpit/hud.hxx b/Cockpit/hud.hxx index b555568a4..91df15a8d 100644 --- a/Cockpit/hud.hxx +++ b/Cockpit/hud.hxx @@ -53,8 +53,8 @@ #include #include +#include // STL double ended queue -#include // STL #ifdef NEEDNAMESPACESTD using namespace std; #endif @@ -116,17 +116,17 @@ enum fgLabelJust{ LEFT_JUST, CENTER_JUST, RIGHT_JUST } ; #define LABEL_WARNING 2 #define HUDS_AUTOTICKS 0x0001 -#define HUDS_VERT 0x0002 -#define HUDS_HORZ 0x0000 -#define HUDS_TOP 0x0004 -#define HUDS_BOTTOM 0x0008 -#define HUDS_LEFT HUDS_TOP -#define HUDS_RIGHT HUDS_BOTTOM -#define HUDS_BOTH (HUDS_LEFT | HUDS_RIGHT) -#define HUDS_NOTICKS 0x0010 -#define HUDS_ARITHTIC 0x0020 -#define HUDS_DECITICS 0x0040 -#define HUDS_NOTEXT 0x0080 +#define HUDS_VERT 0x0002 +#define HUDS_HORZ 0x0000 +#define HUDS_TOP 0x0004 +#define HUDS_BOTTOM 0x0008 +#define HUDS_LEFT HUDS_TOP +#define HUDS_RIGHT HUDS_BOTTOM +#define HUDS_BOTH (HUDS_LEFT | HUDS_RIGHT) +#define HUDS_NOTICKS 0x0010 +#define HUDS_ARITHTIC 0x0020 +#define HUDS_DECITICS 0x0040 +#define HUDS_NOTEXT 0x0080 // Ladder orientaion // #define HUD_VERTICAL 1 @@ -523,9 +523,13 @@ void fgHUDSetTimeMode( Hptr hud, int time_of_day ); #endif // _HUD_H /* $Log$ -/* Revision 1.10 1998/07/13 21:28:02 curt -/* Converted the aoa scale to a radio altimeter. +/* Revision 1.11 1998/07/24 21:36:55 curt +/* Ran dos2unix to get rid of extraneous ^M's. Tweaked parameter in +/* ImageGetRawData() to match usage. /* + * Revision 1.10 1998/07/13 21:28:02 curt + * Converted the aoa scale to a radio altimeter. + * * Revision 1.9 1998/07/13 21:00:48 curt * Integrated Charlies latest HUD updates. * Wrote access functions for current fgOPTIONS. diff --git a/Cockpit/hud_card.cxx b/Cockpit/hud_card.cxx index 55f8d1df0..6018cf0b6 100644 --- a/Cockpit/hud_card.cxx +++ b/Cockpit/hud_card.cxx @@ -19,7 +19,7 @@ #include "hud.hxx" -//========== Top of hud_card class member definitions ============= +//========== Top of hud_card class member definitions ============= hud_card :: hud_card( int x, diff --git a/Cockpit/hud_dnst.cxx b/Cockpit/hud_dnst.cxx index e071a65e8..bb4e67a56 100644 --- a/Cockpit/hud_dnst.cxx +++ b/Cockpit/hud_dnst.cxx @@ -1,4 +1,4 @@ -#ifdef HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -19,7 +19,7 @@ #include "hud.hxx" - + //============ Top of dual_instr_item class member definitions ============ dual_instr_item :: diff --git a/Cockpit/hud_guag.cxx b/Cockpit/hud_guag.cxx index c1c3dbf7d..7ea060257 100644 --- a/Cockpit/hud_guag.cxx +++ b/Cockpit/hud_guag.cxx @@ -19,7 +19,7 @@ #include "hud.hxx" -//============== Top of guage_instr class member definitions ============== +//============== Top of guage_instr class member definitions ============== guage_instr :: guage_instr( int x, diff --git a/Cockpit/hud_inst.cxx b/Cockpit/hud_inst.cxx index f13102fb6..b0cb37ee0 100644 --- a/Cockpit/hud_inst.cxx +++ b/Cockpit/hud_inst.cxx @@ -1,4 +1,4 @@ -// Abstract Base Class instr_item +// Abstract Base Class instr_item // #ifdef HAVE_CONFIG_H # include diff --git a/Cockpit/hud_labl.cxx b/Cockpit/hud_labl.cxx index 38665b83d..2925692f3 100644 --- a/Cockpit/hud_labl.cxx +++ b/Cockpit/hud_labl.cxx @@ -1,4 +1,4 @@ -#ifdef HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -19,8 +19,8 @@ #include "hud.hxx" - -//======================= Top of instr_label class ========================= + +//======================= Top of instr_label class ========================= instr_label :: instr_label( int x, int y, diff --git a/Cockpit/hud_ladr.cxx b/Cockpit/hud_ladr.cxx index 2eff54463..534374691 100644 --- a/Cockpit/hud_ladr.cxx +++ b/Cockpit/hud_ladr.cxx @@ -1,4 +1,4 @@ -#ifdef HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -19,7 +19,7 @@ #include "hud.hxx" -//====================== Top of HudLadder Class ======================= +//====================== Top of HudLadder Class ======================= HudLadder :: HudLadder( int x, int y, diff --git a/Cockpit/hud_scal.cxx b/Cockpit/hud_scal.cxx index f2c3fe3b0..ad74c33f4 100644 --- a/Cockpit/hud_scal.cxx +++ b/Cockpit/hud_scal.cxx @@ -1,4 +1,4 @@ -#ifdef HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -19,7 +19,7 @@ #include "hud.hxx" -//============== Top of instr_scale class memeber definitions =============== +//============== Top of instr_scale class memeber definitions =============== // // Notes: // 1. instr_scales divide the specified location into half and then diff --git a/Cockpit/hud_tbi.cxx b/Cockpit/hud_tbi.cxx index 8046a99fe..c38c26b27 100644 --- a/Cockpit/hud_tbi.cxx +++ b/Cockpit/hud_tbi.cxx @@ -19,7 +19,7 @@ #include "hud.hxx" -//============ Top of fgTBI_instr class member definitions ============== +//============ Top of fgTBI_instr class member definitions ============== fgTBI_instr :: fgTBI_instr( int x, diff --git a/Cockpit/panel.cxx b/Cockpit/panel.cxx index dc47ff57f..a29ca2135 100644 --- a/Cockpit/panel.cxx +++ b/Cockpit/panel.cxx @@ -210,7 +210,7 @@ static void ImageGetRow( Image *image, unsigned char *buf, int y, int z) } } -static void ImageGetRawData( Image *image, char *data) +static void ImageGetRawData( Image *image, unsigned char *data) { int i, j, k; int remain; @@ -416,10 +416,14 @@ void fgPanelUpdate ( void ) { /* $Log$ -/* Revision 1.3 1998/07/13 21:00:52 curt -/* Integrated Charlies latest HUD updates. -/* Wrote access functions for current fgOPTIONS. +/* Revision 1.4 1998/07/24 21:37:00 curt +/* Ran dos2unix to get rid of extraneous ^M's. Tweaked parameter in +/* ImageGetRawData() to match usage. /* + * Revision 1.3 1998/07/13 21:00:52 curt + * Integrated Charlies latest HUD updates. + * Wrote access functions for current fgOPTIONS. + * * Revision 1.2 1998/07/03 11:55:37 curt * A few small rearrangements and tweaks. *