Merge "CE: Reduce scope of where -Wconversion is disabled" (77707d96) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayColorProfile.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -19,8 +19,15 @@
		#include <cstdint>
		#include <string>

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wconversion"

		#include <ui/GraphicTypes.h>

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic pop // ignored "-Wconversion"

		namespace android {

		class HdrCapabilities;

+8 −0

Original line number	Diff line number	Diff line
		@@ -20,7 +20,15 @@
		#include <unordered_map>
		#include <vector>

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wconversion"

		#include <ui/GraphicTypes.h>

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic pop // ignored "-Wconversion"

		#include <ui/HdrCapabilities.h>

		namespace android::compositionengine {

+8 −0

Original line number	Diff line number	Diff line
		@@ -20,7 +20,15 @@
		#include <ostream>
		#include <unordered_set>

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wconversion"

		#include <renderengine/LayerSettings.h>

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic pop // ignored "-Wconversion"

		#include <utils/RefBase.h>
		#include <utils/Timers.h>

+11 −3

Original line number	Diff line number	Diff line
		@@ -18,18 +18,26 @@

		#include <cstdint>

		#include <gui/BufferQueue.h>
		#include <gui/HdrMetadata.h>
		#include <math/mat4.h>
		#include <ui/FloatRect.h>
		#include <ui/GraphicBuffer.h>
		#include <ui/GraphicTypes.h>
		#include <ui/Rect.h>
		#include <ui/Region.h>
		#include <ui/Transform.h>

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wconversion"

		#include <gui/BufferQueue.h>
		#include <ui/GraphicBuffer.h>
		#include <ui/GraphicTypes.h>

		#include "DisplayHardware/ComposerHal.h"

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic pop // ignored "-Wconversion"

		namespace android::compositionengine {

		/*

+7 −0

Original line number	Diff line number	Diff line
		@@ -21,9 +21,16 @@

		#include <utils/StrongPointer.h>

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wconversion"

		#include "DisplayHardware/ComposerHal.h"
		#include "DisplayHardware/DisplayIdentification.h"

		// TODO(b/129481165): remove the #pragma below and fix conversion issues
		#pragma clang diagnostic pop // ignored "-Wconversion"

		namespace HWC2 {
		class Layer;
		} // namespace HWC2