From d0c1cfd292abd9137e74f3da10ef4bdc9233e502 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 29 Aug 2023 19:21:41 -0400 Subject: [PATCH] simplify --- src/dump_image.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/dump_image.cpp b/src/dump_image.cpp index b1b91c6543..15c08c2821 100644 --- a/src/dump_image.cpp +++ b/src/dump_image.cpp @@ -77,18 +77,10 @@ DumpImage::DumpImage(LAMMPS *lmp, int narg, char **arg) : // set filetype based on filename suffix - int n = strlen(filename); - if (strlen(filename) > 4 && strcmp(&filename[n-4],".jpg") == 0) + if (utils::strmatch(filename, "\\.jpg$") || utils::strmatch(filename, "\\.JPG$") + || utils::strmatch(filename, "\\.jpeg$") || utils::strmatch(filename, "\\.JPEG$")) filetype = JPG; - else if (strlen(filename) > 4 && strcmp(&filename[n-4],".JPG") == 0) - filetype = JPG; - else if (strlen(filename) > 5 && strcmp(&filename[n-5],".jpeg") == 0) - filetype = JPG; - else if (strlen(filename) > 5 && strcmp(&filename[n-5],".JPEG") == 0) - filetype = JPG; - else if (strlen(filename) > 4 && strcmp(&filename[n-4],".png") == 0) - filetype = PNG; - else if (strlen(filename) > 4 && strcmp(&filename[n-4],".PNG") == 0) + else if (utils::strmatch(filename, "\\.png$") || utils::strmatch(filename, "\\.PNG$")) filetype = PNG; else filetype = PPM;