| commit | 0ccea651bcbdc02d29122e1221d48291fada7e03 | [log] [tgz] |
|---|---|---|
| author | Christian Wailes <chriswailes@google.com> | Tue Aug 03 00:09:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 03 00:09:18 2021 +0000 |
| tree | 1cb63f5fe40a7bb0e0241a0fe0935a0d158f011d | |
| parent | b6a99c1f9c3a797467553d063c6a6e2d6fa016e0 [diff] | |
| parent | 30c0a12496ee67dcde2aa29dd780d9c3eff7210a [diff] |
Merge "Fix enum comparison to reenable -Wenum-compare" am: 04d22dd656 am: 30c0a12496 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1774986 Change-Id: I2eacbb473247e7bc51aa280d70594ad3f40d114b
diff --git a/media/libheif/HeifDecoderImpl.cpp b/media/libheif/HeifDecoderImpl.cpp index 273d91c..fcac551 100644 --- a/media/libheif/HeifDecoderImpl.cpp +++ b/media/libheif/HeifDecoderImpl.cpp
@@ -15,6 +15,7 @@ */ //#define LOG_NDEBUG 0 +#include "include/HeifDecoderAPI.h" #define LOG_TAG "HeifDecoderImpl" #include "HeifDecoderImpl.h" @@ -464,7 +465,7 @@ } bool HeifDecoderImpl::setOutputColor(HeifColorFormat heifColor) { - if (heifColor == mOutputColor) { + if (heifColor == (HeifColorFormat)mOutputColor) { return true; }