From 8472acc26c728b9a01fe3993280a2e0b7264ee1e Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 14 Aug 2013 13:30:17 +0200 Subject: [PATCH] Removed checks for manuals and screenshots in JPEG and BMP format Support for loading JPEG and BMP images was removed a long time ago, so there is no point in looking for files in those formats. --- src/linkapp.cpp | 3 +-- src/menu.cpp | 6 ------ src/selector.cpp | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/linkapp.cpp b/src/linkapp.cpp index 78a5644..76eccab 100644 --- a/src/linkapp.cpp +++ b/src/linkapp.cpp @@ -429,8 +429,7 @@ void LinkApp::showManual() { return; // Png manuals - string ext8 = manual.substr(manual.size()-8,8); - if (ext8==".man.png" || ext8==".man.bmp" || ext8==".man.jpg" || manual.substr(manual.size()-9,9)==".man.jpeg") { + if (manual.substr(manual.size()-8,8)==".man.png") { #ifdef ENABLE_CPUFREQ //Raise the clock to speed-up the loading of the manual gmenu2x->setSafeMaxClock(); diff --git a/src/menu.cpp b/src/menu.cpp index efd7dd6..8feadc9 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -456,12 +456,6 @@ bool Menu::addLink(string path, string file, string section) { string manual = ""; if (fileExists(exename+".man.png")) { manual = exename+".man.png"; - } else if (fileExists(exename+".man.jpg")) { - manual = exename+".man.jpg"; - } else if (fileExists(exename+".man.jpeg")) { - manual = exename+".man.jpeg"; - } else if (fileExists(exename+".man.bmp")) { - manual = exename+".man.bmp"; } else if (fileExists(exename+".man.txt")) { manual = exename+".man.txt"; } else { diff --git a/src/selector.cpp b/src/selector.cpp index c289338..3ea3295 100644 --- a/src/selector.cpp +++ b/src/selector.cpp @@ -279,8 +279,6 @@ void Selector::prepare(FileLister *fl, vector *screens, vector * if (fileExists(screendir+noext+".png")) screens->at(i) = screendir+noext+".png"; - else if (fileExists(screendir+noext+".jpg")) - screens->at(i) = screendir+noext+".jpg"; else screens->at(i) = ""; }