aboutsummaryrefslogtreecommitdiff
path: root/files/util/ssim.h
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2019-06-27 14:28:37 -0700
committerChong Zhang <chz@google.com>2019-06-27 16:38:44 -0700
commitab123ac62c872f89e20f10c96e651ead21414ffc (patch)
tree61f45a95ef42e952ec121583ed73b8649e058bc1 /files/util/ssim.h
parentad97fd58c110036d9dfcdce8bf98282e92707a89 (diff)
downloadlibyuv-ab123ac62c872f89e20f10c96e651ead21414ffc.tar.gz
libyuv roll to r1722 to pick up a few methods
that we've been manually cherry-picking. bug: 132357297 test: MediaMetadataRetriever test; manual testing thumbnails in Photos. Exempt-From-Owner-Approval: files/infra/config/OWNERS owner names are not in android gerrit, CL fail to push with these. Delete of file need to bypass owner. Change-Id: Ic22346e45671452429716be8b0a1999eeaea0d7b
Diffstat (limited to 'files/util/ssim.h')
-rw-r--r--files/util/ssim.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/files/util/ssim.h b/files/util/ssim.h
index 4647f45d..a855f1d1 100644
--- a/files/util/ssim.h
+++ b/files/util/ssim.h
@@ -20,12 +20,12 @@ extern "C" {
#endif
#if !defined(INT_TYPES_DEFINED) && !defined(UINT8_TYPE_DEFINED)
-typedef unsigned char uint8;
+typedef unsigned char uint8_t;
#define UINT8_TYPE_DEFINED
#endif
-double CalcSSIM(const uint8* org,
- const uint8* rec,
+double CalcSSIM(const uint8_t* org,
+ const uint8_t* rec,
const int image_width,
const int image_height);