aboutsummaryrefslogtreecommitdiffstats
path: root/src/gdisp/gdisp_image_png.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gdisp/gdisp_image_png.c')
-rw-r--r--src/gdisp/gdisp_image_png.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gdisp/gdisp_image_png.c b/src/gdisp/gdisp_image_png.c
index 8032ffe6..9cb34cd5 100644
--- a/src/gdisp/gdisp_image_png.c
+++ b/src/gdisp/gdisp_image_png.c
@@ -65,10 +65,10 @@ typedef struct PNG_input {
// Handle the display output and windowing
typedef struct PNG_output {
GDisplay *g;
- coord_t x, y;
- coord_t cx, cy;
- coord_t sx, sy;
- coord_t ix, iy;
+ gCoord x, y;
+ gCoord cx, cy;
+ gCoord sx, sy;
+ gCoord ix, iy;
unsigned cnt;
pixel_t buf[GDISP_IMAGE_PNG_BLIT_BUFFER_SIZE];
} PNG_output;
@@ -198,7 +198,7 @@ static uint8_t PNG_iGetByte(PNG_decode *d) {
*---------------------------------------------------------------*/
// Initialize the display output window
-static void PNG_oInit(PNG_output *o, GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t sx, coord_t sy) {
+static void PNG_oInit(PNG_output *o, GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy) {
o->g = g;
o->x = x;
o->y = y;
@@ -222,7 +222,7 @@ static void PNG_oFlush(PNG_output *o) {
}
// Start a new image line
-static gBool PNG_oStartY(PNG_output *o, coord_t y) {
+static gBool PNG_oStartY(PNG_output *o, gCoord y) {
if (y < o->sy || y >= o->sy+o->cy)
return gFalse;
o->ix = 0;
@@ -233,7 +233,7 @@ static gBool PNG_oStartY(PNG_output *o, coord_t y) {
// Feed a pixel color to the display buffer
static void PNG_oColor(PNG_output *o, color_t c) {
// Is it in the window
- if (o->ix+(coord_t)o->cnt < o->sx || o->ix+(coord_t)o->cnt >= o->sx+o->cx) {
+ if (o->ix+(gCoord)o->cnt < o->sx || o->ix+(gCoord)o->cnt >= o->sx+o->cx) {
// No - just skip the pixel
PNG_oFlush(o);
o->ix++;
@@ -1497,7 +1497,7 @@ exit_nonmem:
return GDISP_IMAGE_ERR_NOMEMORY;
}
-gdispImageError gdispGImageDraw_PNG(GDisplay *g, gdispImage *img, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t sx, coord_t sy) {
+gdispImageError gdispGImageDraw_PNG(GDisplay *g, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy) {
PNG_info *pinfo;
PNG_decode *d;