From f77090070ca13476759c7abfe5484383f69b5f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 22 Aug 2023 15:31:10 +0800 Subject: [PATCH] Image: code cleanup; no functional change --- src/logo/image/image.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/logo/image/image.c b/src/logo/image/image.c index 2c31b8acc..9277ee3a5 100644 --- a/src/logo/image/image.c +++ b/src/logo/image/image.c @@ -3,6 +3,7 @@ #include "common/printing.h" #include +#include #ifdef __APPLE__ #include @@ -184,12 +185,6 @@ static inline bool checkAllocationResult(void* data, size_t length) return true; } -static inline uint32_t simpleCeil(double value) -{ - uint32_t result = (uint32_t) value; - return value == (double) result ? result : result + 1; -} - static void writeCacheStrbuf(FFLogoRequestData* requestData, const FFstrbuf* value, const char* cacheFileName) { uint32_t cacheDirLength = requestData->cacheDir.length; @@ -463,8 +458,8 @@ FFLogoImageResult ffLogoPrintImageImpl(FFLogoRequestData* requestData, const FFI else if(requestData->logoPixelHeight == 0) requestData->logoPixelHeight = (uint32_t) ((double) imageData.image->rows / (double) imageData.image->columns * requestData->logoPixelWidth); - requestData->logoCharacterWidth = simpleCeil((double) requestData->logoPixelWidth / requestData->characterPixelWidth); - requestData->logoCharacterHeight = simpleCeil((double) requestData->logoPixelHeight / requestData->characterPixelHeight); + requestData->logoCharacterWidth = (uint32_t) ceil((double) requestData->logoPixelWidth / requestData->characterPixelWidth); + requestData->logoCharacterHeight = (uint32_t) ceil((double) requestData->logoPixelHeight / requestData->characterPixelHeight); if(requestData->logoPixelWidth == 0 || requestData->logoPixelHeight == 0 || requestData->logoCharacterWidth == 0 || requestData->logoCharacterHeight == 0) { @@ -608,8 +603,7 @@ static bool printCachedPixel(FFLogoRequestData* requestData) instance.state.logoHeight = requestData->logoCharacterHeight + instance.config.logo.paddingTop; //Go to upper left corner - fputs("\033[9999999D", stdout); - printf("\033[%uA", instance.state.logoHeight); + printf("\033[9999999D\033[%uA", instance.state.logoHeight); return true; } @@ -674,8 +668,8 @@ static bool printImageIfExistsSlowPath(FFLogoType type, bool printError) return false; } - requestData.logoPixelWidth = simpleCeil((double) instance.config.logo.width * requestData.characterPixelWidth); - requestData.logoPixelHeight = simpleCeil((double) instance.config.logo.height * requestData.characterPixelHeight); + requestData.logoPixelWidth = (uint32_t) ceil((double) instance.config.logo.width * requestData.characterPixelWidth); + requestData.logoPixelHeight = (uint32_t) ceil((double) instance.config.logo.height * requestData.characterPixelHeight); ffStrbufInit(&requestData.cacheDir); ffStrbufAppend(&requestData.cacheDir, &instance.state.platform.cacheDir); @@ -692,11 +686,7 @@ static bool printImageIfExistsSlowPath(FFLogoType type, bool printError) } ffStrbufRecalculateLength(&requestData.cacheDir); ffStrbufEnsureEndsWithC(&requestData.cacheDir, '/'); - - ffStrbufAppendF(&requestData.cacheDir, "%u", requestData.logoPixelWidth); - ffStrbufAppendC(&requestData.cacheDir, '*'); - ffStrbufAppendF(&requestData.cacheDir, "%u", requestData.logoPixelHeight); - ffStrbufAppendC(&requestData.cacheDir, '/'); + ffStrbufAppendF(&requestData.cacheDir, "%u*%u/", requestData.logoPixelWidth, requestData.logoPixelHeight); if(!instance.config.logo.recache && printCached(&requestData)) {