Replaced BOOL by bool

Author: Heiko Thiel

LASlib/inc/lasdefinitions.hpp

@@ -244,7 +244,7 @@ class LASheader : public LASquantizer, public LASattributer
 
   // set functions
 
-  void set_bounding_box(F64 min_x, F64 min_y, F64 min_z, F64 max_x, F64 max_y, F64 max_z, BOOL auto_scale=TRUE, BOOL auto_offset=TRUE)
+  void set_bounding_box(F64 min_x, F64 min_y, F64 min_z, F64 max_x, F64 max_y, F64 max_z, bool auto_scale=TRUE, bool auto_offset=TRUE)
   {
     if (auto_scale)
     {
@@ -288,9 +288,9 @@ class LASheader : public LASquantizer, public LASattributer
     global_encoding |= (1 << bit);
   }
 
-  BOOL get_global_encoding_bit(I32 bit) const
+  bool get_global_encoding_bit(I32 bit) const
   {
-    return (BOOL)(global_encoding & (1 << bit));
+    return (bool)(global_encoding & (1 << bit));
   }
 
   // clean functions
@@ -448,7 +448,7 @@ class LASheader : public LASquantizer, public LASattributer
     return *this;
   };
 
-  BOOL check() const
+  bool check() const
   {
     if (strncmp(file_signature, "LASF", 4) != 0)
     {
@@ -488,7 +488,7 @@ class LASheader : public LASquantizer, public LASattributer
     return TRUE;
   };
 
-  BOOL is_compressed() const
+  bool is_compressed() const
   {
     if (laszip)
     {
@@ -500,7 +500,7 @@ class LASheader : public LASquantizer, public LASattributer
     return FALSE;
   };
 
-  BOOL is_lonlat() const
+  bool is_lonlat() const
   {
     if ((-360.0 <= min_x) && (-90.0 <= min_y) && (max_x <= 360.0) && (max_y <= 90.0))
     {
@@ -511,10 +511,10 @@ class LASheader : public LASquantizer, public LASattributer
 
   // note that data needs to be allocated with new [] and not malloc and that LASheader
   // will become the owner over this and manage its deallocation 
-  void add_vlr(const CHAR* user_id, const U16 record_id, const U16 record_length_after_header, U8* data, const BOOL keep_description=FALSE, const CHAR* description=0, const BOOL keep_existing=FALSE)
+  void add_vlr(const CHAR* user_id, const U16 record_id, const U16 record_length_after_header, U8* data, const bool keep_description=FALSE, const CHAR* description=0, const bool keep_existing=FALSE)
   {
     U32 i = 0;
-    BOOL found_description = FALSE;
+    bool found_description = FALSE;
     if (vlrs)
     {
       if (keep_existing)
@@ -591,7 +591,7 @@ class LASheader : public LASquantizer, public LASattributer
     return 0;
   };
 
-  BOOL remove_vlr(U32 i)
+  bool remove_vlr(U32 i)
   {
     if (vlrs)
     {
@@ -619,7 +619,7 @@ class LASheader : public LASquantizer, public LASattributer
     return FALSE;
   };
 
-  BOOL remove_vlr(const CHAR* user_id, U16 record_id)
+  bool remove_vlr(const CHAR* user_id, U16 record_id)
   {
     U32 i;
     for (i = 0; i < number_of_variable_length_records; i++)
@@ -632,7 +632,7 @@ class LASheader : public LASquantizer, public LASattributer
     return FALSE;
   };
 
-  void set_lastiling(U32 level, U32 level_index, U32 implicit_levels, BOOL buffer, BOOL reversible, F32 min_x, F32 max_x, F32 min_y, F32 max_y)
+  void set_lastiling(U32 level, U32 level_index, U32 implicit_levels, bool buffer, bool reversible, F32 min_x, F32 max_x, F32 min_y, F32 max_y)
   {
     clean_lastiling();
     vlr_lastiling = new LASvlr_lastiling();
@@ -687,7 +687,7 @@ class LASheader : public LASquantizer, public LASattributer
     vlr_lasoriginal->min_z = min_z;
   }
 
-  BOOL restore_lasoriginal()
+  bool restore_lasoriginal()
   {
     if (vlr_lasoriginal)
     {
@@ -808,7 +808,7 @@ class LASheader : public LASquantizer, public LASattributer
     }
   }
 
-  void update_extra_bytes_vlr(const BOOL keep_description=FALSE)
+  void update_extra_bytes_vlr(const bool keep_description=FALSE)
   {
     if (number_attributes)
     {

LASlib/inc/lasfilter.hpp

@@ -38,7 +38,7 @@ class LAScriterion
 public:
   virtual const CHAR * name() const = 0;
   virtual I32 get_command(CHAR* string) const = 0;
-  virtual BOOL filter(const LASpoint* point) = 0;
+  virtual bool filter(const LASpoint* point) = 0;
   virtual void reset(){};
   virtual ~LAScriterion(){};
 };
@@ -49,16 +49,16 @@ class LASfilter
 
   void usage() const;
   void clean();
-  BOOL parse(int argc, char* argv[]);
-  BOOL parse(CHAR* string);
+  bool parse(int argc, char* argv[]);
+  bool parse(CHAR* string);
   I32 unparse(CHAR* string) const;
-  inline BOOL active() const { return (num_criteria != 0); };
+  inline bool active() const { return (num_criteria != 0); };
 
   void addClipCircle(F64 x, F64 y, F64 radius);
   void addClipBox(F64 min_x, F64 min_y, F64 min_z, F64 max_x, F64 max_y, F64 max_z);
   void addKeepScanDirectionChange();
 
-  BOOL filter(const LASpoint* point);
+  bool filter(const LASpoint* point);
   void reset();
 
   LASfilter();

LASlib/inc/lasreader.hpp

@@ -59,7 +59,7 @@ class LASLIB_DLL LASreader
   I64 p_count;
 
   virtual I32 get_format() const = 0;
-  virtual BOOL has_layers() const { return FALSE; };
+  virtual bool has_layers() const { return FALSE; };
 
   void set_index(LASindex* index);
   inline LASindex* get_index() const { return index; };
@@ -69,23 +69,23 @@ class LASLIB_DLL LASreader
   inline LAStransform* get_transform() const { return transform; };
 
   inline U32 get_inside() const { return inside; };
-  virtual BOOL inside_none();
-  virtual BOOL inside_tile(const F32 ll_x, const F32 ll_y, const F32 size);
+  virtual bool inside_none();
+  virtual bool inside_tile(const F32 ll_x, const F32 ll_y, const F32 size);
   inline F32 get_t_ll_x() const { return t_ll_x; };
   inline F32 get_t_ll_y() const { return t_ll_y; };
   inline F32 get_t_size() const { return t_size; };
-  virtual BOOL inside_circle(const F64 center_x, const F64 center_y, const F64 radius);
+  virtual bool inside_circle(const F64 center_x, const F64 center_y, const F64 radius);
   inline F64 get_c_center_x() const { return c_center_x; };
   inline F64 get_c_center_y() const { return c_center_y; };
   inline F64 get_c_radius() const { return c_radius; };
-  virtual BOOL inside_rectangle(const F64 min_x, const F64 min_y, const F64 max_x, const F64 max_y);
+  virtual bool inside_rectangle(const F64 min_x, const F64 min_y, const F64 max_x, const F64 max_y);
   inline F64 get_r_min_x() const { return r_min_x; };
   inline F64 get_r_min_y() const { return r_min_y; };
   inline F64 get_r_max_x() const { return r_max_x; };
   inline F64 get_r_max_y() const { return r_max_y; };
 
-  virtual BOOL seek(const I64 p_index) = 0;
-  BOOL read_point() { return (this->*read_simple)(); };
+  virtual bool seek(const I64 p_index) = 0;
+  bool read_point() { return (this->*read_simple)(); };
 
   inline void compute_coordinates() { point.compute_coordinates(); };
 
@@ -110,13 +110,13 @@ class LASLIB_DLL LASreader
   inline I32 get_Z(const F64 z) const { return header.get_Z(z); };
 
   virtual ByteStreamIn* get_stream() const = 0;
-  virtual void close(BOOL close_stream=TRUE) = 0;
+  virtual void close(bool close_stream=TRUE) = 0;
 
   LASreader();
   virtual ~LASreader();
 
 protected:
-  virtual BOOL read_point_default() = 0;
+  virtual bool read_point_default() = 0;
 
   LASindex* index;
   LASfilter* filter;
@@ -129,20 +129,20 @@ class LASLIB_DLL LASreader
   F64 orig_min_x, orig_min_y, orig_max_x, orig_max_y;
 
 private:
-  BOOL (LASreader::*read_simple)();
-  BOOL (LASreader::*read_complex)();
-
-  BOOL read_point_none();
-  BOOL read_point_filtered();
-  BOOL read_point_transformed();
-  BOOL read_point_filtered_and_transformed();
-
-  BOOL read_point_inside_tile();
-  BOOL read_point_inside_tile_indexed();
-  BOOL read_point_inside_circle();
-  BOOL read_point_inside_circle_indexed();
-  BOOL read_point_inside_rectangle();
-  BOOL read_point_inside_rectangle_indexed();
+  bool (LASreader::*read_simple)();
+  bool (LASreader::*read_complex)();
+
+  bool read_point_none();
+  bool read_point_filtered();
+  bool read_point_transformed();
+  bool read_point_filtered_and_transformed();
+
+  bool read_point_inside_tile();
+  bool read_point_inside_tile_indexed();
+  bool read_point_inside_circle();
+  bool read_point_inside_circle_indexed();
+  bool read_point_inside_rectangle();
+  bool read_point_inside_rectangle_indexed();
 };
 
 #include "laswaveform13reader.hpp"
@@ -156,24 +156,24 @@ class LASLIB_DLL LASreadOpener
   U32 get_file_name_current() const;
   const CHAR* get_file_name() const;
   const CHAR* get_file_name(U32 number) const;
-  void set_file_name(const CHAR* file_name, BOOL unique=FALSE);
-  BOOL add_file_name(const CHAR* file_name, BOOL unique=FALSE);
-  BOOL add_list_of_files(const CHAR* list_of_files, BOOL unique=FALSE);
+  void set_file_name(const CHAR* file_name, bool unique=FALSE);
+  bool add_file_name(const CHAR* file_name, bool unique=FALSE);
+  bool add_list_of_files(const CHAR* list_of_files, bool unique=FALSE);
   void delete_file_name(U32 file_name_id);
-  BOOL set_file_name_current(U32 file_name_id);
+  bool set_file_name_current(U32 file_name_id);
   I32 get_file_format(U32 number) const;
-  void set_merged(const BOOL merged);
-  BOOL is_merged() const { return merged; };
+  void set_merged(const bool merged);
+  bool is_merged() const { return merged; };
   void set_buffer_size(const F32 buffer_size);
   F32 get_buffer_size() const;
-  void set_neighbor_file_name(const CHAR* neighbor_file_name, BOOL unique=FALSE);
-  BOOL add_neighbor_file_name(const CHAR* neighbor_file_name, BOOL unique=FALSE);
-  void set_auto_reoffset(const BOOL auto_reoffset);
-  inline BOOL is_auto_reoffset() const { return auto_reoffset; };
-  void set_files_are_flightlines(const BOOL files_are_flightlines);
-  inline BOOL are_files_flightlines() const { return files_are_flightlines; };
-  void set_apply_file_source_ID(const BOOL apply_file_source_ID);
-  inline BOOL applying_file_source_ID() const { return apply_file_source_ID; };
+  void set_neighbor_file_name(const CHAR* neighbor_file_name, bool unique=FALSE);
+  bool add_neighbor_file_name(const CHAR* neighbor_file_name, bool unique=FALSE);
+  void set_auto_reoffset(const bool auto_reoffset);
+  inline bool is_auto_reoffset() const { return auto_reoffset; };
+  void set_files_are_flightlines(const bool files_are_flightlines);
+  inline bool are_files_flightlines() const { return files_are_flightlines; };
+  void set_apply_file_source_ID(const bool apply_file_source_ID);
+  inline bool applying_file_source_ID() const { return apply_file_source_ID; };
   void set_scale_factor(const F64* scale_factor);
   inline const F64* get_scale_factor() const { return scale_factor; };
   void set_offset(const F64* offset);
@@ -185,41 +185,41 @@ class LASLIB_DLL LASreadOpener
   void add_attribute(I32 data_type, const CHAR* name, const CHAR* description=0, F64 scale=1.0, F64 offset=0.0, F64 pre_scale=1.0, F64 pre_offset=0.0);
   void set_parse_string(const CHAR* parse_string);
   void set_skip_lines(I32 skip_lines);
-  void set_populate_header(BOOL populate_header);
-  void set_keep_lastiling(BOOL keep_lastiling);
-  void set_pipe_on(BOOL pipe_on);
+  void set_populate_header(bool populate_header);
+  void set_keep_lastiling(bool keep_lastiling);
+  void set_pipe_on(bool pipe_on);
   const CHAR* get_parse_string() const;
   void usage() const;
   void set_inside_tile(const F32 ll_x, const F32 ll_y, const F32 size);
   void set_inside_circle(const F64 center_x, const F64 center_y, const F64 radius);
   void set_inside_rectangle(const F64 min_x, const F64 min_y, const F64 max_x, const F64 max_y);
-  BOOL parse(int argc, char* argv[]);
-  BOOL is_piped() const;
-  BOOL is_buffered() const;
-  BOOL is_header_populated() const;
-  BOOL active() const;
-  BOOL is_inside() const;
+  bool parse(int argc, char* argv[]);
+  bool is_piped() const;
+  bool is_buffered() const;
+  bool is_header_populated() const;
+  bool active() const;
+  bool is_inside() const;
   I32 unparse(CHAR* string) const;
   void set_filter(LASfilter* filter);
   const LASfilter* get_filter() { return filter; };
   void set_transform(LAStransform* transform);
   const LAStransform* get_transform() { return transform; };
   void reset();
   const CHAR* get_temp_file_base() const { return temp_file_base; };
-  LASreader* open(const CHAR* other_file_name=0, BOOL reset_after_other=TRUE);
-  BOOL reopen(LASreader* lasreader, BOOL remain_buffered=TRUE);
+  LASreader* open(const CHAR* other_file_name=0, bool reset_after_other=TRUE);
+  bool reopen(LASreader* lasreader, bool remain_buffered=TRUE);
   LASwaveform13reader* open_waveform13(const LASheader* lasheader);
   LASreadOpener();
   ~LASreadOpener();
 private:
 #ifdef _WIN32
-  BOOL add_file_name_single(const CHAR* file_name, BOOL unique=FALSE);
-  BOOL add_neighbor_file_name_single(const CHAR* neighbor_file_name, BOOL unique=FALSE);
+  bool add_file_name_single(const CHAR* file_name, bool unique=FALSE);
+  bool add_neighbor_file_name_single(const CHAR* neighbor_file_name, bool unique=FALSE);
 #endif
   I32 io_ibuffer_size;
   CHAR** file_names;
   const CHAR* file_name;
-  BOOL merged;
+  bool merged;
   U32 file_name_number;
   U32 file_name_allocated;
   U32 file_name_current;
@@ -228,15 +228,15 @@ class LASLIB_DLL LASreadOpener
   CHAR** neighbor_file_names;
   U32 neighbor_file_name_number;
   U32 neighbor_file_name_allocated;
-  BOOL comma_not_point;
+  bool comma_not_point;
   F64* scale_factor;
   F64* offset;
-  BOOL auto_reoffset;
-  BOOL files_are_flightlines;
-  BOOL apply_file_source_ID;
-  BOOL itxt;
-  BOOL ipts;
-  BOOL iptx;
+  bool auto_reoffset;
+  bool files_are_flightlines;
+  bool apply_file_source_ID;
+  bool itxt;
+  bool ipts;
+  bool iptx;
   F32 translate_intensity;
   F32 scale_intensity;
   F32 translate_scan_angle;
@@ -251,11 +251,11 @@ class LASLIB_DLL LASreadOpener
   F64 attribute_pre_offsets[10];
   CHAR* parse_string;
   I32 skip_lines;
-  BOOL populate_header;
-  BOOL keep_lastiling;
-  BOOL pipe_on;
-  BOOL use_stdin;
-  BOOL unique;
+  bool populate_header;
+  bool keep_lastiling;
+  bool pipe_on;
+  bool use_stdin;
+  bool unique;
 
   // optional extras
   LASindex* index;