diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-01-17 18:37:59 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-01-17 18:37:59 +1000 |
| commit | 07f940e7999e6dfb3d04c2cd45f4c29c6e385f85 (patch) | |
| tree | 117996c991be69000859bb053c0e332d3c312a06 /src/gdisp/image_native.c | |
| parent | 99b4fba5125f6b8e181c4657d394303767a90935 (diff) | |
| parent | 199b89e4dc0b781310f40d0e5743bf355077f9ab (diff) | |
| download | uGFX-07f940e7999e6dfb3d04c2cd45f4c29c6e385f85.tar.gz uGFX-07f940e7999e6dfb3d04c2cd45f4c29c6e385f85.tar.bz2 uGFX-07f940e7999e6dfb3d04c2cd45f4c29c6e385f85.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'src/gdisp/image_native.c')
| -rw-r--r-- | src/gdisp/image_native.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gdisp/image_native.c b/src/gdisp/image_native.c index 72ae8b61..7f249ae8 100644 --- a/src/gdisp/image_native.c +++ b/src/gdisp/image_native.c @@ -107,7 +107,7 @@ gdispImageError gdispImageGDraw_NATIVE(GDisplay *g, gdispImage *img, coord_t x, } /* For this image decoder we cheat and just seek straight to the region we want to display */ - pos = FRAME0POS + (img->width * sy + cx) * sizeof(pixel_t); + pos = FRAME0POS + (img->width * sy + sx) * sizeof(pixel_t); /* Cycle through the lines */ for(;cy;cy--, y++) { @@ -119,7 +119,7 @@ gdispImageError gdispImageGDraw_NATIVE(GDisplay *g, gdispImage *img, coord_t x, // Read the data len = img->io.fns->read(&img->io, img->priv->buf, - mx > BLIT_BUFFER_SIZE ? (BLIT_BUFFER_SIZE*sizeof(pixel_t)) : (mx * sizeof(pixel_t))) + mcx > BLIT_BUFFER_SIZE ? (BLIT_BUFFER_SIZE*sizeof(pixel_t)) : (mcx * sizeof(pixel_t))) / sizeof(pixel_t); if (!len) return GDISP_IMAGE_ERR_BADDATA; |