Skip to content

Fix some lint issues in nuttx #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghaerr merged 1 commit into from
Aug 22, 2026
Merged

Fix some lint issues in nuttx #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/drivers/fb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ select_fb_subdriver(PSD psd)
extern PSUBDRIVER fblinear24[4];
extern PSUBDRIVER fblinear32bgra[4];
extern PSUBDRIVER fblinear32rgba[4];
#if ELKS
extern PSUBDRIVER memplan4[4];
#endif

#if ELKS
pdriver = memplan4;
Expand Down
44 changes: 22 additions & 22 deletions src/drivers/rasterops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,35 +307,35 @@ GdRasterOp(PMWIMAGEHDR pixd, MWCOORD dx, MWCOORD dy, MWCOORD dw, MWCOORD dh, int
/* translate op to pix library format*/
op = raster_ops[op];

if (op == PIX_DST) /* no-op */
return;
if (op == PIX_DST) /* no-op */
return;

/* check padding to 32-bit boundary*/
assert((pixd->pitch & 3) == 0);

/* Check if operation is only on dest */
dd = pixGetDepth(pixd);
if (op == PIX_CLR || op == PIX_SET || op == PIX_NOT(PIX_DST)) {
rasteropUniLow(pixGetData(pixd),
pixGetWidth(pixd), pixGetHeight(pixd), dd,
pixGetWpl(pixd),
dx, dy, dw, dh,
op);
return;
}
dd = pixGetDepth(pixd);
if (op == PIX_CLR || op == PIX_SET || op == PIX_NOT(PIX_DST)) {
rasteropUniLow(pixGetData(pixd),
pixGetWidth(pixd), pixGetHeight(pixd), dd,
pixGetWpl(pixd),
dx, dy, dw, dh,
op);
return;
}

/* Check depth of src and dest; these must agree */
assert(dd == pixGetDepth(pixs));

rasteropLow(pixGetData(pixd),
pixGetWidth(pixd), pixGetHeight(pixd), dd,
pixGetWpl(pixd),
dx, dy, dw, dh,
op,
pixGetData(pixs),
pixGetWidth(pixs), pixGetHeight(pixs),
pixGetWpl(pixs),
sx, sy);
assert(dd == pixGetDepth(pixs));

rasteropLow(pixGetData(pixd),
pixGetWidth(pixd), pixGetHeight(pixd), dd,
pixGetWpl(pixd),
dx, dy, dw, dh,
op,
pixGetData(pixs),
pixGetWidth(pixs), pixGetHeight(pixs),
pixGetWpl(pixs),
sx, sy);
}

/*
Expand Down
6 changes: 3 additions & 3 deletions src/include/windef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ typedef LPCSTR LPCTSTR;
#define __TEXT(quote) quote
#define TEXT(quote) __TEXT(quote)

typedef int (FAR *FARPROC)();
typedef int (NEAR *NEARPROC)();
typedef int (*PROC)();
typedef int (FAR *FARPROC)(void);
typedef int (NEAR *NEARPROC)(void);
typedef int (*PROC)(void);

#define MAKEWORD(a, b) ((WORD)(((BYTE)(a)) | ((WORD)((BYTE)(b))) << 8))
#define MAKELONG(a, b) ((LONG)(((WORD)(a)) | ((DWORD)((WORD)(b))) << 16))
Expand Down