coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 01:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Couple fixes for scale common

Browse Source 
BUG=none
TESTED=local build
R=tpsiaki@google.com

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

git-svn-id: http://libyuv.googlecode.com/svn/trunk@897 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-12-06 19:20:40 +00:00
parent 980150f7f1
commit 5e24e55f98
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 896 Version: 897
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -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 896 #define LIBYUV_VERSION 897
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

8
source/scale_common.cc
View File

@ -23,6 +23,10 @@ namespace libyuv {
extern "C" { extern "C" {
#endif #endif
static __inline int Abs(int v) {
return v >= 0 ? v : -v;
}
// CPU agnostic row functions // CPU agnostic row functions
void ScaleRowDown2_C(const uint8* src_ptr, ptrdiff_t /* src_stride */, void ScaleRowDown2_C(const uint8* src_ptr, ptrdiff_t /* src_stride */,
uint8* dst, int dst_width) { uint8* dst, int dst_width) {
@ -581,7 +585,7 @@ FilterMode ScaleFilterReduce(int src_width, int src_height,
// Compute slope values for stepping. // Compute slope values for stepping.
void ScaleSlope(int src_width, int src_height, void ScaleSlope(int src_width, int src_height,
int dst_width, int src_height, int dst_width, int dst_height,
FilterMode filtering, FilterMode filtering,
int* x, int* y, int* dx, int* dy) { int* x, int* y, int* dx, int* dy) {
assert(x != NULL); assert(x != NULL);
@ -634,7 +638,7 @@ void ScaleSlope(int src_width, int src_height,
} }
// Negative src_width means horizontally mirror. // Negative src_width means horizontally mirror.
if (src_width < 0) { if (src_width < 0) {
*x += (dst_width - 1) * dx; *x += (dst_width - 1) * *dx;
*dx = -*dx; *dx = -*dx;
src_width = -src_width; src_width = -src_width;
} }