Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad673da7 authored by Christian Wailes's avatar Christian Wailes Committed by Automerger Merge Worker
Browse files

Merge "Fix enum comparison to reenable -Wenum-compare" am: 04d22dd6 am: 30c0a124 am: 0ccea651 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1774986

Change-Id: Ie4834542c78423d8b4e2911a39cf26a1ad686deb
parents 186f6f5a 0ccea651

media/libheif/HeifDecoderImpl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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::getEncodedColor(HeifEncodedColor* /*outColor*/) const { 
}



bool HeifDecoderImpl::setOutputColor(HeifColorFormat heifColor) {

    if (heifColor == mOutputColor) {

    if (heifColor == (HeifColorFormat)mOutputColor) {

        return true;

    }