From cf00632d1d21b27545d924bcf1ee06f2c05b9750 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 28 Jul 2019 12:31:52 -0400 Subject: [PATCH] ... --- MagickCore/utility.c | 30 +++++++++++++++--------------- coders/dcm.c | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/MagickCore/utility.c b/MagickCore/utility.c index e9325a987..a877a0ce7 100644 --- a/MagickCore/utility.c +++ b/MagickCore/utility.c @@ -1243,21 +1243,21 @@ MagickExport void GetPathComponent(const char *path,PathType type, q=strrchr(component,'['); if ((q != (char *) NULL) && ((q == component) || (*(q-1) != ']')) && (IsPathAccessible(path) == MagickFalse)) - { - /* - Look for scene specification (e.g. img0001.pcd[4]). - */ - *p='\0'; - if ((IsSceneGeometry(q+1,MagickFalse) == MagickFalse) && - (IsGeometry(q+1) == MagickFalse)) - *p=']'; - else - { - subimage_length=(size_t) (p-q); - subimage_offset=(size_t) (q-component+1); - *q='\0'; - } - } + { + /* + Look for scene specification (e.g. img0001.pcd[4]). + */ + *p='\0'; + if ((IsSceneGeometry(q+1,MagickFalse) == MagickFalse) && + (IsGeometry(q+1) == MagickFalse)) + *p=']'; + else + { + subimage_length=(size_t) (p-q); + subimage_offset=(size_t) (q-component+1); + *q='\0'; + } + } } } magick_length=0; diff --git a/coders/dcm.c b/coders/dcm.c index 39a0b7d3c..3b8d3be18 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -3179,9 +3179,9 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) Check for "explicitness", but meta-file headers always explicit. */ if ((explicit_file == MagickFalse) && (group != 0x0002)) - explicit_file=(isupper((unsigned char) *explicit_vr) != 0) && - (isupper((unsigned char) *(explicit_vr+1)) != 0) ? MagickTrue : - MagickFalse; + explicit_file=(isupper((int) ((unsigned char) *explicit_vr)) != 0) && + (isupper((int) ((unsigned char) *(explicit_vr+1))) != 0) ? + MagickTrue : MagickFalse; use_explicit=((group == 0x0002) && (explicit_retry == MagickFalse)) || (explicit_file != MagickFalse) ? MagickTrue : MagickFalse; if ((use_explicit != MagickFalse) && (strncmp(implicit_vr,"xs",2) == 0)) -- 2.40.0