From ad126fbf711aaeac1d2c409fd42583e63a159de3 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 12 Mar 2011 14:59:23 +0000 Subject: [PATCH] --- magick/constitute.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/magick/constitute.c b/magick/constitute.c index d79bb1554..d5f5b0566 100644 --- a/magick/constitute.c +++ b/magick/constitute.c @@ -624,6 +624,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, for (next=image; next != (Image *) NULL; next=GetNextImageInList(next)) { char + magick_path[MaxTextExtent], *property, timestamp[MaxTextExtent]; @@ -634,17 +635,17 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, *profile; next->taint=MagickFalse; - if (next->magick_columns == 0) - next->magick_columns=next->columns; - if (next->magick_rows == 0) - next->magick_rows=next->rows; - if ((LocaleCompare(magick,"HTTP") != 0) && - (LocaleCompare(magick,"FTP") != 0) && (LocaleCompare(magick,"X") != 0)) + GetPathComponent(magick_filename,MagickPath,magick_path); + if (*magick_path == '\0') (void) CopyMagickString(next->magick,magick,MaxTextExtent); (void) CopyMagickString(next->magick_filename,magick_filename, MaxTextExtent); if (IsBlobTemporary(image) != MagickFalse) (void) CopyMagickString(next->filename,filename,MaxTextExtent); + if (next->magick_columns == 0) + next->magick_columns=next->columns; + if (next->magick_rows == 0) + next->magick_rows=next->rows; value=GetImageProperty(next,"tiff:Orientation"); if (value == (char *) NULL) value=GetImageProperty(next,"exif:Orientation"); -- 2.40.0