diff --git a/modules/io/src/img/map_io_df3_handler.cc b/modules/io/src/img/map_io_df3_handler.cc index e33e64f7a9339ca453e10ed78bf5f48aa2c3f726..b6f637eab3943f0a1d85fecec851a2217585af72 100644 --- a/modules/io/src/img/map_io_df3_handler.cc +++ b/modules/io/src/img/map_io_df3_handler.cc @@ -45,9 +45,9 @@ namespace ost { namespace io { String DF3::FORMAT_STRING="defined_df3"; DF3::DF3(bool normalize_on_save): - ImageFormatBase(FORMAT_STRING) + ImageFormatBase(FORMAT_STRING), + normalize_on_save_(normalize_on_save) { - normalize_on_save_ = normalize_on_save; } bool DF3::GetNormalizeOnSave() const diff --git a/modules/io/src/img/map_io_dx_handler.cc b/modules/io/src/img/map_io_dx_handler.cc index f8f38fad1440e19503b1dd6560ec96d60e7ffacf..61b0a90e465b8cd5ee9735e60cda9f035a024c70 100644 --- a/modules/io/src/img/map_io_dx_handler.cc +++ b/modules/io/src/img/map_io_dx_handler.cc @@ -46,9 +46,9 @@ using boost::format; String DX::FORMAT_STRING="defined_dx"; DX::DX (bool normalize_on_save): - ImageFormatBase(FORMAT_STRING) + ImageFormatBase(FORMAT_STRING), + normalize_on_save_(normalize_on_save) { - normalize_on_save_ = normalize_on_save; } bool DX::GetNormalizeOnSave() const diff --git a/modules/io/src/img/map_io_mrc_handler.cc b/modules/io/src/img/map_io_mrc_handler.cc index d5ccdb9fd42dcf9cc050a17a182c2cdb65651d35..d70a3b608adbbf657a0ab6d9b167580060d6dc10 100644 --- a/modules/io/src/img/map_io_mrc_handler.cc +++ b/modules/io/src/img/map_io_mrc_handler.cc @@ -93,11 +93,11 @@ String MRC::FORMAT_STRING = "defined_mrc"; MRC::MRC(bool normalize_on_save, Subformat subformat,Endianess endianess_on_save): - ImageFormatBase(FORMAT_STRING) + ImageFormatBase(FORMAT_STRING), + subformat_(subformat), + normalize_on_save_(normalize_on_save), + endianess_on_save_(endianess_on_save) { - normalize_on_save_ = normalize_on_save; - subformat_ = subformat; - endianess_on_save_ = endianess_on_save; } Endianess MRC::GetEndianessOnSave() const diff --git a/modules/io/src/img/map_io_mrc_handler.hh b/modules/io/src/img/map_io_mrc_handler.hh index 673fac913ec9932fb561bc5211cfa2526208cf74..b73aaf56ea77dbcf7fe8fdee0da19df872f5f554 100644 --- a/modules/io/src/img/map_io_mrc_handler.hh +++ b/modules/io/src/img/map_io_mrc_handler.hh @@ -46,7 +46,6 @@ class DLLEXPORT_OST_IO MRC: public ImageFormatBase Subformat subformat_; bool normalize_on_save_; Endianess endianess_on_save_; - Subformat subf_; }; class DLLEXPORT_OST_IO CCP4: public MRC diff --git a/modules/io/src/img/map_io_nanoscope_handler.cc b/modules/io/src/img/map_io_nanoscope_handler.cc index 0019fa320092cd330c9b601181a153559c58dbff..4571d75744d576ab8cd8ca2f65bc788e56882ee0 100644 --- a/modules/io/src/img/map_io_nanoscope_handler.cc +++ b/modules/io/src/img/map_io_nanoscope_handler.cc @@ -47,9 +47,9 @@ namespace ost { namespace io { String Nanoscope::FORMAT_STRING = "defined_nanoscope"; Nanoscope::Nanoscope(int subimage): - ImageFormatBase(FORMAT_STRING) + ImageFormatBase(FORMAT_STRING), + subimage_(subimage) { - subimage_ = subimage; } int Nanoscope::GetSubimage() const diff --git a/modules/io/src/img/map_io_png_handler.cc b/modules/io/src/img/map_io_png_handler.cc index 84b290d2e22214c3ee31a662c30c402fb941358e..9107953aafd55b6aee191ca9c7aedf7f464bc2dd 100644 --- a/modules/io/src/img/map_io_png_handler.cc +++ b/modules/io/src/img/map_io_png_handler.cc @@ -46,9 +46,9 @@ namespace ost { namespace io { String PNG::FORMAT_STRING="defined_png"; PNG::PNG(bool normalize_on_save): - ImageFormatBase(FORMAT_STRING) + ImageFormatBase(FORMAT_STRING), + normalize_on_save_(normalize_on_save) { - normalize_on_save_ = normalize_on_save; this->SetMinimum(0.0); this->SetMaximum(255.0); } diff --git a/modules/io/src/img/map_io_situs_handler.cc b/modules/io/src/img/map_io_situs_handler.cc index a7e12da30beb181738c49fc71eb2ed9b91a9101f..2be72859bb38750b0de09f90d8e30ed25dc24302 100644 --- a/modules/io/src/img/map_io_situs_handler.cc +++ b/modules/io/src/img/map_io_situs_handler.cc @@ -46,9 +46,9 @@ namespace ost { namespace io { String Situs::FORMAT_STRING="defined_situs"; Situs::Situs(bool normalize_on_save): - ImageFormatBase(FORMAT_STRING) + ImageFormatBase(FORMAT_STRING), + normalize_on_save_(normalize_on_save) { - normalize_on_save_ = normalize_on_save; } bool Situs::GetNormalizeOnSave() const diff --git a/modules/io/src/img/map_io_spi_handler.cc b/modules/io/src/img/map_io_spi_handler.cc index 63b5e1e4ca4f88e584a7eceaf1855c29a457876b..9eaa8982963d756b7e39f693b33db613629a419c 100644 --- a/modules/io/src/img/map_io_spi_handler.cc +++ b/modules/io/src/img/map_io_spi_handler.cc @@ -48,10 +48,10 @@ namespace ost { namespace io { String Spider::FORMAT_STRING = "defined_spider"; Spider::Spider(bool normalize_on_save,Endianess endianness_on_save): - ImageFormatBase(FORMAT_STRING) + ImageFormatBase(FORMAT_STRING), + normalize_on_save_(normalize_on_save), + endianness_on_save_(endianness_on_save) { - normalize_on_save_ = normalize_on_save; - endianness_on_save_ = endianness_on_save; } Endianess Spider::GetEndianessOnSave() const