[Loris-cvs] Loris/src Dilator.C,1.42,1.43 Partial.C,1.73,1.74
C++ class library for sound analysis, synthesis, and morphing
Brought to you by:
kfitz
|
From: Kelly F. <kf...@us...> - 2010-01-23 03:39:08
|
Update of /cvsroot/loris/Loris/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21833/src Modified Files: Dilator.C Partial.C Log Message: minor code tidying Index: Dilator.C =================================================================== RCS file: /cvsroot/loris/Loris/src/Dilator.C,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Dilator.C 2 Jan 2010 04:55:12 -0000 1.42 --- Dilator.C 23 Jan 2010 03:38:55 -0000 1.43 *************** *** 176,183 **** Assert( _initial.size() == _target.size() ); ! // don't dilate if there's no time points: ! if ( _initial.size() == 0 ) return; ! // create the new Partial: Partial newp; --- 176,186 ---- Assert( _initial.size() == _target.size() ); ! // don't dilate if there's no time points, or no Breakpoints: ! if ( 0 == _initial.size() || ! 0 == p.numBreakpoints() ) ! { return; ! } ! // create the new Partial: Partial newp; Index: Partial.C =================================================================== RCS file: /cvsroot/loris/Loris/src/Partial.C,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** Partial.C 17 Jan 2010 07:28:26 -0000 1.73 --- Partial.C 23 Jan 2010 03:38:55 -0000 1.74 *************** *** 467,471 **** if ( numBreakpoints() == 0 ) { ! Throw( InvalidPartial, "Tried find start time of a Partial with no Breakpoints." ); } return begin().time(); --- 467,471 ---- if ( numBreakpoints() == 0 ) { ! Throw( InvalidPartial, "Tried to find start time of a Partial with no Breakpoints." ); } return begin().time(); *************** *** 483,487 **** if ( numBreakpoints() == 0 ) { ! Throw( InvalidPartial, "Tried find end time of a Partial with no Breakpoints." ); } return (--end()).time(); --- 483,487 ---- if ( numBreakpoints() == 0 ) { ! Throw( InvalidPartial, "Tried to find end time of a Partial with no Breakpoints." ); } return (--end()).time(); |