Commit 786b7b96 authored by sagnowski's avatar sagnowski
Browse files

Revert dev changes

parent 77b8796b
Loading
Loading
Loading
Loading
+0 −16
Original line number Diff line number Diff line
@@ -884,11 +884,7 @@ ivas_error check_ind_list_limits(
        }
        else
        {
#ifdef IVAS_ERRORS_FIX_GLOBAL_FRAME
            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits );
#else
            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted in frame %d! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", frame, hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits );
#endif
        }
    }

@@ -943,11 +939,7 @@ ivas_error push_indice(
    /* check the limits of the list of indices */
    if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )
    {
#ifdef IVAS_ERRORS_FIX_GLOBAL_FRAME
        return IVAS_ERROR( error, "Error occured in push_indice() while re-allocating the list of indices!\n" );
#else
        return IVAS_ERROR( error, "Error occured in push_indice() while re-allocating the list of indices (frame %d) !\n", frame );
#endif
    }

    /* find the location in the list of indices based on ID */
@@ -1103,11 +1095,7 @@ ivas_error push_next_bits(
        /* check the limits of the list of indices */
        if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )
        {
#ifdef IVAS_ERRORS_FIX_GLOBAL_FRAME
            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices!\n" );
#else
            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices (frame %d) !\n", frame );
#endif
        }
        ptr = &hBstr->ind_list[hBstr->nb_ind_tot];

@@ -1126,11 +1114,7 @@ ivas_error push_next_bits(
        /* check the limits of the list of indices */
        if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )
        {
#ifdef IVAS_ERRORS_FIX_GLOBAL_FRAME
            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices!\n" );
#else
            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices (frame %d) !\n", frame );
#endif
        }
        ptr = &hBstr->ind_list[hBstr->nb_ind_tot];

+2 −1
Original line number Diff line number Diff line
@@ -41,8 +41,9 @@

#include "ivas_error.h"

#ifdef DEBUGGING
#define IVAS_ERRORS_PRINT_DETAIL
#define IVAS_ERRORS_FIX_GLOBAL_FRAME
#endif
// #define IVAS_ERRORS_ASSERT_ON_ERROR

#ifdef IVAS_ERRORS_PRINT_DETAIL