diff --git a/src/include/ImageBMP.cpp b/src/include/ImageBMP.cpp index 3dda2358..6a3d00cd 100644 --- a/src/include/ImageBMP.cpp +++ b/src/include/ImageBMP.cpp @@ -485,7 +485,7 @@ bool Image::drawBmpFromWebAtPosition(const char *url, const Position &position, readBmpHeader(buf, &bmpHeader); uint16_t posX, posY; - getPointsForPosition(position, bmpHeader.width, bmpHeader.height, E_INK_WIDTH, E_INK_HEIGHT, &posX, &posY); + getPointsForPosition(position, bmpHeader.width, bmpHeader.height, width(), height(), &posX, &posY); ret = drawBitmapFromBuffer(buf, posX, posY, dither, invert); free(buf); @@ -529,7 +529,7 @@ bool Image::drawBmpFromSdAtPosition(const char *fileName, const Position &positi memset(ditherBuffer, 0, sizeof ditherBuffer); uint16_t posX, posY; - getPointsForPosition(position, bmpHeader.width, bmpHeader.height, E_INK_WIDTH, E_INK_HEIGHT, &posX, &posY); + getPointsForPosition(position, bmpHeader.width, bmpHeader.height, width(), height(), &posX, &posY); for (int i = 0; i < h; ++i) { diff --git a/src/include/ImageJPEG.cpp b/src/include/ImageJPEG.cpp index 169e6a26..7f2c1570 100644 --- a/src/include/ImageJPEG.cpp +++ b/src/include/ImageJPEG.cpp @@ -165,7 +165,7 @@ bool Image::drawJpegFromWebAtPosition(const char *url, const Position &position, } uint16_t posX, posY; - getPointsForPosition(position, w, h, E_INK_WIDTH, E_INK_HEIGHT, &posX, &posY); + getPointsForPosition(position, w, h, width(), height(), &posX, &posY); ret = drawJpegFromBuffer(buff, defaultLen, posX, posY, dither, invert); free(buff); @@ -236,7 +236,7 @@ bool Image::drawJpegFromSdAtPosition(const char *fileName, const Position &posit return 0; } - getPointsForPosition(position, w, h, E_INK_WIDTH, E_INK_HEIGHT, &posX, &posY); + getPointsForPosition(position, w, h, width(), height(), &posX, &posY); if (TJpgDec.drawJpg(posX, posY, buff, total, dither, invert) == 0) ret = 1; diff --git a/src/include/ImagePNG.cpp b/src/include/ImagePNG.cpp index 8f6c5d0f..20c9012d 100644 --- a/src/include/ImagePNG.cpp +++ b/src/include/ImagePNG.cpp @@ -50,8 +50,8 @@ void pngle_on_draw(pngle_t *pngle, uint32_t x, uint32_t y, uint32_t w, uint32_t { if (_pngPosition != Image::_npos) { - _imagePtrPng->getPointsForPosition(_pngPosition, pngle_get_width(pngle), pngle_get_height(pngle), E_INK_WIDTH, - E_INK_HEIGHT, &_pngX, &_pngY); + _imagePtrPng->getPointsForPosition(_pngPosition, pngle_get_width(pngle), pngle_get_height(pngle), + _imagePtrPng->width(), _imagePtrPng->height(), &_pngX, &_pngY); lastY = _pngY; _pngPosition = Image::_npos; }