From 1070b178240a023bac7810fc054edb21a21e14e7 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 31 Aug 2024 10:11:39 -0400 Subject: [PATCH] restore clipboard.c --- coders/clipboard.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/coders/clipboard.c b/coders/clipboard.c index afb1f6d73f..9d027f37ce 100644 --- a/coders/clipboard.c +++ b/coders/clipboard.c @@ -35,7 +35,7 @@ % % */ - + /* Include declarations. */ @@ -205,17 +205,6 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info, read_info=DestroyImageInfo(read_info); clip_data=RelinquishMagickMemory(clip_data); return(image); -<<<<<<< HEAD -#else /* MAGICKCORE_WINGDI32_DELEGATE */ -static Image *ReadCLIPBOARDImage(const ImageInfo *magick_unused(image_info), - ExceptionInfo *magick_unused(exception)) -{ - magick_unreferenced(image_info); - magick_unreferenced(exception); - return((Image *) NULL); -#endif -======= ->>>>>>> 42c884571 (support clipboard delegate) } #endif /* MAGICKCORE_WINGDI32_DELEGATE */ @@ -377,18 +366,6 @@ static MagickBooleanType WriteCLIPBOARDImage(const ImageInfo *image_info, else SetClipboardData(CF_DIBV5,clip_handle); (void) CloseClipboard(); -<<<<<<< HEAD -#else -static MagickBooleanType WriteCLIPBOARDImage( - const ImageInfo *magick_unused(image_info), - Image *magick_unused(image),ExceptionInfo *magick_unused(exception)) -{ - magick_unreferenced(image_info); - magick_unreferenced(image); - magick_unreferenced(exception); -#endif /* MAGICKCORE_WINGDI32_DELEGATE */ -======= ->>>>>>> 42c884571 (support clipboard delegate) return(MagickTrue); } #endif /* MAGICKCORE_WINGDI32_DELEGATE */