From 785047b0aa1d43d5f33ae69d7e0ed708df6db0bd Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Wed, 10 Apr 2019 17:33:15 +0200 Subject: Introduce type gImage to replace v2.x gdispImage --- demos/modules/gdisp/images/main.c | 2 +- demos/modules/gdisp/images_animated/main.c | 2 +- demos/modules/gdisp/images_palettes/main.c | 2 +- demos/modules/gwin/widgets/main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'demos/modules') diff --git a/demos/modules/gdisp/images/main.c b/demos/modules/gdisp/images/main.c index a394bd2e..cdedc52d 100644 --- a/demos/modules/gdisp/images/main.c +++ b/demos/modules/gdisp/images/main.c @@ -36,7 +36,7 @@ * The ROMFS uses the file "romfs_files.h" to describe the set of files in the ROMFS. */ -static gdispImage myImage; +static gImage myImage; int main(void) { gCoord swidth, sheight; diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c index 0503bcd3..b20c7174 100644 --- a/demos/modules/gdisp/images_animated/main.c +++ b/demos/modules/gdisp/images_animated/main.c @@ -39,7 +39,7 @@ #define USE_IMAGE_CACHE GFXOFF // Only if you want to get performance at the expense of RAM #define MY_BG_COLOR RGB2COLOR(220, 220, 255) // Pale blue so we can see the transparent parts -static gdispImage myImage; +static gImage myImage; #define SHOW_ERROR(color) gdispFillArea(errx, erry, errcx, errcy, color) diff --git a/demos/modules/gdisp/images_palettes/main.c b/demos/modules/gdisp/images_palettes/main.c index b9327e52..5ea78107 100644 --- a/demos/modules/gdisp/images_palettes/main.c +++ b/demos/modules/gdisp/images_palettes/main.c @@ -40,7 +40,7 @@ #include "gfx.h" -static gdispImage _imgHome; +static gImage _imgHome; int main(void) { diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index 52ffdc91..a4473596 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -97,7 +97,7 @@ static GHandle ghRadioBlack, ghRadioWhite, ghRadioYellow; static GHandle ghList1, ghList2, ghList3, ghList4; static GHandle ghImage1; static GHandle ghProgressbar1; -static gdispImage imgYesNo; +static gImage imgYesNo; /* Some useful macros */ #define ScrWidth gdispGetWidth() -- cgit v1.2.3