From 021e46e5bea3db7d699a8c152687d0bfc0cd5e49 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Fri, 1 Sep 2023 16:59:49 +0200 Subject: [PATCH 1/2] Add workaround for false warnings in renderer configuration --- lib_com/options.h | 2 ++ lib_util/render_config_reader.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 15bbe7d34d..31848314e1 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -158,6 +158,8 @@ #define OSBA_SPLIT_RENDERING #endif +#define FIX_705_REND_CONF_FALSE_WARNING /* Eri: Bug in MSVC ftell() for UNIX-style line endings trigger false warning messages in renderer configuration. */ + /* #################### End BE switches ################################## */ diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index 3293e4d4a5..838123ff08 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -1849,6 +1849,7 @@ ivas_error RenderConfigReader_read( uint32_t accDPIdx; accDPIdx = 0; + fseek( pRenderConfigReader->pConfigFile, 0, SEEK_END ); file_size = ftell( pRenderConfigReader->pConfigFile ); rewind( pRenderConfigReader->pConfigFile ); @@ -1857,6 +1858,9 @@ ivas_error RenderConfigReader_read( pTemp = (char *) calloc( file_size + 1, sizeof( char ) ); acIdx = 0; roomAcHasFgCount = roomAcHasAcEnvCount = FALSE; +#ifdef FIX_705_REND_CONF_FALSE_WARNING + setvbuf( pRenderConfigReader->pConfigFile, pConfig_str, _IONBF, sizeof( char ) ); /* Work-around for VS bug that gives incorrect ftell for UNIX-style line endings */ +#endif /* read file line by line */ while ( fgets( pConfig_str, file_size, pRenderConfigReader->pConfigFile ) != NULL ) -- GitLab From 47483636501a3b508412ed2fa84aba4f2772b135 Mon Sep 17 00:00:00 2001 From: norvell Date: Fri, 8 Sep 2023 06:30:09 +0000 Subject: [PATCH 2/2] Remove newline at line 1852 in render_config_reader.c --- lib_util/render_config_reader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index 838123ff08..94b3ab6a45 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -1849,7 +1849,6 @@ ivas_error RenderConfigReader_read( uint32_t accDPIdx; accDPIdx = 0; - fseek( pRenderConfigReader->pConfigFile, 0, SEEK_END ); file_size = ftell( pRenderConfigReader->pConfigFile ); rewind( pRenderConfigReader->pConfigFile ); -- GitLab