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 b555568a41afae0d2d4c507628d80acb05f39a9c..91df15a8d319ac7f9d3288fa12d9ec3eb74c7eb0 100644 (file)
--- a/Cockpit/hud.hxx
+++ b/Cockpit/hud.hxx
@@ -53,8 +53,8 @@
 #include <Flight/flight.h>
 #include <Controls/controls.h>
 
+#include <deque>        // STL double ended queue
 
-#include <deque>       // 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\r
-#define HUDS_HORZ                0x0000\r
-#define HUDS_TOP                 0x0004\r
-#define HUDS_BOTTOM              0x0008\r
-#define HUDS_LEFT     HUDS_TOP\r
-#define HUDS_RIGHT    HUDS_BOTTOM\r
-#define HUDS_BOTH     (HUDS_LEFT | HUDS_RIGHT)\r
-#define HUDS_NOTICKS             0x0010\r
-#define HUDS_ARITHTIC            0x0020\r
-#define HUDS_DECITICS            0x0040\r
-#define HUDS_NOTEXT              0x0080\r
+#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 55f8d1df078c17695b0bf30ed1207ec22f496bb1..6018cf0b61a8b8d559eced8fa4ad95dde4f2bdd8 100644 (file)
--- a/Cockpit/hud_card.cxx
+++ b/Cockpit/hud_card.cxx
@@ -19,7 +19,7 @@
 
 
 #include "hud.hxx"
-//========== Top of hud_card class member definitions =============\r
+//========== 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 e071a65e8b54e103a512c707da5ece6a3255a3d6..bb4e67a562a8d45476e0e16c0dd64ef849f9d56f 100644 (file)
--- a/Cockpit/hud_dnst.cxx
+++ b/Cockpit/hud_dnst.cxx
@@ -1,4 +1,4 @@
-#ifdef HAVE_CONFIG_H\r
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
@@ -19,7 +19,7 @@
 
 
 #include "hud.hxx"
-     \r
+     
 //============ Top of dual_instr_item class member definitions ============
 
 dual_instr_item ::

diff --git a/Cockpit/hud_guag.cxx b/Cockpit/hud_guag.cxx
index c1c3dbf7d98aa1f115f0b1577c7ab6974274ae45..7ea060257aeaf33d1b54058e7f28c59e5ac04042 100644 (file)
--- a/Cockpit/hud_guag.cxx
+++ b/Cockpit/hud_guag.cxx
@@ -19,7 +19,7 @@
 
 
 #include "hud.hxx"
-//============== Top of guage_instr class member definitions ==============\r
+//============== 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 f13102fb6a6da5c562bb188b62c3c03a054b8ae4..b0cb37ee09e1fdb45535b245712c5f97d35b3689 100644 (file)
--- a/Cockpit/hud_inst.cxx
+++ b/Cockpit/hud_inst.cxx
@@ -1,4 +1,4 @@
-// Abstract Base Class instr_item\r
+// Abstract Base Class instr_item
 //
 #ifdef HAVE_CONFIG_H
 #  include <config.h>

diff --git a/Cockpit/hud_labl.cxx b/Cockpit/hud_labl.cxx
index 38665b83da612e468d9d03494b5eeab9ca3b953e..2925692f32916c7edac5d4d05df68e86d96bad60 100644 (file)
--- a/Cockpit/hud_labl.cxx
+++ b/Cockpit/hud_labl.cxx
@@ -1,4 +1,4 @@
-#ifdef HAVE_CONFIG_H\r
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
@@ -19,8 +19,8 @@
 
 
 #include "hud.hxx"
-\r
-//======================= Top of instr_label class =========================\r
+
+//======================= 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 2eff5446361fb11db41a8f5cff3b3c31ce40b2bc..534374691baa16d06a360c2c721b67c4cd7f5ae0 100644 (file)
--- a/Cockpit/hud_ladr.cxx
+++ b/Cockpit/hud_ladr.cxx
@@ -1,4 +1,4 @@
-#ifdef HAVE_CONFIG_H\r
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
@@ -19,7 +19,7 @@
 
 
 #include "hud.hxx"
-//====================== Top of HudLadder Class =======================\r
+//====================== Top of HudLadder Class =======================
 HudLadder ::
   HudLadder(  int       x,
               int       y,

diff --git a/Cockpit/hud_scal.cxx b/Cockpit/hud_scal.cxx
index f2c3fe3b0a4ed76efa61d542c0c8de2f004ae10f..ad74c33f4a3ee92ed6a8bd4b9d000ab72a7eb7b0 100644 (file)
--- a/Cockpit/hud_scal.cxx
+++ b/Cockpit/hud_scal.cxx
@@ -1,4 +1,4 @@
-#ifdef HAVE_CONFIG_H\r
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
@@ -19,7 +19,7 @@
 
 
 #include "hud.hxx"
-//============== Top of instr_scale class memeber definitions ===============\r
+//============== 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 8046a99fed96238e46a8b1c2333b00675a9f8d16..c38c26b2779c5f8258f2d814bddd7fdca1c65025 100644 (file)
--- a/Cockpit/hud_tbi.cxx
+++ b/Cockpit/hud_tbi.cxx
@@ -19,7 +19,7 @@
 
 
 #include "hud.hxx"
-//============ Top of fgTBI_instr class member definitions ==============\r
+//============ Top of fgTBI_instr class member definitions ==============
 
 fgTBI_instr ::
 fgTBI_instr( int              x,

diff --git a/Cockpit/panel.cxx b/Cockpit/panel.cxx
index dc47ff57f62e02f2d5271112bb7f5eb74f9f91bb..a29ca2135944010f9351481b0f742da691ab6e57 100644 (file)
--- 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.
  *