From 3bedc1f92ee1922baf478475a2386cc5e5844973 Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Wed, 6 Jul 2022 14:04:06 +0200
Subject: [PATCH] Fixed swscale and cairo checks

---
 channels/rdpgfx/client/rdpgfx_main.c |  2 +-
 include/config/config.h.in           |  2 ++
 libfreerdp/CMakeLists.txt            |  2 --
 libfreerdp/codec/color.c             | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c
index 0e5d58623..2e0f8d149 100644
--- a/channels/rdpgfx/client/rdpgfx_main.c
+++ b/channels/rdpgfx/client/rdpgfx_main.c
@@ -345,7 +345,7 @@ static UINT rdpgfx_send_supported_caps(GENERIC_CHANNEL_CALLBACK* callback)
 			capsSet->version = RDPGFX_CAPVERSION_107;
 			capsSet->length = 0x4;
 			capsSet->flags = caps10Flags;
-#if !defined(CAIRO_FOUND) && !defined(SWSCALE_FOUND)
+#if !defined(WITH_CAIRO) && !defined(WITH_SWSCALE)
 			capsSet->flags |= RDPGFX_CAPS_FLAG_SCALEDMAP_DISABLE;
 #endif
 		}
diff --git a/include/config/config.h.in b/include/config/config.h.in
index d8fcc3e3a..b3d3ac184 100644
--- a/include/config/config.h.in
+++ b/include/config/config.h.in
@@ -23,6 +23,8 @@
 #cmakedefine WITH_CUPS
 #cmakedefine WITH_JPEG
 #cmakedefine WITH_WIN8
+#cmakedefine WITH_CAIRO
+#cmakedefine WITH_SWSCALE
 #cmakedefine WITH_RDPSND_DSOUND
 
 #cmakedefine WITH_WINMM
diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index a6cd2357a..8acbf3132 100644
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -91,11 +91,9 @@ endif(WITH_CAIRO)
 
 # Prefer SWScale over Cairo, both at the same time are not possible.
 if (WITH_SWSCALE)
-    add_definitions(-DSWSCALE_FOUND=1)
     include_directories(${SWScale_INCLUDE_DIR})
     freerdp_library_add(${SWScale_LIBRARY})
 elseif (WITH_CAIRO)
-    add_definitions(-DCAIRO_FOUND=1)
     include_directories(${CAIRO_INCLUDE_DIR})
     freerdp_library_add(${CAIRO_LIBRARY})
 else()
diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c
index 836a2d0a0..4b32b7bb6 100644
--- a/libfreerdp/codec/color.c
+++ b/libfreerdp/codec/color.c
@@ -31,11 +31,11 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/primitives.h>
 
-#if defined(CAIRO_FOUND)
+#if defined(WITH_CAIRO)
 #include <cairo.h>
 #endif
 
-#if defined(SWSCALE_FOUND)
+#if defined(WITH_SWSCALE)
 #include <libswscale/swscale.h>
 #endif
 
@@ -746,7 +746,7 @@ BOOL freerdp_image_fill(BYTE* pDstData, DWORD DstFormat, UINT32 nDstStep, UINT32
 	return TRUE;
 }
 
-#if defined(SWSCALE_FOUND)
+#if defined(WITH_SWSCALE)
 static int av_format_for_buffer(UINT32 format)
 {
 	switch (format)
@@ -782,7 +782,7 @@ BOOL freerdp_image_scale(BYTE* pDstData, DWORD DstFormat, UINT32 nDstStep, UINT3
 	if (nSrcStep == 0)
 		nSrcStep = nSrcWidth * FreeRDPGetBytesPerPixel(SrcFormat);
 
-#if defined(SWSCALE_FOUND) || defined(CAIRO_FOUND)
+#if defined(WITH_SWSCALE) || defined(WITH_CAIRO)
 	const BYTE* src = &pSrcData[nXSrc * FreeRDPGetBytesPerPixel(SrcFormat) + nYSrc * nSrcStep];
 	BYTE* dst = &pDstData[nXDst * FreeRDPGetBytesPerPixel(DstFormat) + nYDst * nDstStep];
 #endif
@@ -795,7 +795,7 @@ BOOL freerdp_image_scale(BYTE* pDstData, DWORD DstFormat, UINT32 nDstStep, UINT3
 		                          FREERDP_FLIP_NONE);
 	}
 	else
-#if defined(SWSCALE_FOUND)
+#if defined(WITH_SWSCALE)
 	{
 		int res;
 		struct SwsContext* resize;
@@ -819,7 +819,7 @@ BOOL freerdp_image_scale(BYTE* pDstData, DWORD DstFormat, UINT32 nDstStep, UINT3
 		sws_freeContext(resize);
 	}
 
-#elif defined(CAIRO_FOUND)
+#elif defined(WITH_CAIRO)
 	{
 		const double sx = (double)nDstWidth / (double)nSrcWidth;
 		const double sy = (double)nDstHeight / (double)nSrcHeight;