a tsan build caused UYVY unittest to fail. This re-enables the test and fixes the bug.
BUG=80
TEST=unittest with tsan or use build bots
Review URL: https://webrtc-codereview.appspot.com/804004
git-svn-id: http://libyuv.googlecode.com/svn/trunk@348 16f28f9a-4ce2-e073-06de-1de4eb20be90
diff --git a/README.chromium b/README.chromium
index 8dbea62..f99f1ff 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
-Version: 347
+Version: 348
License: BSD
License File: LICENSE
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 7bdaeaf..ae250fb 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
-#define LIBYUV_VERSION 347
+#define LIBYUV_VERSION 348
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
diff --git a/source/convert_from.cc b/source/convert_from.cc
index 6ba1d95..38ed40f 100644
--- a/source/convert_from.cc
+++ b/source/convert_from.cc
@@ -583,7 +583,7 @@
uint8* dst_frame, int dst_stride_frame,
int width, int height) {
if (!src_y || !src_u || !src_v || !dst_frame ||
- width <= 0 || height <= 0 ) {
+ width <= 0 || height == 0) {
return -1;
}
// Negative height means invert the image.
diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc
index 668b9ca..f8c87a0 100644
--- a/unit_test/planar_test.cc
+++ b/unit_test/planar_test.cc
@@ -91,15 +91,12 @@
TESTPLANARTOB(I420, 2, 2, RGB565, 2)
TESTPLANARTOB(I420, 2, 2, ARGB1555, 2)
TESTPLANARTOB(I420, 2, 2, ARGB4444, 2)
-// TODO(fbarchard): fix 411 to ARGB valgrind error. libyuv bug #79
-//TESTPLANARTOB(I411, 4, 1, ARGB, 4)
+TESTPLANARTOB(I411, 4, 1, ARGB, 4)
TESTPLANARTOB(I422, 2, 1, ARGB, 4)
TESTPLANARTOB(I444, 1, 1, ARGB, 4)
TESTPLANARTOB(I420, 2, 2, YUY2, 2)
-// TODO(fbarchard): fix I420ToUYVYInvert_OptVsC tsan failure. libyuv bug #80
-//TESTPLANARTOB(I420, 2, 2, UYVY, 2)
-// TODO(fbarchard): fix I420ToV210Invert_OptVsC valgrind failure. libyuv bug #82
-//TESTPLANARTOB(I420, 2, 2, V210, 16 / 6)
+TESTPLANARTOB(I420, 2, 2, UYVY, 2)
+TESTPLANARTOB(I420, 2, 2, V210, 16 / 6)
TESTPLANARTOB(I420, 2, 2, I400, 1)
TESTPLANARTOB(I420, 2, 2, BayerBGGR, 1)
TESTPLANARTOB(I420, 2, 2, BayerRGGB, 1)
