Commit 9124ac89 authored by fbarchard@google.com's avatar fbarchard@google.com

compare_common visual c port

BUG=303
TESTED=cl /c /TC /Iinclude source/compare_common.cc
R=tpsiaki@google.com

Review URL: https://webrtc-codereview.appspot.com/6839004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@958 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 167d5d1c
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 956 Version: 957
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -1685,10 +1685,10 @@ void ARGBPolynomialRow_AVX2(const uint8* src_argb, ...@@ -1685,10 +1685,10 @@ void ARGBPolynomialRow_AVX2(const uint8* src_argb,
int width); int width);
void ARGBLumaColorTableRow_C(const uint8* src_argb, uint8* dst_argb, int width, void ARGBLumaColorTableRow_C(const uint8* src_argb, uint8* dst_argb, int width,
const uint8* luma, const uint32 lumacoeff); const uint8* luma, uint32 lumacoeff);
void ARGBLumaColorTableRow_SSSE3(const uint8* src_argb, uint8* dst_argb, void ARGBLumaColorTableRow_SSSE3(const uint8* src_argb, uint8* dst_argb,
int width, const uint8* luma, int width,
const uint32 lumacoeff); const uint8* luma, uint32 lumacoeff);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 956 #define LIBYUV_VERSION 957
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
...@@ -17,7 +17,8 @@ extern "C" { ...@@ -17,7 +17,8 @@ extern "C" {
uint32 SumSquareError_C(const uint8* src_a, const uint8* src_b, int count) { uint32 SumSquareError_C(const uint8* src_a, const uint8* src_b, int count) {
uint32 sse = 0u; uint32 sse = 0u;
for (int i = 0; i < count; ++i) { int i;
for (i = 0; i < count; ++i) {
int diff = src_a[i] - src_b[i]; int diff = src_a[i] - src_b[i];
sse += (uint32)(diff * diff); sse += (uint32)(diff * diff);
} }
...@@ -28,7 +29,8 @@ uint32 SumSquareError_C(const uint8* src_a, const uint8* src_b, int count) { ...@@ -28,7 +29,8 @@ uint32 SumSquareError_C(const uint8* src_a, const uint8* src_b, int count) {
// Internal C version of HashDjb2 with int sized count for efficiency. // Internal C version of HashDjb2 with int sized count for efficiency.
uint32 HashDjb2_C(const uint8* src, int count, uint32 seed) { uint32 HashDjb2_C(const uint8* src, int count, uint32 seed) {
uint32 hash = seed; uint32 hash = seed;
for (int i = 0; i < count; ++i) { int i;
for (i = 0; i < count; ++i) {
hash += (hash << 5) + src[i]; hash += (hash << 5) + src[i];
} }
return hash; return hash;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment