[SPTK-CVS] SPTK4/src excite.cc, 1.6, 1.7 fft.cc, 1.12, 1.13 fftr.cc, 1.3, 1.4 gnorm.cc, 1.4, 1.5 ignorm.cc, 1.4, 1.5 input_source_preprocessing_for_filter_gain.h, 1.6, 1.7 lpc2lsp.cc, 1.3, 1.4 lpc2par.cc, 1.3, 1.4 lsp2lpc.cc, 1.3, 1.4 ltcdf.cc, 1.3, 1.4 merge.cc, 1.1, 1.2 mgc2mgc.cc, 1.6, 1.7 mgc2sp.cc, 1.4, 1.5 mglsp2sp.cc, 1.1, 1.2 poledf.cc, 1.6, 1.7 zerodf.cc, 1.4, 1.5

[Takenori Y. <tak...@us...>]

Update of /cvsroot/sp-tk/SPTK4/src
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27574

Modified Files:
	excite.cc fft.cc fftr.cc gnorm.cc ignorm.cc 
	input_source_preprocessing_for_filter_gain.h lpc2lsp.cc 
	lpc2par.cc lsp2lpc.cc ltcdf.cc merge.cc mgc2mgc.cc mgc2sp.cc 
	mglsp2sp.cc poledf.cc zerodf.cc 
Log Message:
format codes

Index: mgc2mgc.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/mgc2mgc.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mgc2mgc.cc	6 Apr 2017 09:46:50 -0000	1.6
--- mgc2mgc.cc	2 May 2017 07:10:22 -0000	1.7
***************
*** 154,159 ****
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message << "The argument for the -c option must be a "
!                         << "positive integer";
            sptk::PrintErrorMessage("mgc2mgc", error_message);
            return 1;
--- 154,159 ----
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message
!               << "The argument for the -c option must be a positive integer";
            sptk::PrintErrorMessage("mgc2mgc", error_message);
            return 1;
***************
*** 203,208 ****
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message << "The argument for the -C option must be a "
!                         << "positive integer";
            sptk::PrintErrorMessage("mgc2mgc", error_message);
            return 1;
--- 203,208 ----
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message
!               << "The argument for the -C option must be a positive integer";
            sptk::PrintErrorMessage("mgc2mgc", error_message);
            return 1;

Index: lsp2lpc.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/lsp2lpc.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lsp2lpc.cc	6 Apr 2017 09:51:57 -0000	1.3
--- lsp2lpc.cc	2 May 2017 07:10:22 -0000	1.4
***************
*** 57,61 ****
  namespace {
  
! enum InputGainTypes {
    kLinearGain = 0,
    kLogGain,
--- 57,61 ----
  namespace {
  
! enum InputGainType {
    kLinearGain = 0,
    kLogGain,
***************
*** 74,78 ****
  const int kDefaultNumOrder(25);
  const double kDefaultSamplingFrequency(10.0);
! const InputGainTypes kDefaultInputGainType(kLinearGain);
  const InputFormats kDefaultInputFormat(kNormalizedFrequencyInRadians);
  
--- 74,78 ----
  const int kDefaultNumOrder(25);
  const double kDefaultSamplingFrequency(10.0);
! const InputGainType kDefaultInputGainType(kLinearGain);
  const InputFormats kDefaultInputFormat(kNormalizedFrequencyInRadians);
  
***************
*** 115,119 ****
    int num_order(kDefaultNumOrder);
    double sampling_frequency(kDefaultSamplingFrequency);
!   InputGainTypes input_gain_type(kDefaultInputGainType);
    InputFormats input_format(kDefaultInputFormat);
  
--- 115,119 ----
    int num_order(kDefaultNumOrder);
    double sampling_frequency(kDefaultSamplingFrequency);
!   InputGainType input_gain_type(kDefaultInputGainType);
    InputFormats input_format(kDefaultInputFormat);
  
***************
*** 157,161 ****
            return 1;
          }
!         input_gain_type = static_cast<InputGainTypes>(tmp);
          break;
        }
--- 157,161 ----
            return 1;
          }
!         input_gain_type = static_cast<InputGainType>(tmp);
          break;
        }

Index: gnorm.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/gnorm.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gnorm.cc	15 Mar 2017 13:38:04 -0000	1.4
--- gnorm.cc	2 May 2017 07:10:22 -0000	1.5
***************
*** 116,121 ****
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message << "The argument for the -c option must be a "
!                         << "positive integer";
            sptk::PrintErrorMessage("gnorm", error_message);
            return 1;
--- 116,121 ----
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message
!               << "The argument for the -c option must be a positive integer";
            sptk::PrintErrorMessage("gnorm", error_message);
            return 1;

Index: fft.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/fft.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** fft.cc	15 Mar 2017 13:38:04 -0000	1.12
--- fft.cc	2 May 2017 07:10:22 -0000	1.13
***************
*** 159,163 ****
        std::ostringstream error_message;
        error_message << "The order of data sequence " << num_order
!                     << " should be less than the FFT size " << fft_size;
        sptk::PrintErrorMessage("fft", error_message);
        return 1;
--- 159,163 ----
        std::ostringstream error_message;
        error_message << "The order of data sequence " << num_order
!                     << " must be less than FFT size " << fft_size;
        sptk::PrintErrorMessage("fft", error_message);
        return 1;

Index: ignorm.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/ignorm.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ignorm.cc	15 Mar 2017 13:38:04 -0000	1.4
--- ignorm.cc	2 May 2017 07:10:22 -0000	1.5
***************
*** 116,121 ****
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message << "The argument for the -c option must be a "
!                         << "positive integer";
            sptk::PrintErrorMessage("ignorm", error_message);
            return 1;
--- 116,121 ----
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message
!               << "The argument for the -c option must be a positive integer";
            sptk::PrintErrorMessage("ignorm", error_message);
            return 1;

Index: lpc2par.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/lpc2par.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lpc2par.cc	15 Mar 2017 13:38:04 -0000	1.3
--- lpc2par.cc	2 May 2017 07:10:22 -0000	1.4
***************
*** 135,140 ****
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message << "The argument for the -c option must be a "
!                         << "positive integer";
            sptk::PrintErrorMessage("lpc2par", error_message);
            return 1;
--- 135,140 ----
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message
!               << "The argument for the -c option must be a positive integer";
            sptk::PrintErrorMessage("lpc2par", error_message);
            return 1;

Index: input_source_preprocessing_for_filter_gain.h
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/input_source_preprocessing_for_filter_gain.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** input_source_preprocessing_for_filter_gain.h	24 Oct 2016 08:20:30 -0000	1.6
--- input_source_preprocessing_for_filter_gain.h	2 May 2017 07:10:22 -0000	1.7
***************
*** 56,60 ****
   public:
    //
!   enum class FilterGainType {
      kLinear = 0,
      kLog,
--- 56,60 ----
   public:
    //
!   enum FilterGainType {
      kLinear = 0,
      kLog,

Index: lpc2lsp.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/lpc2lsp.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lpc2lsp.cc	6 Apr 2017 09:51:57 -0000	1.3
--- lpc2lsp.cc	2 May 2017 07:10:22 -0000	1.4
***************
*** 57,61 ****
  namespace {
  
! enum OutputGainTypes {
    kLinearGain = 0,
    kLogGain,
--- 57,61 ----
  namespace {
  
! enum OutputGainType {
    kLinearGain = 0,
    kLogGain,
***************
*** 74,78 ****
  const int kDefaultNumOrder(25);
  const double kDefaultSamplingFrequency(10.0);
! const OutputGainTypes kDefaultOutputGainType(kLinearGain);
  const OutputFormats kDefaultOutputFormat(kNormalizedFrequencyInRadians);
  const int kDefaultNumSplit(256);
--- 74,78 ----
  const int kDefaultNumOrder(25);
  const double kDefaultSamplingFrequency(10.0);
! const OutputGainType kDefaultOutputGainType(kLinearGain);
  const OutputFormats kDefaultOutputFormat(kNormalizedFrequencyInRadians);
  const int kDefaultNumSplit(256);
***************
*** 120,124 ****
    int num_order(kDefaultNumOrder);
    double sampling_frequency(kDefaultSamplingFrequency);
!   OutputGainTypes output_gain_type(kDefaultOutputGainType);
    OutputFormats output_format(kDefaultOutputFormat);
    int num_split(kDefaultNumSplit);
--- 120,124 ----
    int num_order(kDefaultNumOrder);
    double sampling_frequency(kDefaultSamplingFrequency);
!   OutputGainType output_gain_type(kDefaultOutputGainType);
    OutputFormats output_format(kDefaultOutputFormat);
    int num_split(kDefaultNumSplit);
***************
*** 166,170 ****
            return 1;
          }
!         output_gain_type = static_cast<OutputGainTypes>(tmp);
          break;
        }
--- 166,170 ----
            return 1;
          }
!         output_gain_type = static_cast<OutputGainType>(tmp);
          break;
        }

Index: excite.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/excite.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** excite.cc	15 Mar 2017 13:38:04 -0000	1.6
--- excite.cc	2 May 2017 07:10:22 -0000	1.7
***************
*** 152,156 ****
      std::ostringstream error_message;
      error_message
!         << "Interpolation period should not be greater than half frame period";
      sptk::PrintErrorMessage("excite", error_message);
      return 1;
--- 152,156 ----
      std::ostringstream error_message;
      error_message
!         << "Interpolation period must be equal or less than half frame period";
      sptk::PrintErrorMessage("excite", error_message);
      return 1;

Index: merge.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/merge.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** merge.cc	17 Mar 2017 11:39:17 -0000	1.1
--- merge.cc	2 May 2017 07:10:22 -0000	1.2
***************
*** 375,379 ****
    if (input_length < insert_point) {
      std::ostringstream error_message;
!     error_message << "Insert point must not be greater than input length";
      sptk::PrintErrorMessage("merge", error_message);
      return 1;
--- 375,379 ----
    if (input_length < insert_point) {
      std::ostringstream error_message;
!     error_message << "Insert point must be equal or less than input length";
      sptk::PrintErrorMessage("merge", error_message);
      return 1;

Index: zerodf.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/zerodf.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zerodf.cc	15 Mar 2017 13:38:04 -0000	1.4
--- zerodf.cc	2 May 2017 07:10:22 -0000	1.5
***************
*** 158,162 ****
      std::ostringstream error_message;
      error_message
!         << "Interpolation period must not be greater than half frame period";
      sptk::PrintErrorMessage("zerodf", error_message);
      return 1;
--- 158,162 ----
      std::ostringstream error_message;
      error_message
!         << "Interpolation period must be equal or less than half frame period";
      sptk::PrintErrorMessage("zerodf", error_message);
      return 1;

Index: ltcdf.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/ltcdf.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ltcdf.cc	6 Apr 2017 09:51:57 -0000	1.3
--- ltcdf.cc	2 May 2017 07:10:22 -0000	1.4
***************
*** 151,155 ****
      std::ostringstream error_message;
      error_message
!         << "Interpolation period must not be greater than half frame period";
      sptk::PrintErrorMessage("ltcdf", error_message);
      return 1;
--- 151,155 ----
      std::ostringstream error_message;
      error_message
!         << "Interpolation period must be equal or less than half frame period";
      sptk::PrintErrorMessage("ltcdf", error_message);
      return 1;

Index: poledf.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/poledf.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** poledf.cc	15 Mar 2017 13:38:04 -0000	1.6
--- poledf.cc	2 May 2017 07:10:22 -0000	1.7
***************
*** 158,162 ****
      std::ostringstream error_message;
      error_message
!         << "Interpolation period must not be greater than half frame period";
      sptk::PrintErrorMessage("poledf", error_message);
      return 1;
--- 158,162 ----
      std::ostringstream error_message;
      error_message
!         << "Interpolation period must be equal or less than half frame period";
      sptk::PrintErrorMessage("poledf", error_message);
      return 1;

Index: mgc2sp.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/mgc2sp.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mgc2sp.cc	6 Apr 2017 09:46:50 -0000	1.4
--- mgc2sp.cc	2 May 2017 07:10:22 -0000	1.5
***************
*** 164,169 ****
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message << "The argument for the -c option must be a "
!                         << "positive integer";
            sptk::PrintErrorMessage("mgc2sp", error_message);
            return 1;
--- 164,169 ----
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message
!               << "The argument for the -c option must be a positive integer";
            sptk::PrintErrorMessage("mgc2sp", error_message);
            return 1;
***************
*** 184,188 ****
            std::ostringstream error_message;
            error_message << "The argument for the -l option must be an integer";
!           sptk::PrintErrorMessage("fft", error_message);
            return 1;
          }
--- 184,188 ----
            std::ostringstream error_message;
            error_message << "The argument for the -l option must be an integer";
!           sptk::PrintErrorMessage("mgc2sp", error_message);
            return 1;
          }

Index: fftr.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/fftr.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fftr.cc	15 Mar 2017 13:38:04 -0000	1.3
--- fftr.cc	2 May 2017 07:10:22 -0000	1.4
***************
*** 125,129 ****
            error_message << "The argument for the -m option must be a "
                          << "non-negative integer";
!           sptk::PrintErrorMessage("fft", error_message);
            return 1;
          }
--- 125,129 ----
            error_message << "The argument for the -m option must be a "
                          << "non-negative integer";
!           sptk::PrintErrorMessage("fftr", error_message);
            return 1;
          }
***************
*** 166,170 ****
        std::ostringstream error_message;
        error_message << "The order of data sequence " << num_order
!                     << " should be less than the FFT size " << fft_size;
        sptk::PrintErrorMessage("fftr", error_message);
        return 1;
--- 166,170 ----
        std::ostringstream error_message;
        error_message << "The order of data sequence " << num_order
!                     << " must be less than FFT size " << fft_size;
        sptk::PrintErrorMessage("fftr", error_message);
        return 1;

Index: mglsp2sp.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/mglsp2sp.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mglsp2sp.cc	6 Apr 2017 09:42:23 -0000	1.1
--- mglsp2sp.cc	2 May 2017 07:10:22 -0000	1.2
***************
*** 57,61 ****
  namespace {
  
! enum InputGainTypes {
    kLinearGain = 0,
    kLogGain,
--- 57,61 ----
  namespace {
  
! enum InputGainType {
    kLinearGain = 0,
    kLogGain,
***************
*** 85,89 ****
  const int kDefaultSpectrumLength(128);
  const double kDefaultSamplingFrequency(10.0);
! const InputGainTypes kDefaultInputGainType(kLinearGain);
  const InputFormats kDefaultInputFormat(kNormalizedFrequencyInRadians);
  const OutputFormats kDefaultOutputFormat(kLogAmplitudeSpectrumInDecibels);
--- 85,89 ----
  const int kDefaultSpectrumLength(128);
  const double kDefaultSamplingFrequency(10.0);
! const InputGainType kDefaultInputGainType(kLinearGain);
  const InputFormats kDefaultInputFormat(kNormalizedFrequencyInRadians);
  const OutputFormats kDefaultOutputFormat(kLogAmplitudeSpectrumInDecibels);
***************
*** 92,96 ****
    // clang-format off
    *stream << std::endl;
!   *stream << " mglsp2sp - transform mel-generalized line spectral pairs to spectrum" << std::endl;
    *stream << std::endl;
    *stream << "  usage:" << std::endl;
--- 92,96 ----
    // clang-format off
    *stream << std::endl;
!   *stream << " mglsp2sp - transform mel-generalized line spectral pairs to spectrum" << std::endl;  // NOLINT
    *stream << std::endl;
    *stream << "  usage:" << std::endl;
***************
*** 140,144 ****
    int spectrum_length(kDefaultSpectrumLength);
    double sampling_frequency(kDefaultSamplingFrequency);
!   InputGainTypes input_gain_type(kDefaultInputGainType);
    InputFormats input_format(kDefaultInputFormat);
    OutputFormats output_format(kDefaultOutputFormat);
--- 140,144 ----
    int spectrum_length(kDefaultSpectrumLength);
    double sampling_frequency(kDefaultSamplingFrequency);
!   InputGainType input_gain_type(kDefaultInputGainType);
    InputFormats input_format(kDefaultInputFormat);
    OutputFormats output_format(kDefaultOutputFormat);
***************
*** 187,192 ****
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message << "The argument for the -c option must be a "
!                         << "positive integer";
            sptk::PrintErrorMessage("mglsp2sp", error_message);
            return 1;
--- 187,192 ----
          if (!sptk::ConvertStringToInteger(optarg, &tmp) || tmp < 1) {
            std::ostringstream error_message;
!           error_message
!               << "The argument for the -c option must be a positive integer";
            sptk::PrintErrorMessage("mglsp2sp", error_message);
            return 1;
***************
*** 229,233 ****
            return 1;
          }
!         input_gain_type = static_cast<InputGainTypes>(tmp);
          break;
        }
--- 229,233 ----
            return 1;
          }
!         input_gain_type = static_cast<InputGainType>(tmp);
          break;
        }