diff options
author | Remi Collet <remi@remirepo.net> | 2020-04-06 17:25:33 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2020-04-06 17:25:33 +0200 |
commit | 51ae6780fc6077168330a47a4ffe377a80a266ce (patch) | |
tree | c6d53186d7851b203c6268d02cf568dd246a39b0 /e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d.patch | |
parent | c7e9b13f1c89f7223f6b47a282573c2fe780e9cb (diff) |
test build for upstream patch for
https://github.com/ImageMagick/ImageMagick6/issues/80
Diffstat (limited to 'e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d.patch')
-rw-r--r-- | e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d.patch b/e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d.patch new file mode 100644 index 0000000..1658552 --- /dev/null +++ b/e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d.patch @@ -0,0 +1,58 @@ +From e9e105ccbea4e2e9acc2e7c27fe065a90e919d5d Mon Sep 17 00:00:00 2001 +From: Cristy <mikayla-grace@urban-warrior.org> +Date: Mon, 6 Apr 2020 10:54:53 -0400 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick6/issues/80 + +--- + ChangeLog | 7 +++++++ + coders/ept.c | 21 +++++++-------------- + 2 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/coders/ept.c b/coders/ept.c +index d4cd72045..71f8c19c6 100644 +--- a/coders/ept.c ++++ b/coders/ept.c +@@ -165,8 +165,7 @@ static Image *ReadEPTImage(const ImageInfo *image_info,ExceptionInfo *exception) + ept_info; + + Image +- *image, +- *tiff_image; ++ *image; + + ImageInfo + *read_info; +@@ -255,27 +254,21 @@ static Image *ReadEPTImage(const ImageInfo *image_info,ExceptionInfo *exception) + (void) CloseBlob(image); + image=DestroyImage(image); + read_info=CloneImageInfo(image_info); +- read_info->number_scenes=1; +- read_info->scene=0; + (void) CopyMagickString(read_info->magick,"EPS",MagickPathExtent); + image=BlobToImage(read_info,postscript_data,ept_info.postscript_length, + exception); ++ if (image == (Image *) NULL) ++ { ++ (void) CopyMagickString(read_info->magick,"TIFF",MagickPathExtent); ++ image=BlobToImage(read_info,tiff_data,ept_info.tiff_length,exception); ++ } ++ read_info=DestroyImageInfo(read_info); + if (image != (Image *) NULL) + { + (void) CopyMagickString(image->filename,image_info->filename, + MagickPathExtent); + (void) CopyMagickString(image->magick,"EPT",MagickPathExtent); + } +- (void) CopyMagickString(read_info->magick,"TIFF",MagickPathExtent); +- tiff_image=BlobToImage(read_info,tiff_data,ept_info.tiff_length,exception); +- if (tiff_image != (Image *) NULL) +- { +- if (image == (Image *) NULL) +- image=tiff_image; +- else +- AppendImageToList(&image,tiff_image); +- } +- read_info=DestroyImageInfo(read_info); + ept_info.tiff=(unsigned char *) RelinquishMagickMemory(ept_info.tiff); + ept_info.postscript=(unsigned char *) RelinquishMagickMemory( + ept_info.postscript); |