From c78295786b32e3e01c18135010577e43df68ce49 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Tue, 31 Mar 2026 08:22:02 +0200 Subject: [PATCH 1/6] [test] rm outdated comment and add bmp and tiff --- roottest/root/graf/simpleImages.C | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/roottest/root/graf/simpleImages.C b/roottest/root/graf/simpleImages.C index 7e3ae306b1ebc..ec79ff0b38c0b 100644 --- a/roottest/root/graf/simpleImages.C +++ b/roottest/root/graf/simpleImages.C @@ -15,12 +15,10 @@ int simpleImages() TH1D h("myHisto", "The Title;the X;the Y", 64, -4, 4); h.FillRandom("gaus"); h.Draw(); - // We test png and jpeg only. The creation of the gifs - // is affected by an issue on some platforms. See #21561 - std::vector fileNames{"f.jpeg", "f.png", "f.gif"}; + std::vector fileNames{"f.jpeg", "f.png", "f.gif", "f.bmp", "f.tiff"}; ImagesRAII iraii(fileNames); for (auto &&fileName : fileNames) { c.SaveAs(fileName.c_str()); } return 0; -} \ No newline at end of file +} From 5acbece0f0a441922097edb04ed7492d7a8279b7 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Tue, 31 Mar 2026 08:22:49 +0200 Subject: [PATCH 2/6] Update simpleImages.ref --- roottest/root/graf/simpleImages.ref | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roottest/root/graf/simpleImages.ref b/roottest/root/graf/simpleImages.ref index d48333847b726..6a6f0cb58e580 100644 --- a/roottest/root/graf/simpleImages.ref +++ b/roottest/root/graf/simpleImages.ref @@ -1,4 +1,6 @@ Info in : jpg file f.jpeg has been created Info in : png file f.png has been created Info in : gif file f.gif has been created +Info in : gif file f.bmp has been created +Info in : gif file f.tiff has been created (int) 0 From c5fe9a06cd3001432bf459e1b4f9ad1fc6acd095 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Tue, 31 Mar 2026 08:53:50 +0200 Subject: [PATCH 3/6] Update simpleImages.ref --- roottest/root/graf/simpleImages.ref | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roottest/root/graf/simpleImages.ref b/roottest/root/graf/simpleImages.ref index 6a6f0cb58e580..f19c721ddb2c2 100644 --- a/roottest/root/graf/simpleImages.ref +++ b/roottest/root/graf/simpleImages.ref @@ -1,6 +1,6 @@ Info in : jpg file f.jpeg has been created Info in : png file f.png has been created Info in : gif file f.gif has been created -Info in : gif file f.bmp has been created -Info in : gif file f.tiff has been created +Info in : bmp file f.bmp has been created +Info in : tiff file f.tiff has been created (int) 0 From 53f266758c7a1a645d7944c28d781f616b6c227a Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Tue, 31 Mar 2026 10:29:49 +0200 Subject: [PATCH 4/6] Update simpleImages.C --- roottest/root/graf/simpleImages.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roottest/root/graf/simpleImages.C b/roottest/root/graf/simpleImages.C index ec79ff0b38c0b..0dd6900ee454f 100644 --- a/roottest/root/graf/simpleImages.C +++ b/roottest/root/graf/simpleImages.C @@ -15,7 +15,7 @@ int simpleImages() TH1D h("myHisto", "The Title;the X;the Y", 64, -4, 4); h.FillRandom("gaus"); h.Draw(); - std::vector fileNames{"f.jpeg", "f.png", "f.gif", "f.bmp", "f.tiff"}; + std::vector fileNames{"f.jpeg", "f.png", "f.gif", "f.bmp"}; // TIFF not always there: only ON if asimage_tiff and libtiff installed in system (it's not a builtin unlike jpeg, png, gif) ImagesRAII iraii(fileNames); for (auto &&fileName : fileNames) { c.SaveAs(fileName.c_str()); From 6cf358ad87418293a76a87b5573ab443e44f30d3 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Tue, 31 Mar 2026 10:30:06 +0200 Subject: [PATCH 5/6] Update simpleImages.ref --- roottest/root/graf/simpleImages.ref | 1 - 1 file changed, 1 deletion(-) diff --git a/roottest/root/graf/simpleImages.ref b/roottest/root/graf/simpleImages.ref index f19c721ddb2c2..c303d4cc4b532 100644 --- a/roottest/root/graf/simpleImages.ref +++ b/roottest/root/graf/simpleImages.ref @@ -2,5 +2,4 @@ Info in : jpg file f.jpeg has been created Info in : png file f.png has been created Info in : gif file f.gif has been created Info in : bmp file f.bmp has been created -Info in : tiff file f.tiff has been created (int) 0 From da25bb615e1d8eb86594aba05ae9c0ada659a416 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Tue, 31 Mar 2026 10:30:34 +0200 Subject: [PATCH 6/6] Update simpleImages.C --- roottest/root/graf/simpleImages.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roottest/root/graf/simpleImages.C b/roottest/root/graf/simpleImages.C index 0dd6900ee454f..f5762de05ba58 100644 --- a/roottest/root/graf/simpleImages.C +++ b/roottest/root/graf/simpleImages.C @@ -15,7 +15,7 @@ int simpleImages() TH1D h("myHisto", "The Title;the X;the Y", 64, -4, 4); h.FillRandom("gaus"); h.Draw(); - std::vector fileNames{"f.jpeg", "f.png", "f.gif", "f.bmp"}; // TIFF not always there: only ON if asimage_tiff and libtiff installed in system (it's not a builtin unlike jpeg, png, gif) + std::vector fileNames{"f.jpeg", "f.png", "f.gif", "f.bmp"}; // TIFF not always there: only ON if asimage_tiff and libtiff installed in system (it's not a builtin like jpeg, png, gif) ImagesRAII iraii(fileNames); for (auto &&fileName : fileNames) { c.SaveAs(fileName.c_str());