Commit 6b2ad37b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_786_ERROR_ISM_METADATA_READ

parent 89a78126

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ 


#define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */

#define FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

#define FIX_786_ERROR_ISM_METADATA_READ                 /* VA: fix error reading past the last line of .csv metadata files */

#define FIX_632_USAN_ERROR_NULL_POINTER                 /* FhG: issue 632 USAN offset to null pointer proto_diffuse_buffer_f in dirac rendering*/

#define FIX_759_CODE_COVERAGE_OSBA                      /* VA: issue 759: remove obsolete code in the OSBA encoder */

#define FIX_708_AEID_COMMAND_LINE                       /* VA: issue 708: improve AEID command-line robustness */

lib_util/ism_file_reader.c

+0 −12
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ ivas_error IsmFileReader_readNextFrame( 


    file = self->file;



#ifdef FIX_786_ERROR_ISM_METADATA_READ

    while ( fgets( char_buff, META_LINE_LENGTH, file ) == NULL )

    {

        if ( feof( self->file ) )
@@ -125,17 +124,6 @@ ivas_error IsmFileReader_readNextFrame( 
            return IVAS_ERR_FAILED_FILE_READ;

        }

    }

#else

    while ( feof( self->file ) )

    {

        rewind( self->file );

    }



    if ( fgets( char_buff, META_LINE_LENGTH, file ) == NULL )

    {

        return IVAS_ERR_FAILED_FILE_READ;

    }

#endif



    char_ptr = strtok( char_buff, "," );

    i = 0;