Some more standard comformance

This commit is contained in:
Linus Dierheimer
2022-09-23 11:51:16 +02:00
parent 0dda4efa8d
commit 98c94b01e5
7 changed files with 41 additions and 38 deletions
+4 -1
View File
@@ -208,7 +208,10 @@ void ffFontInitWithSpace(FFfont* font, const char* rawName)
{
const char* pspace = strrchr(rawName, ' ');
if(pspace == NULL)
return ffFontInitCopy(font, rawName);
{
ffFontInitCopy(font, rawName);
return;
}
fontInit(font);
@@ -34,7 +34,7 @@ static void parseDRM(FFDisplayServerResult* result)
resolution->height = 0;
resolution->refreshRate = 0;
int scanned = fscanf(modeFile, "%ix%i", &resolution->width, &resolution->height);
int scanned = fscanf(modeFile, "%ux%u", &resolution->width, &resolution->height);
if(scanned < 2 || resolution->width == 0 || resolution->height == 0)
--result->resolutions.length;
+5 -5
View File
@@ -17,13 +17,13 @@
typedef struct PCIData
{
struct pci_access* access;
FF_LIBRARY_SYMBOL(pci_fill_info);
FF_LIBRARY_SYMBOL(pci_read_byte);
FF_LIBRARY_SYMBOL(pci_lookup_name);
FF_LIBRARY_SYMBOL(pci_get_param);
FF_LIBRARY_SYMBOL(pci_fill_info)
FF_LIBRARY_SYMBOL(pci_read_byte)
FF_LIBRARY_SYMBOL(pci_lookup_name)
FF_LIBRARY_SYMBOL(pci_get_param)
#if PCI_LIB_VERSION >= 0x030800
FF_LIBRARY_SYMBOL(pci_get_string_property);
FF_LIBRARY_SYMBOL(pci_get_string_property)
#endif
} PCIData;
+1 -1
View File
@@ -5,7 +5,7 @@
#include <magick/MagickCore.h>
static FF_LIBRARY_SYMBOL(ResizeImage);
static FF_LIBRARY_SYMBOL(ResizeImage)
static void* logoResize(const void* image, size_t width, size_t height, void* exceptionInfo)
{
+1 -1
View File
@@ -5,7 +5,7 @@
#include <MagickCore/MagickCore.h>
static FF_LIBRARY_SYMBOL(ResizeImage);
static FF_LIBRARY_SYMBOL(ResizeImage)
static void* logoResize(const void* image, size_t width, size_t height, void* exceptionInfo)
{
+3 -3
View File
@@ -18,9 +18,9 @@
typedef struct OpenCLData
{
FF_LIBRARY_SYMBOL(clGetPlatformIDs);
FF_LIBRARY_SYMBOL(clGetDeviceIDs);
FF_LIBRARY_SYMBOL(clGetDeviceInfo);
FF_LIBRARY_SYMBOL(clGetPlatformIDs)
FF_LIBRARY_SYMBOL(clGetDeviceIDs)
FF_LIBRARY_SYMBOL(clGetDeviceInfo)
} OpenCLData;
static const char* openCLHandelData(FFinstance* instance, OpenCLData* data)
+26 -26
View File
@@ -24,7 +24,7 @@
typedef struct GLData
{
FF_LIBRARY_SYMBOL(glGetString);
FF_LIBRARY_SYMBOL(glGetString)
} GLData;
static const char* glHandlePrint(FFinstance* instance, const GLData* data)
@@ -64,17 +64,17 @@ typedef struct EGLData
{
GLData glData;
FF_LIBRARY_SYMBOL(eglGetProcAddress);
FF_LIBRARY_SYMBOL(eglGetDisplay);
FF_LIBRARY_SYMBOL(eglInitialize);
FF_LIBRARY_SYMBOL(eglBindAPI);
FF_LIBRARY_SYMBOL(eglGetConfigs);
FF_LIBRARY_SYMBOL(eglCreatePbufferSurface);
FF_LIBRARY_SYMBOL(eglCreateContext);
FF_LIBRARY_SYMBOL(eglMakeCurrent);
FF_LIBRARY_SYMBOL(eglDestroyContext);
FF_LIBRARY_SYMBOL(eglDestroySurface);
FF_LIBRARY_SYMBOL(eglTerminate);
FF_LIBRARY_SYMBOL(eglGetProcAddress)
FF_LIBRARY_SYMBOL(eglGetDisplay)
FF_LIBRARY_SYMBOL(eglInitialize)
FF_LIBRARY_SYMBOL(eglBindAPI)
FF_LIBRARY_SYMBOL(eglGetConfigs)
FF_LIBRARY_SYMBOL(eglCreatePbufferSurface)
FF_LIBRARY_SYMBOL(eglCreateContext)
FF_LIBRARY_SYMBOL(eglMakeCurrent)
FF_LIBRARY_SYMBOL(eglDestroyContext)
FF_LIBRARY_SYMBOL(eglDestroySurface)
FF_LIBRARY_SYMBOL(eglTerminate)
EGLDisplay display;
EGLConfig config;
@@ -175,17 +175,17 @@ typedef struct GLXData
{
GLData glData;
FF_LIBRARY_SYMBOL(glXGetProcAddress);
FF_LIBRARY_SYMBOL(XOpenDisplay);
FF_LIBRARY_SYMBOL(glXChooseVisual);
FF_LIBRARY_SYMBOL(glXGetProcAddress)
FF_LIBRARY_SYMBOL(XOpenDisplay)
FF_LIBRARY_SYMBOL(glXChooseVisual)
FF_LIBRARY_SYMBOL(XCreatePixmap);
FF_LIBRARY_SYMBOL(glXCreateGLXPixmap);
FF_LIBRARY_SYMBOL(glXCreateContext);
FF_LIBRARY_SYMBOL(glXMakeCurrent);
FF_LIBRARY_SYMBOL(glXDestroyContext);
FF_LIBRARY_SYMBOL(glXDestroyGLXPixmap);
FF_LIBRARY_SYMBOL(XFreePixmap);
FF_LIBRARY_SYMBOL(XCloseDisplay);
FF_LIBRARY_SYMBOL(glXCreateGLXPixmap)
FF_LIBRARY_SYMBOL(glXCreateContext)
FF_LIBRARY_SYMBOL(glXMakeCurrent)
FF_LIBRARY_SYMBOL(glXDestroyContext)
FF_LIBRARY_SYMBOL(glXDestroyGLXPixmap)
FF_LIBRARY_SYMBOL(XFreePixmap)
FF_LIBRARY_SYMBOL(XCloseDisplay)
Display* display;
XVisualInfo* visualInfo;
@@ -290,10 +290,10 @@ typedef struct OSMesaData
{
GLData glData;
FF_LIBRARY_SYMBOL(OSMesaGetProcAddress);
FF_LIBRARY_SYMBOL(OSMesaCreateContext);
FF_LIBRARY_SYMBOL(OSMesaMakeCurrent);
FF_LIBRARY_SYMBOL(OSMesaDestroyContext);
FF_LIBRARY_SYMBOL(OSMesaGetProcAddress)
FF_LIBRARY_SYMBOL(OSMesaCreateContext)
FF_LIBRARY_SYMBOL(OSMesaMakeCurrent)
FF_LIBRARY_SYMBOL(OSMesaDestroyContext)
OSMesaContext context;
} OSMesaData;