diff --git a/README.chromium b/README.chromium index 4b6807c8d..6f8b66b50 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 192 +Version: 199 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 1e7459f4d..2510546a3 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,7 +11,7 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 192 +#define LIBYUV_VERSION 199 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/unit_test/cpu_test.cc b/unit_test/cpu_test.cc index 0914132d9..0c43d3faf 100644 --- a/unit_test/cpu_test.cc +++ b/unit_test/cpu_test.cc @@ -19,11 +19,12 @@ namespace libyuv { +// For testing purposes call the proc/cpuinfo parser directly extern "C" int ArmCpuCaps(const char* cpuinfoname); TEST_F(libyuvTest, TestLinuxNeon) { - EXPECT_EQ(0,ArmCpuCaps("testdata/arm_v7.txt")); - EXPECT_NE(kCpuHasNEON,ArmCpuCaps("testdata/tegra3.txt")); + EXPECT_EQ(0, ArmCpuCaps("unit_test/testdata/arm_v7.txt")); + EXPECT_EQ(kCpuHasNEON, ArmCpuCaps("unit_test/testdata/tegra3.txt")); } TEST_F(libyuvTest, TestVersion) { diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc index dee3b831f..46ab385e6 100644 --- a/unit_test/planar_test.cc +++ b/unit_test/planar_test.cc @@ -13,9 +13,10 @@ #include #include -#include "libyuv/rotate.h" -#include "libyuv/planar_functions.h" +#include "libyuv/convert_from.h" #include "libyuv/cpu_id.h" +#include "libyuv/planar_functions.h" +#include "libyuv/rotate.h" namespace libyuv {