Commit 99425116 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'cleanup_prot_header_file' into 'main' 

prot_fx1.h and prot_fx2.h replaced with single prot_fx.h

See merge request !456
parents 2006c345 c184a7b3

Workspace_msvc/lib_com.vcxproj

+1 −2
Original line number Diff line number Diff line
@@ -399,8 +399,7 @@ 
    <ClInclude Include="..\lib_com\move.h" />

    <ClInclude Include="..\lib_com\options.h" />

    <ClInclude Include="..\lib_com\prot.h" />

    <ClInclude Include="..\lib_com\prot_fx2.h" />

    <ClInclude Include="..\lib_com\prot_fx1.h" />

    <ClInclude Include="..\lib_com\prot_fx.h" />

    <ClInclude Include="..\lib_com\rom_basop_util.h" />

    <ClInclude Include="..\lib_com\rom_com.h" />

    <ClInclude Include="..\lib_com\rom_com_fx.h" />

Workspace_msvc/lib_com.vcxproj.filters

+1 −2
Original line number Diff line number Diff line
@@ -593,11 +593,10 @@ 
    <ClInclude Include="..\lib_com\rom_basop_util.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\prot_fx2.h" />

    <ClInclude Include="..\lib_com\prot_fx1.h" />

    <ClInclude Include="..\lib_com\rom_com_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\prot_fx.h" />

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_evs_c">

Workspace_msvc/renderer.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include "wmc_auto.h"



#ifdef IVAS_FLOAT_FIXED

#include "prot_fx1.h"

#include "prot_fx.h"

#endif



#define WMC_TOOL_SKIP

lib_com/ACcontextMapping_fx.c

+1 −2
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
#include "options.h"

#include "basop_util.h"

#include "cnst.h"

#include "prot_fx1.h"

#include "prot_fx2.h"

#include "prot_fx.h"

#include "rom_com.h"



/* Returns: index of next coefficient */