Merge "Fix enum comparison to reenable -Wenum-compare" (04d22dd6) · Commits · e / os / android_frameworks_av

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