fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Revert "Image: tidy"

Browse Source 
This reverts commit d21ce9b10f.
This commit is contained in:
李通洲
2022-12-20 22:44:45 +08:00
parent 8f3900a9df
commit 985fc991e8
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logo/image/image.c
+9 -20
View File
@@ -226,10 +226,7 @@ static bool printImageKitty(FFinstance* instance, FFLogoRequestData* requestData
#include <chafa.h>
static bool printImageChafa(FFinstance* instance, FFLogoRequestData* requestData, const ImageData* imageData)
{
FF_LIBRARY_LOAD(glib, &instance->config.libChafa, false, "libglib-2.0-0" FF_LIBRARY_EXTENSION, 1)
FF_LIBRARY_LOAD_SYMBOL(glib, g_string_free, false)
FF_LIBRARY_LOAD(chafa, &instance->config.libChafa, false, "libchafa-0" FF_LIBRARY_EXTENSION, 1)
FF_LIBRARY_LOAD(chafa, &instance->config.libChafa, false, "libchafa" FF_LIBRARY_EXTENSION, 1)
FF_LIBRARY_LOAD_SYMBOL(chafa, chafa_symbol_map_new, false)
FF_LIBRARY_LOAD_SYMBOL(chafa, chafa_symbol_map_add_by_tags, false)
FF_LIBRARY_LOAD_SYMBOL(chafa, chafa_canvas_config_new, false)
@@ -241,6 +238,7 @@ static bool printImageChafa(FFinstance* instance, FFLogoRequestData* requestData
FF_LIBRARY_LOAD_SYMBOL(chafa, chafa_canvas_unref, false)
FF_LIBRARY_LOAD_SYMBOL(chafa, chafa_canvas_config_unref, false)
FF_LIBRARY_LOAD_SYMBOL(chafa, chafa_symbol_map_unref, false)
FF_LIBRARY_LOAD_SYMBOL(chafa, g_string_free, false)
imageData->ffCopyMagickString(imageData->imageInfo->magick, "RGBA", 5);
size_t length;
@@ -273,8 +271,8 @@ static bool printImageChafa(FFinstance* instance, FFLogoRequestData* requestData
result.allocated = (uint32_t) str->allocated_len;
result.length = (uint32_t) str->len;
result.chars = str->str;
puts(result.chars);
// ffLogoPrintChars(instance, result.chars, false);
ffLogoPrintChars(instance, result.chars, false);
writeCacheStrbuf(requestData, &result, FF_CACHE_FILE_CHAFA);
ffg_string_free(str, TRUE);
@@ -282,7 +280,6 @@ static bool printImageChafa(FFinstance* instance, FFLogoRequestData* requestData
ffchafa_canvas_config_unref(canvasConfig);
ffchafa_symbol_map_unref(symbolMap);
dlclose(chafa);
dlclose(glib);
return true;
}
@@ -534,20 +531,12 @@ static bool getCharacterPixelDimensions(FFLogoRequestData* requestData)
#else
setmode (fileno (stdin), O_BINARY);
setmode (fileno (stdout), O_BINARY);
CONSOLE_FONT_INFO cfi;
if(GetCurrentConsoleFont(GetStdHandle(STD_OUTPUT_HANDLE), FALSE, &cfi) != FALSE) // Only works for ConHost
{
requestData->characterPixelWidth = cfi.dwFontSize.X;
requestData->characterPixelHeight = cfi.dwFontSize.Y;
}
else
{
requestData->characterPixelWidth = 8;
requestData->characterPixelHeight = 16;
}
if(GetCurrentConsoleFont(GetStdHandle(STD_OUTPUT_HANDLE), FALSE, &cfi) == FALSE) // Only works for ConHost
return false;
requestData->characterPixelWidth = cfi.dwFontSize.X;
requestData->characterPixelHeight = cfi.dwFontSize.Y;
#endif