1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
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);
|
