rename namespace and funciton name to avoid conflicts with old library

ruil2 committed 12 years ago

Commit 3ff145e1 parent 25b723c8 files · +17 −17Browse files

Showing the changes to test/processing/ProcessUT_DownSample.cpp (1 of 8 files). Show all

Unified · Split

test/processing/ProcessUT_DownSample.cpp+2−2

@@ -6,7 +6,7 @@ · 5 unmodified lines
6	#include "IWelsVP.h"	6	#include "IWelsVP.h"
7	#include "downsample.h"	7	#include "downsample.h"
8		8
9	using namespace nsWelsVP;	9	using namespace WelsVP;
10		10
11	void DyadicBilinearDownsampler_ref (uint8_t* pDst, const int32_t kiDstStride,	11	void DyadicBilinearDownsampler_ref (uint8_t* pDst, const int32_t kiDstStride,
12	uint8_t* pSrc, const int32_t kiSrcStride,	12	uint8_t* pSrc, const int32_t kiSrcStride,
@@ -272,4 +272,4 @@ GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsamplerWidthx32_AArch64 · 259 unmodified lines
272	GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsampler_AArch64_neon, 1, WELS_CPU_NEON)	272	GENERATE_DyadicBilinearDownsampler_UT (DyadicBilinearDownsampler_AArch64_neon, 1, WELS_CPU_NEON)
273		273
274	GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearAccurateDownsamplerWrap_AArch64_neon, GeneralBilinearAccurateDownsampler_ref, 1, WELS_CPU_NEON)	274	GENERATE_GeneralBilinearDownsampler_UT (GeneralBilinearAccurateDownsamplerWrap_AArch64_neon, GeneralBilinearAccurateDownsampler_ref, 1, WELS_CPU_NEON)
275	#endif	275	#endif