Commit 9a5f8064 authored by vaclav's avatar vaclav Committed by Manuel Jander
Browse files

fix MSVC Release mode build

parent 9669e1ce

Workspace_msvc/lib_dec.vcxproj

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

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

      <AdditionalIncludeDirectories>..\lib_basop;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_rend;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

lib_com/basop_util.c

+0 −49
Original line number Diff line number Diff line
@@ -988,55 +988,6 @@ Word32 div_w( Word32 L_num, Word32 L_den ) 
}





<<<<<<< HEAD

=======

    /* assert (x >= (Word32)0); */

    assert( y != (Word32) 0 );



    sign = 0;

    move16();



    IF( x < 0 )

    {

        x = L_negate( x );

        sign = L_xor( sign, 1 );

    }



    IF( y < 0 )

    {

        y = L_negate( y );

        sign = L_xor( sign, 1 );

    }



    IF( x == (Word32) 0 )

    {

        *s = 0;

        return ( (Word32) 0 );

    }



    sx = norm_l( x );

    x = L_shl( x, sx );

    x = L_shr( x, 1 );

    move16();

    *s = sub( 1, sx );



    sy = norm_l( y );

    y = L_shl( y, sy );

    move16();

    *s = add( *s, sy );



    z = div_w( x, y );



    if ( sign != 0 )

    {

        z = L_negate( z );

    }



    return z;

}

#endif



>>>>>>> a9eb284cd (Address Markus' comments.)

/*

Table of 256 precalculated estimates to be used by the "div_w_newton"

function using the Newton/Raphson method.

lib_com/basop_util.h

+0 −9
Original line number Diff line number Diff line
@@ -328,15 +328,6 @@ Word16 BASOP_Util_Divide3232_Scale( Word32 x, /*!< i : Numerator*/ 
                                    Word32 y,    /*!< i  : Denominator*/

                                    Word16 *s ); /*!< o  : Additional scalefactor difference*/



<<<<<<< HEAD

=======

#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

Word32 BASOP_Util_Divide3232_Scale_cadence( Word32 x,    /*!< i  : Numerator*/

                                            Word32 y,    /*!< i  : Denominator*/

                                            Word16 *s ); /*!< o  : Additional scalefactor difference*/

#endif



>>>>>>> a9eb284cd (Address Markus' comments.)

Word32 div_w_newton( Word32 num,   /*!< i  : Numerator*/

                     Word32 den ); /*!< i  : Denominator*/

lib_dec/ivas_ism_metadata_dec_fx.c

+0 −5
Original line number Diff line number Diff line
@@ -31,17 +31,12 @@ 
*******************************************************************************************************/



#include <stdint.h>

#include <math.h>

#include "options.h"

#include "stl.h"

#include "ivas_cnst.h"

#include "ivas_prot_fx.h"

#include "ivas_rom_com.h"

#include "prot_fx.h"

<<<<<<< HEAD

=======

#include "ivas_stat_enc.h"

>>>>>>> 61c31ac7a (add missing include, use stl.h instead of move.h)

#include "wmc_auto.h"