[SPTK-CVS] SPTK4/src generalized_cepstrum_gain_normalization.cc, 1.1, 1.2 generalized_cepstrum_inverse_gain_normalization.cc, 1.1, 1.2

[Keiichiro O. <ur...@us...>]

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

Modified Files:
	generalized_cepstrum_gain_normalization.cc 
	generalized_cepstrum_inverse_gain_normalization.cc 
Log Message:
add input checker to gnorm/ignorm.



Index: generalized_cepstrum_gain_normalization.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/generalized_cepstrum_gain_normalization.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** generalized_cepstrum_gain_normalization.cc	12 Oct 2016 13:08:14 -0000	1.1
--- generalized_cepstrum_gain_normalization.cc	12 Oct 2016 15:02:23 -0000	1.2
***************
*** 63,71 ****
      const std::vector<double>& generalized_cepstrum,
      std::vector<double>* normalized_generalized_cepstrum) const {
!   if (!is_valid_ || generalized_cepstrum.empty() ||
        NULL == normalized_generalized_cepstrum) {
      return false;
    }
  
    if (0.0 != gamma_) {
      const double* c1(&generalized_cepstrum[0]);
--- 63,77 ----
      const std::vector<double>& generalized_cepstrum,
      std::vector<double>* normalized_generalized_cepstrum) const {
!   if (!is_valid_ ||
!       static_cast<std::size_t>(num_order_ + 1) != generalized_cepstrum.size() ||
        NULL == normalized_generalized_cepstrum) {
      return false;
    }
  
+   if (normalized_generalized_cepstrum->size() <
+       static_cast<std::size_t>(num_order_ + 1)) {
+     normalized_generalized_cepstrum->resize(num_order_ + 1);
+   }
+ 
    if (0.0 != gamma_) {
      const double* c1(&generalized_cepstrum[0]);

Index: generalized_cepstrum_inverse_gain_normalization.cc
===================================================================
RCS file: /cvsroot/sp-tk/SPTK4/src/generalized_cepstrum_inverse_gain_normalization.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** generalized_cepstrum_inverse_gain_normalization.cc	12 Oct 2016 13:39:46 -0000	1.1
--- generalized_cepstrum_inverse_gain_normalization.cc	12 Oct 2016 15:02:23 -0000	1.2
***************
*** 63,71 ****
      const std::vector<double>& normalized_generalized_cepstrum,
      std::vector<double>* generalized_cepstrum) const {
!   if (!is_valid_ || normalized_generalized_cepstrum.empty() ||
        NULL == generalized_cepstrum) {
      return false;
    }
  
    if (0.0 != gamma_) {
      const double* c1(&normalized_generalized_cepstrum[0]);
--- 63,77 ----
      const std::vector<double>& normalized_generalized_cepstrum,
      std::vector<double>* generalized_cepstrum) const {
!   if (!is_valid_ ||
!       static_cast<std::size_t>(num_order_ + 1) !=
!           normalized_generalized_cepstrum.size() ||
        NULL == generalized_cepstrum) {
      return false;
    }
  
+   if (generalized_cepstrum->size() < static_cast<std::size_t>(num_order_ + 1)) {
+     generalized_cepstrum->resize(num_order_ + 1);
+   }
+ 
    if (0.0 != gamma_) {
      const double* c1(&normalized_generalized_cepstrum[0]);