graphics/imagemagick
graphics/imagemagick
1
0
Fork 0
mirror of https://github.com/imagemagick/imagemagick synced 2024-10-18 08:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore clipboard.c

Browse source
This commit is contained in:
Cristy 2024-08-31 10:11:39 -04:00
parent 39a135a0d0
commit 1070b17824
1 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
coders/clipboard.c
View file

@ -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 */