commit 84fa44d0e7fb064ac3665a66a61648efdc6c7003
author Steven Moreland <smoreland@google.com> Tue Aug 03 00:21:42 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 03 00:21:42 2021 +0000
tree 697e86a231c3000bc8243438c14c63f2a5bd5ea0
parent 0ccea651bcbdc02d29122e1221d48291fada7e03
parent 58c938eed993f7088ce8fe3268165c810718a4d4

Merge "mediatranscoding: avoid double-ownership in test" into sc-dev-plus-aosp

media/libheif/HeifDecoderImpl.cpp

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;
     }