Commit f2307026 authored by norvell's avatar norvell
Browse files

Fix build-codec-windows-msbuild without pragma

parent 3a0f5bff

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ build-codec-windows-msbuild: 
  script:

    - *print-common-info-windows

    - $winoutdata = $null

    - .\scripts\strip_split_rendering.py

    - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug | tee -variable winoutdata

    - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8

    - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression

lib_rend/ivas_CQMFDecoder.c

+1 −3
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ Nations Convention on Contracts on the International Sales of Goods. 


#include "ivas_CQMFDecoder.h"

#include "options.h"

#ifndef SPLIT_REND_WITH_HEAD_ROT

#pragma warning( disable : 4206 )

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "ivas_NoiseGen.h"

#include "ivas_PerceptualModel.h"

#include "ivas_lcld_tables.h"

lib_rend/ivas_CQMFDecoder.h

+1 −3
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ extern "C" 
#endif



#include "options.h"

#ifndef SPLIT_REND_WITH_HEAD_ROT

#pragma warning( disable : 4206 )

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "lib_rend.h"

#define DECODER_ERROR_NONE               ( 0 )

#define DECODER_ERROR_FS_NOT_SUPPORTED   ( -1 )

lib_rend/ivas_CQMFEncoder.c

+1 −3
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ 


#include "ivas_CQMFEncoder.h"

#include "options.h"

#ifndef SPLIT_REND_WITH_HEAD_ROT

#pragma warning( disable : 4206 )

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include <stdio.h>

#include <math.h>

#include <stdlib.h>

lib_rend/ivas_CQMFEncoder.h

+1 −3
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ extern "C" 
#endif



#include "options.h"

#ifndef SPLIT_REND_WITH_HEAD_ROT

#pragma warning( disable : 4206 )

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "lib_rend.h"

#define ENCODER_ERROR_NONE               ( 0 )

#define ENCODER_ERROR_FS_NOT_SUPPORTED   ( -1 )