Patch from SVOX: 1.1.0.2 Engine Release

Issues fixed since 1.1.0.0:
- closing tags not interpreted in some cases where enclosed text
  contains a smaller-then sign
- Discontinuities in energy transformation
- Lexicon Access: entry with empty phonetic transcription mistaken
  as :G2P in seldom cases

1 files changed, 4 insertions, 4 deletions

diff --git a/pico/lib/picoctrl.c b/pico/lib/picoctrl.c
index 25550f2..3c65831 100644
--- a/pico/lib/picoctrl.c
+++ b/pico/lib/picoctrl.c
@@ -90,7 +90,7 @@ typedef struct ctrl_subobj {
  * @callgraph
  * @callergraph
  */
-static pico_status_t ctrlInitialize(register picodata_ProcessingUnit this, picoos_int32 r_mode) {
+static pico_status_t ctrlInitialize(register picodata_ProcessingUnit this, picoos_int32 resetMode) {
     register ctrl_subobj_t * ctrl;
     pico_status_t status= PICO_OK;
     picoos_int8 i;
@@ -104,7 +104,7 @@ static pico_status_t ctrlInitialize(register picodata_ProcessingUnit this, picoo
     status = PICO_OK;
     for (i = 0; i < ctrl->numProcUnits; i++) {
         if (PICO_OK == status) {
-            status = ctrl->procUnit[i]->initialize(ctrl->procUnit[i], r_mode);
+            status = ctrl->procUnit[i]->initialize(ctrl->procUnit[i], resetMode);
             PICODBG_DEBUG(("(re-)initializing procUnit[%i] returned status %i",i, status));
         }
         if (PICO_OK == status) {
@@ -521,7 +521,7 @@ typedef struct picoctrl_engine {
  * @callgraph
  * @callergraph
  */
-pico_status_t picoctrl_engReset(picoctrl_Engine this, picoos_int32 r_mode)
+pico_status_t picoctrl_engReset(picoctrl_Engine this, picoos_int32 resetMode)
 {
     pico_status_t status;
 
@@ -532,7 +532,7 @@ pico_status_t picoctrl_engReset(picoctrl_Engine this, picoos_int32 r_mode)
 
     status = this->control->terminate(this->control);
     if (PICO_OK == status) {
-        status = this->control->initialize(this->control, r_mode);
+        status = this->control->initialize(this->control, resetMode);
     }
     if (PICO_OK == status) {
         status = picodata_cbReset(this->cbIn);