From 51eeb20b6aaa3e734ea8da55ab7fecb4e88b76a7 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Sat, 25 Jan 2025 17:48:24 +0100 Subject: [PATCH] clang-format llvm (#49) --- .clang-format | 6 + bmp/bitmap.c | 3281 +++++---- bmp/bitmap.h | 397 +- bmp/common.h | 179 +- bmp/config.h | 4 +- bmp/lib/schrift.c | 758 +-- bmp/lib/schrift.h | 60 +- bmp/region.c | 776 ++- bmp/region.h | 25 +- bmp/text.c | 303 +- bmp/text.h | 15 +- build_rockchip.sh | 2 +- compat.c | 29 +- libpng/lodepng.c | 13046 +++++++++++++++++++----------------- libpng/lodepng.h | 1788 ++--- msposd.c | 1505 ++--- osd.c | 4123 ++++++------ osd/font/font.c | 402 +- osd/font/font.h | 20 +- osd/lz4/lz4.c | 4731 +++++++------ osd/lz4/lz4.h | 844 +-- osd/msp/msp.c | 481 +- osd/msp/msp.h | 78 +- osd/msp/msp_displayport.c | 504 +- osd/msp/msp_displayport.h | 38 +- osd/msp/vtxmenu.c | 378 +- osd/msp/vtxmenu.h | 2 +- osd/net/data_protocol.h | 13 +- osd/net/network.c | 100 +- osd/net/serial.c | 236 +- osd/net/serial.h | 4 +- osd/util/Render_gs.c | 1016 +-- osd/util/debug.h | 2 +- osd/util/display_info.h | 14 +- osd/util/fs_util.c | 67 +- osd/util/fs_util.h | 2 +- osd/util/ini_parser.c | 660 +- osd/util/ini_parser.h | 52 +- osd/util/interface.c | 261 +- osd/util/interface.h | 8 +- osd/util/settings.c | 170 +- osd/util/settings.h | 2 +- osd/util/time_util.h | 9 +- 43 files changed, 18966 insertions(+), 17425 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..7ddcee3 --- /dev/null +++ b/.clang-format @@ -0,0 +1,6 @@ +BasedOnStyle: LLVM +UseTab: Always +IndentWidth: 4 +TabWidth: 4 +AlignAfterOpenBracket: DontAlign +ColumnLimit: 100 diff --git a/bmp/bitmap.c b/bmp/bitmap.c index b37f387..92e6029 100644 --- a/bmp/bitmap.c +++ b/bmp/bitmap.c @@ -1,1837 +1,1786 @@ #include "bitmap.h" OSD_COMP_INFO s_OSDCompInfo[OSD_COLOR_FMT_BUTT] = { - {0, 4, 4, 4}, /*RGB444*/ - {4, 4, 4, 4}, /*ARGB4444*/ - {0, 5, 5, 5}, /*RGB555*/ - {0, 5, 6, 5}, /*RGB565*/ - {1, 5, 5, 5}, /*ARGB1555*/ - {0, 0, 0, 0}, /*RESERVED*/ - {0, 8, 8, 8}, /*RGB888*/ - {8, 8, 8, 8} /*ARGB8888*/ + {0, 4, 4, 4}, /*RGB444*/ + {4, 4, 4, 4}, /*ARGB4444*/ + {0, 5, 5, 5}, /*RGB555*/ + {0, 5, 6, 5}, /*RGB565*/ + {1, 5, 5, 5}, /*ARGB1555*/ + {0, 0, 0, 0}, /*RESERVED*/ + {0, 8, 8, 8}, /*RGB888*/ + {8, 8, 8, 8} /*ARGB8888*/ }; - -static inline unsigned short convert_2bpp(unsigned char r, unsigned char g, unsigned char b, OSD_COMP_INFO compinfo) -{ - unsigned short pixel = 0; - unsigned int tmp = 15; - - unsigned char r1 = r >> (8 - compinfo.rlen); - unsigned char g1 = g >> (8 - compinfo.glen); - unsigned char b1 = b >> (8 - compinfo.blen); - while (compinfo.alen) - { - pixel |= (1 << tmp); - tmp--; - compinfo.alen--; - } - - pixel |= (r1 | (g1 << compinfo.blen) | (b1 << (compinfo.blen + compinfo.glen))); - return pixel; +static inline unsigned short convert_2bpp( + unsigned char r, unsigned char g, unsigned char b, OSD_COMP_INFO compinfo) { + unsigned short pixel = 0; + unsigned int tmp = 15; + + unsigned char r1 = r >> (8 - compinfo.rlen); + unsigned char g1 = g >> (8 - compinfo.glen); + unsigned char b1 = b >> (8 - compinfo.blen); + while (compinfo.alen) { + pixel |= (1 << tmp); + tmp--; + compinfo.alen--; + } + + pixel |= (r1 | (g1 << compinfo.blen) | (b1 << (compinfo.blen + compinfo.glen))); + return pixel; } -int parse_bitmap(const char *filename, OSD_BITMAPFILEHEADER *pBmpFileHeader, OSD_BITMAPINFO *pBmpInfo) -{ - FILE *pFile; - unsigned short bfType; - - if (!filename) - { - fprintf(stderr, "load_bitmap: filename=NULL\n"); - return -1; - } - - if ((pFile = fopen(filename, "rb")) == NULL) - { - fprintf(stderr, "Open file faild:%s!\n", filename); - return -1; - } - - if (fread(&bfType, 1, sizeof(bfType), pFile) != sizeof(bfType)) - { - fprintf(stderr, "fread file failed:%s!\n", filename); - fclose(pFile); - return -1; - } - - if (bfType != 0x4d42) - { - fprintf(stderr, "not bitmap file\n"); - fclose(pFile); - return -1; - } - - if (fread(pBmpFileHeader, 1, sizeof(OSD_BITMAPFILEHEADER), pFile) != sizeof(OSD_BITMAPFILEHEADER)) - { - fprintf(stderr, "fread OSD_BITMAPFILEHEADER failed:%s!\n", filename); - fclose(pFile); - return -1; - } - - if (fread(pBmpInfo, 1, sizeof(OSD_BITMAPINFO), pFile) != sizeof(OSD_BITMAPINFO)) - { - fprintf(stderr, "fread OSD_BITMAPINFO failed:%s!\n", filename); - fclose(pFile); - return -1; - } - - if (pBmpInfo->bmiHeader.biBitCount / 8 < 2) - { - fprintf(stderr, "bitmap format not supported!\n"); - fclose(pFile); - return -1; - } - - if (pBmpInfo->bmiHeader.biCompression != 0 && pBmpInfo->bmiHeader.biCompression != 3) - { - fprintf(stderr, "not support compressed bitmap file!\n"); - fclose(pFile); - return -1; - } - - if (pBmpInfo->bmiHeader.biHeight < 0) - { - fprintf(stderr, "bmpInfo.bmiHeader.biHeight < 0\n"); - fclose(pFile); - return -1; - } - - fclose(pFile); - return 0; +int parse_bitmap( + const char *filename, OSD_BITMAPFILEHEADER *pBmpFileHeader, OSD_BITMAPINFO *pBmpInfo) { + FILE *pFile; + unsigned short bfType; + + if (!filename) { + fprintf(stderr, "load_bitmap: filename=NULL\n"); + return -1; + } + + if ((pFile = fopen(filename, "rb")) == NULL) { + fprintf(stderr, "Open file faild:%s!\n", filename); + return -1; + } + + if (fread(&bfType, 1, sizeof(bfType), pFile) != sizeof(bfType)) { + fprintf(stderr, "fread file failed:%s!\n", filename); + fclose(pFile); + return -1; + } + + if (bfType != 0x4d42) { + fprintf(stderr, "not bitmap file\n"); + fclose(pFile); + return -1; + } + + if (fread(pBmpFileHeader, 1, sizeof(OSD_BITMAPFILEHEADER), pFile) != + sizeof(OSD_BITMAPFILEHEADER)) { + fprintf(stderr, "fread OSD_BITMAPFILEHEADER failed:%s!\n", filename); + fclose(pFile); + return -1; + } + + if (fread(pBmpInfo, 1, sizeof(OSD_BITMAPINFO), pFile) != sizeof(OSD_BITMAPINFO)) { + fprintf(stderr, "fread OSD_BITMAPINFO failed:%s!\n", filename); + fclose(pFile); + return -1; + } + + if (pBmpInfo->bmiHeader.biBitCount / 8 < 2) { + fprintf(stderr, "bitmap format not supported!\n"); + fclose(pFile); + return -1; + } + + if (pBmpInfo->bmiHeader.biCompression != 0 && pBmpInfo->bmiHeader.biCompression != 3) { + fprintf(stderr, "not support compressed bitmap file!\n"); + fclose(pFile); + return -1; + } + + if (pBmpInfo->bmiHeader.biHeight < 0) { + fprintf(stderr, "bmpInfo.bmiHeader.biHeight < 0\n"); + fclose(pFile); + return -1; + } + + fclose(pFile); + return 0; } -int load_bitmap(const char *filename, OSD_LOGO_T *pVideoLogo) -{ - FILE *pFile; - - unsigned int w, h, stride; - unsigned short Bpp, dstBpp; - - OSD_BITMAPFILEHEADER bmpFileHeader; - OSD_BITMAPINFO bmpInfo; - - unsigned char *pOrigBMPBuf; - unsigned char *pRGBBuf; - - if (parse_bitmap(filename, &bmpFileHeader, &bmpInfo) < 0) - return -1; - - if (!(pFile = fopen(filename, "rb"))) - { - fprintf(stderr, "Open file faild:%s!\n", filename); - return -1; - } - - pVideoLogo->width = (unsigned short)bmpInfo.bmiHeader.biWidth; - pVideoLogo->height = (unsigned short)((bmpInfo.bmiHeader.biHeight > 0) ? bmpInfo.bmiHeader.biHeight : (-bmpInfo.bmiHeader.biHeight)); - w = pVideoLogo->width; - h = pVideoLogo->height; - - Bpp = bmpInfo.bmiHeader.biBitCount / 8; - stride = w * Bpp; - if (stride % 4) - stride = (stride & 0xfffc) + 4; - - /* RGB8888 or RGB1555 */ - pOrigBMPBuf = (unsigned char *)malloc(h * stride); - if (!pOrigBMPBuf) - { - fprintf(stderr, "not enough memory to malloc!\n"); - fclose(pFile); - return -1; - } - - pRGBBuf = pVideoLogo->pRGBBuffer; - - if (fseek(pFile, bmpFileHeader.bfOffBits, 0)) - { - fprintf(stderr, "fseek failed!\n"); - fclose(pFile); - free(pOrigBMPBuf); - pOrigBMPBuf = NULL; - return -1; - } - - if (fread(pOrigBMPBuf, 1, (unsigned int)(h * stride), pFile) != (unsigned int)(h * stride)) - { - fprintf(stderr, "fread (%d*%d)error!line:%d\n", h, stride, __LINE__); - perror("fread:"); - } - - if (Bpp > 2) - dstBpp = 4; - else - dstBpp = 2; - - if (pVideoLogo->stride == 0) - pVideoLogo->stride = pVideoLogo->width * dstBpp; - - for (unsigned short i = 0; i < h; i++) - { - for (unsigned short j = 0; j < w; j++) - { - memcpy(pRGBBuf + i * pVideoLogo->stride + j * dstBpp, pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp, Bpp); - - if (dstBpp == 4) - *(pRGBBuf + i * pVideoLogo->stride + j * dstBpp + 3) = 0x80; /*alpha*/ - } - } - - free(pOrigBMPBuf); - pOrigBMPBuf = NULL; - - fclose(pFile); - return 0; +int load_bitmap(const char *filename, OSD_LOGO_T *pVideoLogo) { + FILE *pFile; + + unsigned int w, h, stride; + unsigned short Bpp, dstBpp; + + OSD_BITMAPFILEHEADER bmpFileHeader; + OSD_BITMAPINFO bmpInfo; + + unsigned char *pOrigBMPBuf; + unsigned char *pRGBBuf; + + if (parse_bitmap(filename, &bmpFileHeader, &bmpInfo) < 0) + return -1; + + if (!(pFile = fopen(filename, "rb"))) { + fprintf(stderr, "Open file faild:%s!\n", filename); + return -1; + } + + pVideoLogo->width = (unsigned short)bmpInfo.bmiHeader.biWidth; + pVideoLogo->height = + (unsigned short)((bmpInfo.bmiHeader.biHeight > 0) ? bmpInfo.bmiHeader.biHeight + : (-bmpInfo.bmiHeader.biHeight)); + w = pVideoLogo->width; + h = pVideoLogo->height; + + Bpp = bmpInfo.bmiHeader.biBitCount / 8; + stride = w * Bpp; + if (stride % 4) + stride = (stride & 0xfffc) + 4; + + /* RGB8888 or RGB1555 */ + pOrigBMPBuf = (unsigned char *)malloc(h * stride); + if (!pOrigBMPBuf) { + fprintf(stderr, "not enough memory to malloc!\n"); + fclose(pFile); + return -1; + } + + pRGBBuf = pVideoLogo->pRGBBuffer; + + if (fseek(pFile, bmpFileHeader.bfOffBits, 0)) { + fprintf(stderr, "fseek failed!\n"); + fclose(pFile); + free(pOrigBMPBuf); + pOrigBMPBuf = NULL; + return -1; + } + + if (fread(pOrigBMPBuf, 1, (unsigned int)(h * stride), pFile) != (unsigned int)(h * stride)) { + fprintf(stderr, "fread (%d*%d)error!line:%d\n", h, stride, __LINE__); + perror("fread:"); + } + + if (Bpp > 2) + dstBpp = 4; + else + dstBpp = 2; + + if (pVideoLogo->stride == 0) + pVideoLogo->stride = pVideoLogo->width * dstBpp; + + for (unsigned short i = 0; i < h; i++) { + for (unsigned short j = 0; j < w; j++) { + memcpy(pRGBBuf + i * pVideoLogo->stride + j * dstBpp, + pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp, Bpp); + + if (dstBpp == 4) + *(pRGBBuf + i * pVideoLogo->stride + j * dstBpp + 3) = 0x80; /*alpha*/ + } + } + + free(pOrigBMPBuf); + pOrigBMPBuf = NULL; + + fclose(pFile); + return 0; } -int load_bitmapex(const char *filename, OSD_LOGO_T *pVideoLogo, OSD_COLOR_FMT_E enFmt) -{ - FILE *pFile; - - unsigned int w, h, stride; - unsigned short Bpp; - - OSD_BITMAPFILEHEADER bmpFileHeader; - OSD_BITMAPINFO bmpInfo; - - unsigned char *pOrigBMPBuf; - unsigned char *pRGBBuf; - unsigned char r, g, b; - unsigned char *pStart; - unsigned short *pDst; - - if (parse_bitmap(filename, &bmpFileHeader, &bmpInfo) < 0) - return -1; - - if (!(pFile = fopen(filename, "rb"))) - { - fprintf(stderr, "Open file failed:%s!\n", filename); - return -1; - } - - pVideoLogo->width = (unsigned short)bmpInfo.bmiHeader.biWidth; - pVideoLogo->height = (unsigned short)((bmpInfo.bmiHeader.biHeight > 0) ? bmpInfo.bmiHeader.biHeight : (-bmpInfo.bmiHeader.biHeight)); - w = pVideoLogo->width; - h = pVideoLogo->height; - - Bpp = bmpInfo.bmiHeader.biBitCount / 8; - stride = w * Bpp; - if (stride % 4) - stride = (stride & 0xfffc) + 4; - - /* RGB8888 or RGB1555 */ - pOrigBMPBuf = (unsigned char *)malloc(h * stride); - if (!pOrigBMPBuf) - { - fprintf(stderr, "not enough memory to malloc!\n"); - fclose(pFile); - return -1; - } - - pRGBBuf = pVideoLogo->pRGBBuffer; - - if (fseek(pFile, bmpFileHeader.bfOffBits, 0)) - { - fprintf(stderr, "fseek failed!\n"); - fclose(pFile); - free(pOrigBMPBuf); - pOrigBMPBuf = NULL; - return -1; - } - - if (fread(pOrigBMPBuf, 1, (unsigned int)(h * stride), pFile) != (unsigned int)(h * stride)) - { - fprintf(stderr, "fread (%d*%d)error!line:%d\n", h, stride, __LINE__); - perror("fread:"); - } - - if (enFmt >= OSD_COLOR_FMT_RGB888) - pVideoLogo->stride = pVideoLogo->width * 4; - else - pVideoLogo->stride = pVideoLogo->width * 2; - - for (unsigned short i = 0; i < h; i++) - { - for (unsigned short j = 0; j < w; j++) - { - if (Bpp == 3) /*.....*/ - { - switch (enFmt) - { - case OSD_COLOR_FMT_RGB444: - case OSD_COLOR_FMT_RGB555: - case OSD_COLOR_FMT_RGB565: - case OSD_COLOR_FMT_RGB1555: - case OSD_COLOR_FMT_RGB4444: - /* start color convert */ - pStart = pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp; - pDst = (unsigned short *)(pRGBBuf + i * pVideoLogo->stride + j * 2); - r = *(pStart); - g = *(pStart + 1); - b = *(pStart + 2); - *pDst = convert_2bpp(r, g, b, s_OSDCompInfo[enFmt]); - break; - - case OSD_COLOR_FMT_RGB888: - case OSD_COLOR_FMT_RGB8888: - memcpy(pRGBBuf + i * pVideoLogo->stride + j * 4, pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp, Bpp); - *(pRGBBuf + i * pVideoLogo->stride + j * 4 + 3) = 0xff; /*alpha*/ - break; - - default: - fprintf(stderr, "file(%s), line(%d), no such format!\n", __FILE__, __LINE__); - break; - } - } - else if ((Bpp == 2) || (Bpp == 4)) /*..............*/ - { - memcpy(pRGBBuf + i * pVideoLogo->stride + j * Bpp, pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp, Bpp); - } - } - } - - free(pOrigBMPBuf); - pOrigBMPBuf = NULL; - - fclose(pFile); - return 0; +int load_bitmapex(const char *filename, OSD_LOGO_T *pVideoLogo, OSD_COLOR_FMT_E enFmt) { + FILE *pFile; + + unsigned int w, h, stride; + unsigned short Bpp; + + OSD_BITMAPFILEHEADER bmpFileHeader; + OSD_BITMAPINFO bmpInfo; + + unsigned char *pOrigBMPBuf; + unsigned char *pRGBBuf; + unsigned char r, g, b; + unsigned char *pStart; + unsigned short *pDst; + + if (parse_bitmap(filename, &bmpFileHeader, &bmpInfo) < 0) + return -1; + + if (!(pFile = fopen(filename, "rb"))) { + fprintf(stderr, "Open file failed:%s!\n", filename); + return -1; + } + + pVideoLogo->width = (unsigned short)bmpInfo.bmiHeader.biWidth; + pVideoLogo->height = + (unsigned short)((bmpInfo.bmiHeader.biHeight > 0) ? bmpInfo.bmiHeader.biHeight + : (-bmpInfo.bmiHeader.biHeight)); + w = pVideoLogo->width; + h = pVideoLogo->height; + + Bpp = bmpInfo.bmiHeader.biBitCount / 8; + stride = w * Bpp; + if (stride % 4) + stride = (stride & 0xfffc) + 4; + + /* RGB8888 or RGB1555 */ + pOrigBMPBuf = (unsigned char *)malloc(h * stride); + if (!pOrigBMPBuf) { + fprintf(stderr, "not enough memory to malloc!\n"); + fclose(pFile); + return -1; + } + + pRGBBuf = pVideoLogo->pRGBBuffer; + + if (fseek(pFile, bmpFileHeader.bfOffBits, 0)) { + fprintf(stderr, "fseek failed!\n"); + fclose(pFile); + free(pOrigBMPBuf); + pOrigBMPBuf = NULL; + return -1; + } + + if (fread(pOrigBMPBuf, 1, (unsigned int)(h * stride), pFile) != (unsigned int)(h * stride)) { + fprintf(stderr, "fread (%d*%d)error!line:%d\n", h, stride, __LINE__); + perror("fread:"); + } + + if (enFmt >= OSD_COLOR_FMT_RGB888) + pVideoLogo->stride = pVideoLogo->width * 4; + else + pVideoLogo->stride = pVideoLogo->width * 2; + + for (unsigned short i = 0; i < h; i++) { + for (unsigned short j = 0; j < w; j++) { + if (Bpp == 3) /*.....*/ + { + switch (enFmt) { + case OSD_COLOR_FMT_RGB444: + case OSD_COLOR_FMT_RGB555: + case OSD_COLOR_FMT_RGB565: + case OSD_COLOR_FMT_RGB1555: + case OSD_COLOR_FMT_RGB4444: + /* start color convert */ + pStart = pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp; + pDst = (unsigned short *)(pRGBBuf + i * pVideoLogo->stride + j * 2); + r = *(pStart); + g = *(pStart + 1); + b = *(pStart + 2); + *pDst = convert_2bpp(r, g, b, s_OSDCompInfo[enFmt]); + break; + + case OSD_COLOR_FMT_RGB888: + case OSD_COLOR_FMT_RGB8888: + memcpy(pRGBBuf + i * pVideoLogo->stride + j * 4, + pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp, Bpp); + *(pRGBBuf + i * pVideoLogo->stride + j * 4 + 3) = 0xff; /*alpha*/ + break; + + default: + fprintf(stderr, "file(%s), line(%d), no such format!\n", __FILE__, __LINE__); + break; + } + } else if ((Bpp == 2) || (Bpp == 4)) /*..............*/ + { + memcpy(pRGBBuf + i * pVideoLogo->stride + j * Bpp, + pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp, Bpp); + } + } + } + + free(pOrigBMPBuf); + pOrigBMPBuf = NULL; + + fclose(pFile); + return 0; } -int load_bitmap_canvas(const char *filename, OSD_LOGO_T *pVideoLogo, OSD_COLOR_FMT_E enFmt) -{ - FILE *pFile; - - unsigned int w, h, stride; - unsigned short Bpp; - - OSD_BITMAPFILEHEADER bmpFileHeader; - OSD_BITMAPINFO bmpInfo; - - unsigned char *pOrigBMPBuf; - unsigned char *pRGBBuf; - unsigned char r, g, b; - unsigned char *pStart; - unsigned short *pDst; - - if (parse_bitmap(filename, &bmpFileHeader, &bmpInfo) < 0) - return -1; - - if (!(pFile = fopen(filename, "rb"))) - { - fprintf(stderr, "Open file faild:%s!\n", filename); - return -1; - } - - Bpp = bmpInfo.bmiHeader.biBitCount / 8; - w = (unsigned short)bmpInfo.bmiHeader.biWidth; - h = (unsigned short)((bmpInfo.bmiHeader.biHeight > 0) ? bmpInfo.bmiHeader.biHeight : (-bmpInfo.bmiHeader.biHeight)); - - stride = w * Bpp; - if (stride % 4) - stride = (stride & 0xfffc) + 4; - - /* RGB8888 or RGB1555 */ - pOrigBMPBuf = (unsigned char *)malloc(h * stride); - if (!pOrigBMPBuf) - { - fprintf(stderr, "not enough memory to malloc!\n"); - fclose(pFile); - return -1; - } - - pRGBBuf = pVideoLogo->pRGBBuffer; - - if (stride > pVideoLogo->stride) - { - fprintf(stderr, "Bitmap's stride(%d) is bigger than canvas's stide(%d). Load bitmap error!\n", stride, pVideoLogo->stride); - fclose(pFile); - free(pOrigBMPBuf); - return -1; - } - - if (h > pVideoLogo->height) - { - fprintf(stderr, "Bitmap's height(%d) is bigger than canvas's height(%d). Load bitmap error!\n", h, pVideoLogo->height); - fclose(pFile); - free(pOrigBMPBuf); - return -1; - } - - if (w > pVideoLogo->width) - { - fprintf(stderr, "Bitmap's width(%d) is bigger than canvas's width(%d). Load bitmap error!\n", w, pVideoLogo->width); - fclose(pFile); - free(pOrigBMPBuf); - return -1; - } - - if (fseek(pFile, bmpFileHeader.bfOffBits, 0)) - { - fprintf(stderr, "fseek error!\n"); - fclose(pFile); - free(pOrigBMPBuf); - return -1; - } - - if (fread(pOrigBMPBuf, 1, (unsigned int)(h * stride), pFile) != (unsigned int)(h * stride)) - { - fprintf(stderr, "fread (%d*%d)error!line:%d\n", h, stride, __LINE__); - perror("fread:"); - } - - for (unsigned short i = 0; i < h; i++) - { - for (unsigned short j = 0; j < w; j++) - { - if (Bpp == 3) /*.....*/ - { - switch (enFmt) - { - case OSD_COLOR_FMT_RGB444: - case OSD_COLOR_FMT_RGB555: - case OSD_COLOR_FMT_RGB565: - case OSD_COLOR_FMT_RGB1555: - case OSD_COLOR_FMT_RGB4444: - /* start color convert */ - pStart = pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp; - pDst = (unsigned short *)(pRGBBuf + i * pVideoLogo->stride + j * 2); - r = *(pStart); - g = *(pStart + 1); - b = *(pStart + 2); - // fprintf(stderr, "Func: %s, line:%d, Bpp: %d, bmp stride: %d, Canvas stride: %d, h:%d, w:%d.\n", - // __FUNCTION__, __LINE__, Bpp, stride, pVideoLogo->stride, i, j); - *pDst = convert_2bpp(r, g, b, s_OSDCompInfo[enFmt]); - - break; - - case OSD_COLOR_FMT_RGB888: - case OSD_COLOR_FMT_RGB8888: - memcpy(pRGBBuf + i * pVideoLogo->stride + j * 4, pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp, Bpp); - *(pRGBBuf + i * pVideoLogo->stride + j * 4 + 3) = 0xff; /*alpha*/ - break; - - default: - fprintf(stderr, "file(%s), line(%d), no such format!\n", __FILE__, __LINE__); - break; - } - } - else if ((Bpp == 2) || (Bpp == 4)) /*..............*/ - { - memcpy(pRGBBuf + i * pVideoLogo->stride + j * Bpp, pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp, Bpp); - } - } - } - - free(pOrigBMPBuf); - pOrigBMPBuf = NULL; - - fclose(pFile); - return 0; +int load_bitmap_canvas(const char *filename, OSD_LOGO_T *pVideoLogo, OSD_COLOR_FMT_E enFmt) { + FILE *pFile; + + unsigned int w, h, stride; + unsigned short Bpp; + + OSD_BITMAPFILEHEADER bmpFileHeader; + OSD_BITMAPINFO bmpInfo; + + unsigned char *pOrigBMPBuf; + unsigned char *pRGBBuf; + unsigned char r, g, b; + unsigned char *pStart; + unsigned short *pDst; + + if (parse_bitmap(filename, &bmpFileHeader, &bmpInfo) < 0) + return -1; + + if (!(pFile = fopen(filename, "rb"))) { + fprintf(stderr, "Open file faild:%s!\n", filename); + return -1; + } + + Bpp = bmpInfo.bmiHeader.biBitCount / 8; + w = (unsigned short)bmpInfo.bmiHeader.biWidth; + h = (unsigned short)((bmpInfo.bmiHeader.biHeight > 0) ? bmpInfo.bmiHeader.biHeight + : (-bmpInfo.bmiHeader.biHeight)); + + stride = w * Bpp; + if (stride % 4) + stride = (stride & 0xfffc) + 4; + + /* RGB8888 or RGB1555 */ + pOrigBMPBuf = (unsigned char *)malloc(h * stride); + if (!pOrigBMPBuf) { + fprintf(stderr, "not enough memory to malloc!\n"); + fclose(pFile); + return -1; + } + + pRGBBuf = pVideoLogo->pRGBBuffer; + + if (stride > pVideoLogo->stride) { + fprintf(stderr, + "Bitmap's stride(%d) is bigger than canvas's stide(%d). Load " + "bitmap error!\n", + stride, pVideoLogo->stride); + fclose(pFile); + free(pOrigBMPBuf); + return -1; + } + + if (h > pVideoLogo->height) { + fprintf(stderr, + "Bitmap's height(%d) is bigger than canvas's height(%d). Load " + "bitmap error!\n", + h, pVideoLogo->height); + fclose(pFile); + free(pOrigBMPBuf); + return -1; + } + + if (w > pVideoLogo->width) { + fprintf(stderr, + "Bitmap's width(%d) is bigger than canvas's width(%d). Load bitmap " + "error!\n", + w, pVideoLogo->width); + fclose(pFile); + free(pOrigBMPBuf); + return -1; + } + + if (fseek(pFile, bmpFileHeader.bfOffBits, 0)) { + fprintf(stderr, "fseek error!\n"); + fclose(pFile); + free(pOrigBMPBuf); + return -1; + } + + if (fread(pOrigBMPBuf, 1, (unsigned int)(h * stride), pFile) != (unsigned int)(h * stride)) { + fprintf(stderr, "fread (%d*%d)error!line:%d\n", h, stride, __LINE__); + perror("fread:"); + } + + for (unsigned short i = 0; i < h; i++) { + for (unsigned short j = 0; j < w; j++) { + if (Bpp == 3) /*.....*/ + { + switch (enFmt) { + case OSD_COLOR_FMT_RGB444: + case OSD_COLOR_FMT_RGB555: + case OSD_COLOR_FMT_RGB565: + case OSD_COLOR_FMT_RGB1555: + case OSD_COLOR_FMT_RGB4444: + /* start color convert */ + pStart = pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp; + pDst = (unsigned short *)(pRGBBuf + i * pVideoLogo->stride + j * 2); + r = *(pStart); + g = *(pStart + 1); + b = *(pStart + 2); + // fprintf(stderr, "Func: %s, line:%d, Bpp: %d, bmp stride: + // %d, Canvas stride: %d, h:%d, w:%d.\n", + // __FUNCTION__, __LINE__, Bpp, stride, + // pVideoLogo->stride, i, j); + *pDst = convert_2bpp(r, g, b, s_OSDCompInfo[enFmt]); + + break; + + case OSD_COLOR_FMT_RGB888: + case OSD_COLOR_FMT_RGB8888: + memcpy(pRGBBuf + i * pVideoLogo->stride + j * 4, + pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp, Bpp); + *(pRGBBuf + i * pVideoLogo->stride + j * 4 + 3) = 0xff; /*alpha*/ + break; + + default: + fprintf(stderr, "file(%s), line(%d), no such format!\n", __FILE__, __LINE__); + break; + } + } else if ((Bpp == 2) || (Bpp == 4)) /*..............*/ + { + memcpy(pRGBBuf + i * pVideoLogo->stride + j * Bpp, + pOrigBMPBuf + ((h - 1) - i) * stride + j * Bpp, Bpp); + } + } + } + + free(pOrigBMPBuf); + pOrigBMPBuf = NULL; + + fclose(pFile); + return 0; } -char *extract_extension(char *filename) -{ - char *pret = NULL; - - if (!filename) - { - fprintf(stderr, "filename can't be null!"); - return NULL; - } - - unsigned int fnLen = strlen(filename); - while (fnLen) - { - pret = filename + fnLen; - if (*pret == '.') - return (pret + 1); - fnLen--; - } - - return pret; +char *extract_extension(char *filename) { + char *pret = NULL; + + if (!filename) { + fprintf(stderr, "filename can't be null!"); + return NULL; + } + + unsigned int fnLen = strlen(filename); + while (fnLen) { + pret = filename + fnLen; + if (*pret == '.') + return (pret + 1); + fnLen--; + } + + return pret; } -int load_image(const char *filename, OSD_LOGO_T *pVideoLogo) -{ - char *ext = extract_extension((char *)filename); - - if (ext && !strcmp(ext, "bmp")) - { - if (load_bitmap(filename, pVideoLogo)) - { - fprintf(stderr, "load_bitmap error!\n"); - return -1; - } - } - else - { - fprintf(stderr, "not supported image file!\n"); - return -1; - } - - return 0; +int load_image(const char *filename, OSD_LOGO_T *pVideoLogo) { + char *ext = extract_extension((char *)filename); + + if (ext && !strcmp(ext, "bmp")) { + if (load_bitmap(filename, pVideoLogo)) { + fprintf(stderr, "load_bitmap error!\n"); + return -1; + } + } else { + fprintf(stderr, "not supported image file!\n"); + return -1; + } + + return 0; } -int load_imageex(const char *filename, OSD_LOGO_T *pVideoLogo, OSD_COLOR_FMT_E enFmt) -{ - char *ext = extract_extension((char*)filename); - - if (ext && !strcmp(ext, "bmp")) - { - if (load_bitmapex(filename, pVideoLogo, enFmt)) - { - fprintf(stderr, "load_bitmap error!\n"); - return -1; - } - } - else - { - fprintf(stderr, "not supported image file!\n"); - return -1; - } - - return 0; +int load_imageex(const char *filename, OSD_LOGO_T *pVideoLogo, OSD_COLOR_FMT_E enFmt) { + char *ext = extract_extension((char *)filename); + + if (ext && !strcmp(ext, "bmp")) { + if (load_bitmapex(filename, pVideoLogo, enFmt)) { + fprintf(stderr, "load_bitmap error!\n"); + return -1; + } + } else { + fprintf(stderr, "not supported image file!\n"); + return -1; + } + + return 0; } -int load_canvasex(const char *filename, OSD_LOGO_T *pVideoLogo, OSD_COLOR_FMT_E enFmt) -{ - char *ext = extract_extension((char *)filename); - - if (ext && !strcmp(ext, "bmp")) - { - if (load_bitmap_canvas(filename, pVideoLogo, enFmt)) - { - fprintf(stderr, "load_bitmap error!\n"); - return -1; - } - } - else - { - fprintf(stderr, "not supported image file!\n"); - return -1; - } - - return 0; +int load_canvasex(const char *filename, OSD_LOGO_T *pVideoLogo, OSD_COLOR_FMT_E enFmt) { + char *ext = extract_extension((char *)filename); + + if (ext && !strcmp(ext, "bmp")) { + if (load_bitmap_canvas(filename, pVideoLogo, enFmt)) { + fprintf(stderr, "load_bitmap error!\n"); + return -1; + } + } else { + fprintf(stderr, "not supported image file!\n"); + return -1; + } + + return 0; } -int LoadBitMap2Surface(const char *pszFileName, const OSD_SURFACE_S *pstSurface, unsigned char *pu8Virt) -{ - OSD_LOGO_T stLogo; +int LoadBitMap2Surface( + const char *pszFileName, const OSD_SURFACE_S *pstSurface, unsigned char *pu8Virt) { + OSD_LOGO_T stLogo; - stLogo.stride = pstSurface->u16Stride; - stLogo.pRGBBuffer = pu8Virt; + stLogo.stride = pstSurface->u16Stride; + stLogo.pRGBBuffer = pu8Virt; - return load_image(pszFileName, &stLogo); + return load_image(pszFileName, &stLogo); } -int CreateSurfaceByBitMap(const char *pszFileName, OSD_SURFACE_S *pstSurface, unsigned char *pu8Virt) -{ - OSD_LOGO_T stLogo; +int CreateSurfaceByBitMap( + const char *pszFileName, OSD_SURFACE_S *pstSurface, unsigned char *pu8Virt) { + OSD_LOGO_T stLogo; - stLogo.pRGBBuffer = pu8Virt; + stLogo.pRGBBuffer = pu8Virt; - if (load_imageex(pszFileName, &stLogo, pstSurface->enColorFmt) < 0) - { - fprintf(stderr, "load bmp error!\n"); - return -1; - } + if (load_imageex(pszFileName, &stLogo, pstSurface->enColorFmt) < 0) { + fprintf(stderr, "load bmp error!\n"); + return -1; + } - pstSurface->u16Height = stLogo.height; - pstSurface->u16Width = stLogo.width; - pstSurface->u16Stride = stLogo.stride; + pstSurface->u16Height = stLogo.height; + pstSurface->u16Width = stLogo.width; + pstSurface->u16Stride = stLogo.stride; - return 0; + return 0; } -int CreateSurfaceByCanvas(const char *pszFileName, OSD_SURFACE_S *pstSurface, unsigned char *pu8Virt, unsigned int u32Width, unsigned int u32Height, unsigned int u32Stride) -{ - OSD_LOGO_T stLogo; +int CreateSurfaceByCanvas(const char *pszFileName, OSD_SURFACE_S *pstSurface, + unsigned char *pu8Virt, unsigned int u32Width, unsigned int u32Height, unsigned int u32Stride) { + OSD_LOGO_T stLogo; - stLogo.pRGBBuffer = pu8Virt; - stLogo.width = u32Width; - stLogo.height = u32Height; - stLogo.stride = u32Stride; + stLogo.pRGBBuffer = pu8Virt; + stLogo.width = u32Width; + stLogo.height = u32Height; + stLogo.stride = u32Stride; - if (load_canvasex(pszFileName, &stLogo, pstSurface->enColorFmt) < 0) - { - fprintf(stderr, "load bmp error!\n"); - return -1; - } + if (load_canvasex(pszFileName, &stLogo, pstSurface->enColorFmt) < 0) { + fprintf(stderr, "load bmp error!\n"); + return -1; + } - pstSurface->u16Height = u32Height; - pstSurface->u16Width = u32Width; - pstSurface->u16Stride = u32Stride; + pstSurface->u16Height = u32Height; + pstSurface->u16Width = u32Width; + pstSurface->u16Stride = u32Stride; - return 0; + return 0; } - // Function to calculate the squared difference between two colors uint32_t colorDistance(uint16_t color1, uint16_t color2) { - int r1 = (color1 >> 10) & 0x1F; - int g1 = (color1 >> 5) & 0x1F; - int b1 = color1 & 0x1F; + int r1 = (color1 >> 10) & 0x1F; + int g1 = (color1 >> 5) & 0x1F; + int b1 = color1 & 0x1F; - int r2 = (color2 >> 10) & 0x1F; - int g2 = (color2 >> 5) & 0x1F; - int b2 = color2 & 0x1F; + int r2 = (color2 >> 10) & 0x1F; + int g2 = (color2 >> 5) & 0x1F; + int b2 = color2 & 0x1F; - return (r1 - r2) * (r1 - r2) + (g1 - g2) * (g1 - g2) + (b1 - b2) * (b1 - b2); + return (r1 - r2) * (r1 - r2) + (g1 - g2) * (g1 - g2) + (b1 - b2) * (b1 - b2); } -// Function to calculate the squared difference between two colors in ARGB1555 format +// Function to calculate the squared difference between two colors in ARGB1555 +// format uint32_t colorDistance8(uint8_t r1, uint8_t g1, uint8_t b1, uint8_t r2, uint8_t g2, uint8_t b2) { - return (r1 - r2) * (r1 - r2) + (g1 - g2) * (g1 - g2) + (b1 - b2) * (b1 - b2); + return (r1 - r2) * (r1 - r2) + (g1 - g2) * (g1 - g2) + (b1 - b2) * (b1 - b2); } -uint8_t findClosestPaletteIndex(uint16_t color, uint16_t* palette) { - uint32_t minDistance = 65535; - uint8_t bestIndex = 0; +uint8_t findClosestPaletteIndex(uint16_t color, uint16_t *palette) { + uint32_t minDistance = 65535; + uint8_t bestIndex = 0; - for (uint8_t i = 0; i < 16/*PALETTE_SIZE*/; ++i) { - uint32_t distance = colorDistance(color, palette[i]); - if (distance < minDistance) { - minDistance = distance; - bestIndex = i; - } - } + for (uint8_t i = 0; i < 16 /*PALETTE_SIZE*/; ++i) { + uint32_t distance = colorDistance(color, palette[i]); + if (distance < minDistance) { + minDistance = distance; + bestIndex = i; + } + } - return bestIndex; + return bestIndex; } - // Function to find the closest color in the palette -uint8_t findClosestPaletteIndexBW(uint16_t color, MI_RGN_PaletteTable_t* paletteTable) { - uint32_t minDistance = 65535; - uint8_t bestIndex = 2; - - uint8_t a = (color >> 15) & 0x01; // 1-bit alpha - if (a==0){ - bestIndex=15;//transparent - return bestIndex; - } - - // Extract RGB components from ARGB1555 color - uint8_t r = ((color >> 10) & 0x1F) << 3; // Convert 5-bit to 8-bit - uint8_t g = ((color >> 5) & 0x1F) << 3; // Convert 5-bit to 8-bit - uint8_t b = (color & 0x1F) << 3; // Convert 5-bit to 8-bit - - - for (uint8_t i = 7; i < 18; ++i) {// only 5 searched W, Bl, 2xGrays , transp - if (i==9) - i=13; - MI_RGN_PaletteElement_t* element = &paletteTable->astElement[i]; - uint32_t distance = colorDistance8(r, g, b, element->u8Red, element->u8Green, element->u8Blue); - if (distance < minDistance) { - minDistance = distance; - bestIndex = i; - } - } - - return bestIndex; +uint8_t findClosestPaletteIndexBW(uint16_t color, MI_RGN_PaletteTable_t *paletteTable) { + uint32_t minDistance = 65535; + uint8_t bestIndex = 2; + + uint8_t a = (color >> 15) & 0x01; // 1-bit alpha + if (a == 0) { + bestIndex = 15; // transparent + return bestIndex; + } + + // Extract RGB components from ARGB1555 color + uint8_t r = ((color >> 10) & 0x1F) << 3; // Convert 5-bit to 8-bit + uint8_t g = ((color >> 5) & 0x1F) << 3; // Convert 5-bit to 8-bit + uint8_t b = (color & 0x1F) << 3; // Convert 5-bit to 8-bit + + for (uint8_t i = 7; i < 18; ++i) { // only 5 searched W, Bl, 2xGrays , transp + if (i == 9) + i = 13; + MI_RGN_PaletteElement_t *element = &paletteTable->astElement[i]; + uint32_t distance = + colorDistance8(r, g, b, element->u8Red, element->u8Green, element->u8Blue); + if (distance < minDistance) { + minDistance = distance; + bestIndex = i; + } + } + + return bestIndex; } - // Function to find the closest color in the palette -uint8_t findClosestPaletteIndex8(uint16_t color, MI_RGN_PaletteTable_t* paletteTable) { - uint32_t minDistance = 65535; - uint8_t bestIndex = 0; - - uint8_t a = (color >> 15) & 0x01; // 1-bit alpha - if (a==0){ - bestIndex=15;//transparent - return bestIndex; - } - - // Extract RGB components from ARGB1555 color - uint8_t r = ((color >> 10) & 0x1F) << 3; // Convert 5-bit to 8-bit - uint8_t g = ((color >> 5) & 0x1F) << 3; // Convert 5-bit to 8-bit - uint8_t b = (color & 0x1F) << 3; // Convert 5-bit to 8-bit - - - for (uint8_t i = 1; i < 18; ++i) {// only 16 searched - - MI_RGN_PaletteElement_t* element = &paletteTable->astElement[i]; - uint32_t distance = colorDistance8(r, g, b, element->u8Red, element->u8Green, element->u8Blue); - if (distance < minDistance) { - minDistance = distance; - bestIndex = i; - } - } - - return bestIndex; +uint8_t findClosestPaletteIndex8(uint16_t color, MI_RGN_PaletteTable_t *paletteTable) { + uint32_t minDistance = 65535; + uint8_t bestIndex = 0; + + uint8_t a = (color >> 15) & 0x01; // 1-bit alpha + if (a == 0) { + bestIndex = 15; // transparent + return bestIndex; + } + + // Extract RGB components from ARGB1555 color + uint8_t r = ((color >> 10) & 0x1F) << 3; // Convert 5-bit to 8-bit + uint8_t g = ((color >> 5) & 0x1F) << 3; // Convert 5-bit to 8-bit + uint8_t b = (color & 0x1F) << 3; // Convert 5-bit to 8-bit + + for (uint8_t i = 1; i < 18; ++i) { // only 16 searched + + MI_RGN_PaletteElement_t *element = &paletteTable->astElement[i]; + uint32_t distance = + colorDistance8(r, g, b, element->u8Red, element->u8Green, element->u8Blue); + if (distance < minDistance) { + minDistance = distance; + bestIndex = i; + } + } + + return bestIndex; } -uint8_t findClosestPaletteIndexRGBA(uint8_t *color, MI_RGN_PaletteTable_t* paletteTable) { - uint32_t minDistance = 65535; - uint8_t bestIndex = 0; - - // Extract RGB components from ARGB1555 color - // Extract RGBA values - uint8_t r = *(color+0); - uint8_t g = *(color+1); - uint8_t b = *(color+2); - uint8_t a = *(color+3); - if (a<64)//transparency treshold, was 128 - return 15;//transparent - else if (r>77) - bestIndex = 0; - else - bestIndex = 0; - - if (a>2 && a<200) - a++; - - for (uint8_t i = 1; i < 18; ++i) {// only 16 searched - MI_RGN_PaletteElement_t* element = &paletteTable->astElement[i]; - uint32_t distance = colorDistance8(r, g, b, element->u8Red, element->u8Green, element->u8Blue); - if (distance < minDistance) { - minDistance = distance; - bestIndex = i; - } - } - - return bestIndex; +uint8_t findClosestPaletteIndexRGBA(uint8_t *color, MI_RGN_PaletteTable_t *paletteTable) { + uint32_t minDistance = 65535; + uint8_t bestIndex = 0; + + // Extract RGB components from ARGB1555 color + // Extract RGBA values + uint8_t r = *(color + 0); + uint8_t g = *(color + 1); + uint8_t b = *(color + 2); + uint8_t a = *(color + 3); + if (a < 64) // transparency treshold, was 128 + return 15; // transparent + else if (r > 77) + bestIndex = 0; + else + bestIndex = 0; + + if (a > 2 && a < 200) + a++; + + for (uint8_t i = 1; i < 18; ++i) { // only 16 searched + MI_RGN_PaletteElement_t *element = &paletteTable->astElement[i]; + uint32_t distance = + colorDistance8(r, g, b, element->u8Red, element->u8Green, element->u8Blue); + if (distance < minDistance) { + minDistance = distance; + bestIndex = i; + } + } + + return bestIndex; } -void convertBitmap1555ToI8( - uint16_t* srcBitmap, uint32_t width, uint32_t height, - uint8_t* destBitmap, MI_RGN_PaletteTable_t* paletteTable) -{ - uint32_t numPixels = width * height; - - for (uint32_t i = 0; i < numPixels; ++i) { - // Find the closest palette index for each ARGB1555 pixel - uint8_t paletteIndex = findClosestPaletteIndex8(srcBitmap[i], paletteTable); - - if (paletteIndex == 0)//Sigmastar reserver - paletteIndex=8;//black - if (paletteIndex == 17)//Transparent color - paletteIndex=15; - // Store the palette index in the I8 bitmap - destBitmap[i] = paletteIndex; - } +void convertBitmap1555ToI8(uint16_t *srcBitmap, uint32_t width, uint32_t height, + uint8_t *destBitmap, MI_RGN_PaletteTable_t *paletteTable) { + uint32_t numPixels = width * height; + + for (uint32_t i = 0; i < numPixels; ++i) { + // Find the closest palette index for each ARGB1555 pixel + uint8_t paletteIndex = findClosestPaletteIndex8(srcBitmap[i], paletteTable); + + if (paletteIndex == 0) // Sigmastar reserver + paletteIndex = 8; // black + if (paletteIndex == 17) // Transparent color + paletteIndex = 15; + // Store the palette index in the I8 bitmap + destBitmap[i] = paletteIndex; + } } - -//static MI_RGN_PaletteTable_t g_stPaletteTable ;//= {{{0, 0, 0, 0}}}; -MI_RGN_PaletteTable_t g_stPaletteTable = -{ - { //index0 ~ index15 - {255, 0, 0, 0}, // reserved - - {0xFF, 0xFF, 0x00, 0x00}, // 0x7C00 -> Red - {0xFF, 0x00, 0xFF, 0x00}, // 0x03E0 -> Green - {0xFF, 0x00, 0x00, 0xFF}, // 0x001F -> Blue - {0xFF, 0xF8, 0xF8, 0x00}, // 0x7FE0 -> Yellow - {0xFF, 0xF8, 0x00, 0xF8}, // 0x7C1F -> Magenta - {0xFF, 0x00, 0xF8, 0xF8}, // 0x03FF -> Cyan - {0xFF, 0xFF, 0xFF, 0xFF}, // 0x7FFF -> White - {0xFF, 0x00, 0x00, 0x00}, // 0x0000 -> Black index 8 - {0xFF, 0x84, 0x10, 0x10}, // - {0xFF, 0x42, 0x08, 0x08}, // - {0xFF, 0x63, 0x18, 0xC6}, // - {0xFF, 0xAD, 0x52, 0xD6}, // - {0xFF, 0xCC, 0xCC, 0xCC}, // 0x739C -> Gray (Light) - {0xFF, 0x77, 0x77, 0x77}, // 0x18C6 -> Gray (Dark) - - {0x00, 0, 0, 0}, // transparent index 15, 0x0A - {0x00, 0, 0, 0}, // 0x7BDE -> transparent - - //index17 ~ index31 - {0xFF, 0xF0, 0xF0, 0xF0}, //this is the predefined TRANSARANT Color index17 - { 0, 0, 255, 60}, { 0, 128, 0, 90}, - {255, 0, 0, 120}, { 0, 255, 255, 150}, {255, 255, 0, 180}, { 0, 255, 0, 210}, - {255, 0, 255, 240}, {192, 192, 192, 255}, {128, 128, 128, 10}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index32 ~ index47 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index48 ~ index63 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index64 ~ index79 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index80 ~ index95 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index96 ~ index111 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index112 ~ index127 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index128 ~ index143 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index144 ~ index159 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index160 ~ index175 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index176 ~ index191 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index192 ~ index207 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index208 ~ index223 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index224 ~ index239 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - // (index236 :192,160,224 defalut colorkey) - {192, 160, 224, 255}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - //index240 ~ index255 - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, - { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, {192, 160, 224, 255} - } -}; - - - -void Convert1555ToRGBA(unsigned short* bitmap1555, unsigned char* rgbaData, unsigned int width, unsigned int height) { - for (unsigned int i = 0; i < width * height; ++i) { - unsigned short pixel1555 = bitmap1555[i]; - - // Extract components - unsigned char alpha = (pixel1555 & 0x8000) ? 255 : 0; // 1-bit alpha, 0x8000 is the alpha bit mask - unsigned char red = (pixel1555 & 0x7C00) >> 10; // 5-bit red, shift right to align - unsigned char green = (pixel1555 & 0x03E0) >> 5; // 5-bit green - unsigned char blue = (pixel1555 & 0x001F); // 5-bit blue - - // Scale 5-bit colors to 8-bit - red = (red << 3) | (red >> 2); // Scale from 5-bit to 8-bit - green = (green << 3) | (green >> 2); // Scale from 5-bit to 8-bit - blue = (blue << 3) | (blue >> 2); // Scale from 5-bit to 8-bit - - // Combine into RGBA - rgbaData[i * 4 + 0] = red; - rgbaData[i * 4 + 1] = green; - rgbaData[i * 4 + 2] = blue; - rgbaData[i * 4 + 3] = alpha; - } +// static MI_RGN_PaletteTable_t g_stPaletteTable ;//= {{{0, 0, 0, 0}}}; +MI_RGN_PaletteTable_t g_stPaletteTable = {{// index0 ~ index15 + {255, 0, 0, 0}, // reserved + + {0xFF, 0xFF, 0x00, 0x00}, // 0x7C00 -> Red + {0xFF, 0x00, 0xFF, 0x00}, // 0x03E0 -> Green + {0xFF, 0x00, 0x00, 0xFF}, // 0x001F -> Blue + {0xFF, 0xF8, 0xF8, 0x00}, // 0x7FE0 -> Yellow + {0xFF, 0xF8, 0x00, 0xF8}, // 0x7C1F -> Magenta + {0xFF, 0x00, 0xF8, 0xF8}, // 0x03FF -> Cyan + {0xFF, 0xFF, 0xFF, 0xFF}, // 0x7FFF -> White + {0xFF, 0x00, 0x00, 0x00}, // 0x0000 -> Black index 8 + {0xFF, 0x84, 0x10, 0x10}, // + {0xFF, 0x42, 0x08, 0x08}, // + {0xFF, 0x63, 0x18, 0xC6}, // + {0xFF, 0xAD, 0x52, 0xD6}, // + {0xFF, 0xCC, 0xCC, 0xCC}, // 0x739C -> Gray (Light) + {0xFF, 0x77, 0x77, 0x77}, // 0x18C6 -> Gray (Dark) + + {0x00, 0, 0, 0}, // transparent index 15, 0x0A + {0x00, 0, 0, 0}, // 0x7BDE -> transparent + + // index17 ~ index31 + {0xFF, 0xF0, 0xF0, 0xF0}, // this is the predefined TRANSARANT Color index17 + {0, 0, 255, 60}, {0, 128, 0, 90}, {255, 0, 0, 120}, {0, 255, 255, 150}, {255, 255, 0, 180}, + {0, 255, 0, 210}, {255, 0, 255, 240}, {192, 192, 192, 255}, {128, 128, 128, 10}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index32 ~ index47 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index48 ~ index63 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index64 ~ index79 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index80 ~ index95 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index96 ~ index111 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index112 ~ index127 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index128 ~ index143 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index144 ~ index159 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index160 ~ index175 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index176 ~ index191 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index192 ~ index207 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index208 ~ index223 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index224 ~ index239 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // (index236 :192,160,224 defalut colorkey) + {192, 160, 224, 255}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + // index240 ~ index255 + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, + {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {192, 160, 224, 255}}}; + +void Convert1555ToRGBA( + unsigned short *bitmap1555, unsigned char *rgbaData, unsigned int width, unsigned int height) { + for (unsigned int i = 0; i < width * height; ++i) { + unsigned short pixel1555 = bitmap1555[i]; + + // Extract components + unsigned char alpha = + (pixel1555 & 0x8000) ? 255 : 0; // 1-bit alpha, 0x8000 is the alpha bit mask + unsigned char red = (pixel1555 & 0x7C00) >> 10; // 5-bit red, shift right to align + unsigned char green = (pixel1555 & 0x03E0) >> 5; // 5-bit green + unsigned char blue = (pixel1555 & 0x001F); // 5-bit blue + + // Scale 5-bit colors to 8-bit + red = (red << 3) | (red >> 2); // Scale from 5-bit to 8-bit + green = (green << 3) | (green >> 2); // Scale from 5-bit to 8-bit + blue = (blue << 3) | (blue >> 2); // Scale from 5-bit to 8-bit + + // Combine into RGBA + rgbaData[i * 4 + 0] = red; + rgbaData[i * 4 + 1] = green; + rgbaData[i * 4 + 2] = blue; + rgbaData[i * 4 + 3] = alpha; + } } /* void copyRectARGB1555Slow( - uint16_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, - uint16_t* destBitmap, uint32_t destWidth, uint32_t destHeight, - uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, - uint32_t destX, uint32_t destY) + uint16_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, + uint16_t* destBitmap, uint32_t destWidth, uint32_t destHeight, + uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, + uint32_t destX, uint32_t destY) { - // Bounds checking - if (srcX + width > srcWidth || srcY + height > srcHeight || - destX + width > destWidth || destY + height > destHeight){ - // Handle error: the rectangle is out of bounds - printf("Error copyRectARGB1555 to %d : %d\r\n", destX, destY); - return; - } - - for (uint32_t y = 0; y < height; ++y) { - for (uint32_t x = 0; x < width; ++x) { - // Calculate the source and destination indices - uint32_t srcIndex = (srcY + y) * srcWidth + (srcX + x); - uint32_t destIndex = (destY + y) * destWidth + (destX + x); - - //if (srcBitmap[srcIndex]==TRANSPARENT_COLOR) - // srcBitmap[srcIndex]=0x7FFF; - // Copy the pixel - destBitmap[destIndex] = srcBitmap[srcIndex]; - } - } + // Bounds checking + if (srcX + width > srcWidth || srcY + height > srcHeight || + destX + width > destWidth || destY + height > destHeight){ + // Handle error: the rectangle is out of bounds + printf("Error copyRectARGB1555 to %d : %d\r\n", destX, destY); + return; + } + + for (uint32_t y = 0; y < height; ++y) { + for (uint32_t x = 0; x < width; ++x) { + // Calculate the source and destination indices + uint32_t srcIndex = (srcY + y) * srcWidth + (srcX + x); + uint32_t destIndex = (destY + y) * destWidth + (destX + x); + + //if (srcBitmap[srcIndex]==TRANSPARENT_COLOR) + // srcBitmap[srcIndex]=0x7FFF; + // Copy the pixel + destBitmap[destIndex] = srcBitmap[srcIndex]; + } + } } */ #include #include -#include // for memcpy - -void copyRectARGB1555( - uint16_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, - uint16_t* destBitmap, uint32_t destWidth, uint32_t destHeight, - uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, - uint32_t destX, uint32_t destY) -{ - // Bounds checking - if (srcX + width > srcWidth || srcY + height > srcHeight || - destX + width > destWidth || destY + height > destHeight) { - // Handle error: the rectangle is out of bounds - printf("Error copyRectARGB1555 to %d : %d\r\n", destX, destY); - return; - } - - // Calculate the width of the rectangle in bytes - uint32_t rowSizeInBytes = width * sizeof(uint16_t); - rowSizeInBytes=getRowStride(width,16); - - for (uint32_t y = 0; y < height; ++y) { - // Calculate the source and destination pointers for the current row - uint16_t* srcPtr = srcBitmap + (srcY + y) * srcWidth + srcX; - uint16_t* destPtr = destBitmap + (destY + y) * destWidth + destX; - - // Use memcpy to copy the entire row - memcpy(destPtr, srcPtr, rowSizeInBytes); - } +#include // for memcpy + +void copyRectARGB1555(uint16_t *srcBitmap, uint32_t srcWidth, uint32_t srcHeight, + uint16_t *destBitmap, uint32_t destWidth, uint32_t destHeight, uint32_t srcX, uint32_t srcY, + uint32_t width, uint32_t height, uint32_t destX, uint32_t destY) { + // Bounds checking + if (srcX + width > srcWidth || srcY + height > srcHeight || destX + width > destWidth || + destY + height > destHeight) { + // Handle error: the rectangle is out of bounds + printf("Error copyRectARGB1555 to %d : %d\r\n", destX, destY); + return; + } + + // Calculate the width of the rectangle in bytes + uint32_t rowSizeInBytes = width * sizeof(uint16_t); + rowSizeInBytes = getRowStride(width, 16); + + for (uint32_t y = 0; y < height; ++y) { + // Calculate the source and destination pointers for the current row + uint16_t *srcPtr = srcBitmap + (srcY + y) * srcWidth + srcX; + uint16_t *destPtr = destBitmap + (destY + y) * destWidth + destX; + + // Use memcpy to copy the entire row + memcpy(destPtr, srcPtr, rowSizeInBytes); + } } - -void copyRectRGBA8888( - uint32_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, - uint32_t* destBitmap, uint32_t destWidth, uint32_t destHeight, - uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, - uint32_t destX, uint32_t destY) -{ - // Bounds checking - if (srcX + width > srcWidth || srcY + height > srcHeight || - destX + width > destWidth || destY + height > destHeight) { - // Handle error: the rectangle is out of bounds - printf("Error copyRectRGBA8888 to %d : %d\n", destX, destY); - return; - } - - // Calculate the width of the rectangle in bytes (4 bytes per pixel for RGBA8888) - uint32_t rowSizeInBytes = width * sizeof(uint32_t); - rowSizeInBytes = getRowStride(width, 32); // 32 bits per pixel for RGBA8888 - - for (uint32_t y = 0; y < height; ++y) { - // Calculate the source and destination pointers for the current row - uint32_t* srcPtr = srcBitmap + (srcY + y) * srcWidth + srcX; - uint32_t* destPtr = destBitmap + (destY + y) * destWidth + destX; - - // Use memcpy to copy the entire row - memcpy(destPtr, srcPtr, rowSizeInBytes); - } +void copyRectRGBA8888(uint32_t *srcBitmap, uint32_t srcWidth, uint32_t srcHeight, + uint32_t *destBitmap, uint32_t destWidth, uint32_t destHeight, uint32_t srcX, uint32_t srcY, + uint32_t width, uint32_t height, uint32_t destX, uint32_t destY) { + // Bounds checking + if (srcX + width > srcWidth || srcY + height > srcHeight || destX + width > destWidth || + destY + height > destHeight) { + // Handle error: the rectangle is out of bounds + printf("Error copyRectRGBA8888 to %d : %d\n", destX, destY); + return; + } + + // Calculate the width of the rectangle in bytes (4 bytes per pixel for + // RGBA8888) + uint32_t rowSizeInBytes = width * sizeof(uint32_t); + rowSizeInBytes = getRowStride(width, 32); // 32 bits per pixel for RGBA8888 + + for (uint32_t y = 0; y < height; ++y) { + // Calculate the source and destination pointers for the current row + uint32_t *srcPtr = srcBitmap + (srcY + y) * srcWidth + srcX; + uint32_t *destPtr = destBitmap + (destY + y) * destWidth + destX; + + // Use memcpy to copy the entire row + memcpy(destPtr, srcPtr, rowSizeInBytes); + } } - /* void copyRectI8Slow( - uint8_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, - uint8_t* destBitmap, uint32_t destWidth, uint32_t destHeight, - uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, - uint32_t destX, uint32_t destY) + uint8_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, + uint8_t* destBitmap, uint32_t destWidth, uint32_t destHeight, + uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, + uint32_t destX, uint32_t destY) { - // Bounds checking - if (srcX + width > srcWidth || srcY + height > srcHeight || - destX + width > destWidth || destY + height > destHeight){ - // Handle error: the rectangle is out of bounds - printf("Error copyRectARGB1555 to %d : %d\r\n", destX, destY); - return; - } - - for (uint32_t y = 0; y < height; ++y) { - for (uint32_t x = 0; x < width; ++x) { - // Calculate the source and destination indices - uint32_t srcIndex = (srcY + y) * srcWidth + (srcX + x); - uint32_t destIndex = (destY + y) * destWidth + (destX + x); - - //if (srcBitmap[srcIndex]==TRANSPARENT_COLOR) - // srcBitmap[srcIndex]=0x7FFF; - // Copy the pixel - destBitmap[destIndex] = srcBitmap[srcIndex]; - } - } + // Bounds checking + if (srcX + width > srcWidth || srcY + height > srcHeight || + destX + width > destWidth || destY + height > destHeight){ + // Handle error: the rectangle is out of bounds + printf("Error copyRectARGB1555 to %d : %d\r\n", destX, destY); + return; + } + + for (uint32_t y = 0; y < height; ++y) { + for (uint32_t x = 0; x < width; ++x) { + // Calculate the source and destination indices + uint32_t srcIndex = (srcY + y) * srcWidth + (srcX + x); + uint32_t destIndex = (destY + y) * destWidth + (destX + x); + + //if (srcBitmap[srcIndex]==TRANSPARENT_COLOR) + // srcBitmap[srcIndex]=0x7FFF; + // Copy the pixel + destBitmap[destIndex] = srcBitmap[srcIndex]; + } + } } */ - -void copyRectI8( - uint8_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, - uint8_t* destBitmap, uint32_t destWidth, uint32_t destHeight, - uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, - uint32_t destX, uint32_t destY) -{ - // Bounds checking - if (srcX + width > srcWidth || srcY + height > srcHeight || - destX + width > destWidth || destY + height > destHeight) { - // Handle error: the rectangle is out of bounds - printf("Error copyRectI8 to %d : %d\r\n", destX, destY); - return; - } - - // Calculate the starting indices once - uint32_t srcStartIndex = srcY * srcWidth + srcX; - uint32_t destStartIndex = destY * destWidth + destX; - - // Copy each row in one operation using memcpy - for (uint32_t y = 0; y < height; ++y) { - memcpy(&destBitmap[destStartIndex + y * destWidth], - &srcBitmap[srcStartIndex + y * srcWidth], - width); - } + +void copyRectI8(uint8_t *srcBitmap, uint32_t srcWidth, uint32_t srcHeight, uint8_t *destBitmap, + uint32_t destWidth, uint32_t destHeight, uint32_t srcX, uint32_t srcY, uint32_t width, + uint32_t height, uint32_t destX, uint32_t destY) { + // Bounds checking + if (srcX + width > srcWidth || srcY + height > srcHeight || destX + width > destWidth || + destY + height > destHeight) { + // Handle error: the rectangle is out of bounds + printf("Error copyRectI8 to %d : %d\r\n", destX, destY); + return; + } + + // Calculate the starting indices once + uint32_t srcStartIndex = srcY * srcWidth + srcX; + uint32_t destStartIndex = destY * destWidth + destX; + + // Copy each row in one operation using memcpy + for (uint32_t y = 0; y < height; ++y) { + memcpy(&destBitmap[destStartIndex + y * destWidth], + &srcBitmap[srcStartIndex + y * srcWidth], width); + } } #include #include -#include // For memcpy - -void copyRectI4( - uint8_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, - uint8_t* destBitmap, uint32_t destWidth, uint32_t destHeight, - uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, - uint32_t destX, uint32_t destY) -{ - // Bounds checking - if (srcX + width > srcWidth || srcY + height > srcHeight || - destX + width > destWidth || destY + height > destHeight) { - // Handle error: the rectangle is out of bounds - printf("Error copyRectI4 from %d:%d to %d:%d srcWidth:%d, srcHeight:%d, destWidth:%d, destHeight:%d \r\n",srcX,srcY, destX, destY, - srcWidth, srcHeight, destWidth, destHeight); - return; - } - - // Determine byte and pixel offsets - uint32_t srcByteOffset = srcX / 2; - uint32_t destByteOffset = destX / 2; - uint32_t srcPixelOffset = srcX % 2; - uint32_t destPixelOffset = destX % 2; - - // Fast path: both srcX and destX align on byte boundaries - if (srcPixelOffset == 0 && destPixelOffset == 0 && width % 2 == 0) { - uint32_t byteWidth = width / 2; // Number of bytes to copy per row - for (uint32_t y = 0; y < height; ++y) { - uint8_t* srcRow = srcBitmap + (srcY + y) * (srcWidth / 2) + srcByteOffset; - uint8_t* destRow = destBitmap + (destY + y) * (destWidth / 2) + destByteOffset; - memcpy(destRow, srcRow, byteWidth); - } - } else { - // Handle cases where srcX or destX are not byte-aligned - for (uint32_t y = 0; y < height; ++y) { - for (uint32_t x = 0; x < width; ++x) { - uint32_t srcIndex = (srcY + y) * (srcWidth / 2) + (srcByteOffset + (x / 2)); - uint32_t destIndex = (destY + y) * (destWidth / 2) + (destByteOffset + (x / 2)); - - uint8_t srcPixel; - if ((srcPixelOffset + x) % 2 == 0) { - srcPixel = (srcBitmap[srcIndex] & 0xF0) >> 4; // High nibble - } else { - srcPixel = srcBitmap[srcIndex] & 0x0F; // Low nibble - } - - if ((destPixelOffset + x) % 2 == 0) { - // Write to high nibble - destBitmap[destIndex] = (destBitmap[destIndex] & 0x0F) | (srcPixel << 4); - } else { - // Write to low nibble - destBitmap[destIndex] = (destBitmap[destIndex] & 0xF0) | srcPixel; - } - } - } - } +#include // For memcpy + +void copyRectI4(uint8_t *srcBitmap, uint32_t srcWidth, uint32_t srcHeight, uint8_t *destBitmap, + uint32_t destWidth, uint32_t destHeight, uint32_t srcX, uint32_t srcY, uint32_t width, + uint32_t height, uint32_t destX, uint32_t destY) { + // Bounds checking + if (srcX + width > srcWidth || srcY + height > srcHeight || destX + width > destWidth || + destY + height > destHeight) { + // Handle error: the rectangle is out of bounds + printf("Error copyRectI4 from %d:%d to %d:%d srcWidth:%d, srcHeight:%d, " + "destWidth:%d, destHeight:%d \r\n", + srcX, srcY, destX, destY, srcWidth, srcHeight, destWidth, destHeight); + return; + } + + // Determine byte and pixel offsets + uint32_t srcByteOffset = srcX / 2; + uint32_t destByteOffset = destX / 2; + uint32_t srcPixelOffset = srcX % 2; + uint32_t destPixelOffset = destX % 2; + + // Fast path: both srcX and destX align on byte boundaries + if (srcPixelOffset == 0 && destPixelOffset == 0 && width % 2 == 0) { + uint32_t byteWidth = width / 2; // Number of bytes to copy per row + for (uint32_t y = 0; y < height; ++y) { + uint8_t *srcRow = srcBitmap + (srcY + y) * (srcWidth / 2) + srcByteOffset; + uint8_t *destRow = destBitmap + (destY + y) * (destWidth / 2) + destByteOffset; + memcpy(destRow, srcRow, byteWidth); + } + } else { + // Handle cases where srcX or destX are not byte-aligned + for (uint32_t y = 0; y < height; ++y) { + for (uint32_t x = 0; x < width; ++x) { + uint32_t srcIndex = (srcY + y) * (srcWidth / 2) + (srcByteOffset + (x / 2)); + uint32_t destIndex = (destY + y) * (destWidth / 2) + (destByteOffset + (x / 2)); + + uint8_t srcPixel; + if ((srcPixelOffset + x) % 2 == 0) { + srcPixel = (srcBitmap[srcIndex] & 0xF0) >> 4; // High nibble + } else { + srcPixel = srcBitmap[srcIndex] & 0x0F; // Low nibble + } + + if ((destPixelOffset + x) % 2 == 0) { + // Write to high nibble + destBitmap[destIndex] = (destBitmap[destIndex] & 0x0F) | (srcPixel << 4); + } else { + // Write to low nibble + destBitmap[destIndex] = (destBitmap[destIndex] & 0xF0) | srcPixel; + } + } + } + } } +void ConvertI8ToRGBA(uint8_t *bitmapI8, uint8_t *rgbaData, uint32_t width, uint32_t height, + MI_RGN_PaletteElement_t *palette) { + for (uint32_t i = 0; i < width * height; ++i) { + uint8_t index = bitmapI8[i]; + // Get RGBA color from the palette + MI_RGN_PaletteElement_t color = palette[index]; - -void ConvertI8ToRGBA(uint8_t* bitmapI8, uint8_t* rgbaData, uint32_t width, uint32_t height, MI_RGN_PaletteElement_t* palette) { - for (uint32_t i = 0; i < width * height; ++i) { - uint8_t index = bitmapI8[i]; - - // Get RGBA color from the palette - MI_RGN_PaletteElement_t color = palette[index]; - - // Assign to RGBA data - rgbaData[i * 4 + 0] = color.u8Red; - rgbaData[i * 4 + 1] = color.u8Green; - rgbaData[i * 4 + 2] = color.u8Blue; - rgbaData[i * 4 + 3] = color.u8Alpha; - } + // Assign to RGBA data + rgbaData[i * 4 + 0] = color.u8Red; + rgbaData[i * 4 + 1] = color.u8Green; + rgbaData[i * 4 + 2] = color.u8Blue; + rgbaData[i * 4 + 3] = color.u8Alpha; + } } -void ConvertI4ToRGBA(uint8_t* bitmapI4, uint8_t* rgbaData, uint32_t width, uint32_t height, MI_RGN_PaletteElement_t* palette) { - uint32_t pixelIndex = 0; - int RowLength = getRowStride(width,4);//the length of one row, it is rounded up to 4 bytes - for (uint32_t y = 0; y < height; ++y) { - for (uint32_t x = 0; x < width; x += 2) { - // Each byte in the I4 bitmap contains two pixels - //uint8_t byte = bitmapI4[(y * (width + 1) / 2) + (x / 2)]; - - uint8_t byte = bitmapI4[y*RowLength + (x / 2)]; - - // Extract the first (high) pixel - uint8_t index1 = (byte & 0xF0) >> 4; - MI_RGN_PaletteElement_t color1 = palette[index1]; - rgbaData[pixelIndex * 4 + 0] = color1.u8Red; - rgbaData[pixelIndex * 4 + 1] = color1.u8Green; - rgbaData[pixelIndex * 4 + 2] = color1.u8Blue; - rgbaData[pixelIndex * 4 + 3] = color1.u8Alpha; - pixelIndex++; - - if (x + 1 < width) { - // Extract the second (low) pixel - uint8_t index2 = byte & 0x0F; - MI_RGN_PaletteElement_t color2 = palette[index2]; - rgbaData[pixelIndex * 4 + 0] = color2.u8Red; - rgbaData[pixelIndex * 4 + 1] = color2.u8Green; - rgbaData[pixelIndex * 4 + 2] = color2.u8Blue; - rgbaData[pixelIndex * 4 + 3] = color2.u8Alpha; - pixelIndex++; - } - } - } +void ConvertI4ToRGBA(uint8_t *bitmapI4, uint8_t *rgbaData, uint32_t width, uint32_t height, + MI_RGN_PaletteElement_t *palette) { + uint32_t pixelIndex = 0; + int RowLength = getRowStride(width, 4); // the length of one row, it is rounded up to 4 bytes + for (uint32_t y = 0; y < height; ++y) { + for (uint32_t x = 0; x < width; x += 2) { + // Each byte in the I4 bitmap contains two pixels + // uint8_t byte = bitmapI4[(y * (width + 1) / 2) + (x / 2)]; + + uint8_t byte = bitmapI4[y * RowLength + (x / 2)]; + + // Extract the first (high) pixel + uint8_t index1 = (byte & 0xF0) >> 4; + MI_RGN_PaletteElement_t color1 = palette[index1]; + rgbaData[pixelIndex * 4 + 0] = color1.u8Red; + rgbaData[pixelIndex * 4 + 1] = color1.u8Green; + rgbaData[pixelIndex * 4 + 2] = color1.u8Blue; + rgbaData[pixelIndex * 4 + 3] = color1.u8Alpha; + pixelIndex++; + + if (x + 1 < width) { + // Extract the second (low) pixel + uint8_t index2 = byte & 0x0F; + MI_RGN_PaletteElement_t color2 = palette[index2]; + rgbaData[pixelIndex * 4 + 0] = color2.u8Red; + rgbaData[pixelIndex * 4 + 1] = color2.u8Green; + rgbaData[pixelIndex * 4 + 2] = color2.u8Blue; + rgbaData[pixelIndex * 4 + 3] = color2.u8Alpha; + pixelIndex++; + } + } + } } -void ConvertI4ToRGBA2(uint8_t* bitmapI4, uint8_t* rgbaData, uint32_t width, uint32_t height, MI_RGN_PaletteElement_t* palette) { - uint32_t pixelIndex = 0; - int RowLength = getRowStride(width, 4); // The length of one row, rounded up to 4 bytes - - for (uint32_t y = 0; y < height; ++y) { - // Calculate the starting position of the current row - uint32_t rowStart = y * RowLength; - - for (uint32_t x = 0; x < width; x += 2) { - // Each byte in the I4 bitmap contains two pixels - uint8_t byte = bitmapI4[rowStart + (x / 2)]; - - // Extract the first (high) pixel - uint8_t index1 = (byte & 0xF0) >> 4; - MI_RGN_PaletteElement_t color1 = palette[index1]; - rgbaData[pixelIndex * 4 + 0] = color1.u8Red; - rgbaData[pixelIndex * 4 + 1] = color1.u8Green; - rgbaData[pixelIndex * 4 + 2] = color1.u8Blue; - rgbaData[pixelIndex * 4 + 3] = color1.u8Alpha; - pixelIndex++; - - if (x + 1 < width) { - // Extract the second (low) pixel - uint8_t index2 = byte & 0x0F; - MI_RGN_PaletteElement_t color2 = palette[index2]; - rgbaData[pixelIndex * 4 + 0] = color2.u8Red; - rgbaData[pixelIndex * 4 + 1] = color2.u8Green; - rgbaData[pixelIndex * 4 + 2] = color2.u8Blue; - rgbaData[pixelIndex * 4 + 3] = color2.u8Alpha; - pixelIndex++; - } - } - } +void ConvertI4ToRGBA2(uint8_t *bitmapI4, uint8_t *rgbaData, uint32_t width, uint32_t height, + MI_RGN_PaletteElement_t *palette) { + uint32_t pixelIndex = 0; + int RowLength = getRowStride(width, 4); // The length of one row, rounded up to 4 bytes + + for (uint32_t y = 0; y < height; ++y) { + // Calculate the starting position of the current row + uint32_t rowStart = y * RowLength; + + for (uint32_t x = 0; x < width; x += 2) { + // Each byte in the I4 bitmap contains two pixels + uint8_t byte = bitmapI4[rowStart + (x / 2)]; + + // Extract the first (high) pixel + uint8_t index1 = (byte & 0xF0) >> 4; + MI_RGN_PaletteElement_t color1 = palette[index1]; + rgbaData[pixelIndex * 4 + 0] = color1.u8Red; + rgbaData[pixelIndex * 4 + 1] = color1.u8Green; + rgbaData[pixelIndex * 4 + 2] = color1.u8Blue; + rgbaData[pixelIndex * 4 + 3] = color1.u8Alpha; + pixelIndex++; + + if (x + 1 < width) { + // Extract the second (low) pixel + uint8_t index2 = byte & 0x0F; + MI_RGN_PaletteElement_t color2 = palette[index2]; + rgbaData[pixelIndex * 4 + 0] = color2.u8Red; + rgbaData[pixelIndex * 4 + 1] = color2.u8Green; + rgbaData[pixelIndex * 4 + 2] = color2.u8Blue; + rgbaData[pixelIndex * 4 + 3] = color2.u8Alpha; + pixelIndex++; + } + } + } } -static uint32_t black_cntr=0; - -void convertBitmap1555ToI4x86( - uint16_t* srcBitmap, uint32_t width, uint32_t height, - uint8_t* destBitmap, MI_RGN_PaletteTable_t* paletteTable) -{ - // Calculate the number of bytes required per line without padding - uint32_t bytesPerLine = getRowStride(width,4);// (width + 1) / 2; // +1 to handle odd width - - for (uint32_t y = 0; y < height; ++y) { - // Add a 4-bit offset for each row - // No Fucking idea why this is different for x86 and Sigmastar - // Maybe the routines that copy the BMP later are incorrect, no time to investigate - uint32_t destOffset = y * bytesPerLine ;//+ (y / 2); // Adjusted to add 4-bit offset for each row - - for (uint32_t x = 0; x < width; ++x) { - uint32_t srcIndex = y * width + x; // Calculate the source index - uint8_t paletteIndex = findClosestPaletteIndex8(srcBitmap[srcIndex], paletteTable); - - // Clamp paletteIndex within the valid range for I4 (0 to 15) - - if (paletteIndex == 0)//Sigmastar reserver - paletteIndex=8;//black - if (paletteIndex == 17)//Transparent color - paletteIndex=15; - - - // Calculate the destination byte and bit position - uint32_t destByteIndex = destOffset + x / 2; - if (x % 2 == 0) { - // Even index: Store in the upper 4 bits - destBitmap[destByteIndex] = (paletteIndex << 4); - } else { - // Odd index: Store in the lower 4 bits - destBitmap[destByteIndex] |= paletteIndex; - } - } - } +static uint32_t black_cntr = 0; + +void convertBitmap1555ToI4x86(uint16_t *srcBitmap, uint32_t width, uint32_t height, + uint8_t *destBitmap, MI_RGN_PaletteTable_t *paletteTable) { + // Calculate the number of bytes required per line without padding + uint32_t bytesPerLine = getRowStride(width, 4); // (width + 1) / 2; // +1 to handle odd width + + for (uint32_t y = 0; y < height; ++y) { + // Add a 4-bit offset for each row + // No Fucking idea why this is different for x86 and Sigmastar + // Maybe the routines that copy the BMP later are incorrect, no time to + // investigate + uint32_t destOffset = y * bytesPerLine; //+ (y / 2); // Adjusted to add + // 4-bit offset for each row + + for (uint32_t x = 0; x < width; ++x) { + uint32_t srcIndex = y * width + x; // Calculate the source index + uint8_t paletteIndex = findClosestPaletteIndex8(srcBitmap[srcIndex], paletteTable); + + // Clamp paletteIndex within the valid range for I4 (0 to 15) + + if (paletteIndex == 0) // Sigmastar reserver + paletteIndex = 8; // black + if (paletteIndex == 17) // Transparent color + paletteIndex = 15; + + // Calculate the destination byte and bit position + uint32_t destByteIndex = destOffset + x / 2; + if (x % 2 == 0) { + // Even index: Store in the upper 4 bits + destBitmap[destByteIndex] = (paletteIndex << 4); + } else { + // Odd index: Store in the lower 4 bits + destBitmap[destByteIndex] |= paletteIndex; + } + } + } } -typedef unsigned char MI_U8; +typedef unsigned char MI_U8; -int getRowStride(int width, int BitsPerPixel){ - int rowLength = width * BitsPerPixel; - int stride = (rowLength + 32 - ((rowLength-1) % 32)) >> 3; +int getRowStride(int width, int BitsPerPixel) { + int rowLength = width * BitsPerPixel; + int stride = (rowLength + 32 - ((rowLength - 1) % 32)) >> 3; #ifdef __SIGMASTAR__ - //This is fundamential difference for sigmastar, since the BMP we get for the font is aligned with a different stride?! - //stride = (stride + 7) & ~7;//Round up to 8 -#endif - return stride; + // This is fundamential difference for sigmastar, since the BMP we get for + // the font is aligned with a different stride?! stride = (stride + 7) & + // ~7;//Round up to 8 +#endif + return stride; } void convertBitmap1555ToI4( - uint16_t* srcBitmap, uint32_t width, uint32_t height, - uint8_t* destBitmap, int singleColor) -{ - MI_RGN_PaletteTable_t* paletteTable=&g_stPaletteTable; - // Calculate the number of bytes required per line without padding + uint16_t *srcBitmap, uint32_t width, uint32_t height, uint8_t *destBitmap, int singleColor) { + MI_RGN_PaletteTable_t *paletteTable = &g_stPaletteTable; + // Calculate the number of bytes required per line without padding - if (singleColor ==-1)//The color that we assume as transparent - singleColor=15; - unsigned char u8Value = 0; - uint32_t u32Stride = (width + 1) / 2; + if (singleColor == -1) // The color that we assume as transparent + singleColor = 15; + unsigned char u8Value = 0; + uint32_t u32Stride = (width + 1) / 2; - int SourceStride=getRowStride(width,16); + int SourceStride = getRowStride(width, 16); - int u32Stride2 = getRowStride(width,4);// rowLength + 32 - ((rowLength-1) % 32)) >> 3; + int u32Stride2 = getRowStride(width, 4); // rowLength + 32 - ((rowLength-1) % 32)) >> 3; - //printf("I4 %d:%d Stride1:%d Stride2:%d \n",width,height,u32Stride , u32Stride2 ); + // printf("I4 %d:%d Stride1:%d Stride2:%d \n",width,height,u32Stride , + // u32Stride2 ); - u32Stride=u32Stride2; - + u32Stride = u32Stride2; + for (uint32_t u32Y = 0; u32Y < height; ++u32Y) { - for (uint32_t u32Y = 0; u32Y < height; ++u32Y) { - - for (int32_t u32X = 0; u32X < width; ++u32X) { - uint32_t srcIndex = u32Y * width + u32X; // Calculate the source index, but what if it is odd ? - // srcIndex = u32Y*SourceStride/2 + u32X; - uint8_t paletteIndex = 15; - if (singleColor>=0 && singleColor<15) - paletteIndex = findClosestPaletteIndexBW(srcBitmap[srcIndex], paletteTable); - else - paletteIndex = findClosestPaletteIndex8(srcBitmap[srcIndex], paletteTable); - - if (paletteIndex == 0)//Sigmastar reserved, just in case - paletteIndex=8;//black + for (int32_t u32X = 0; u32X < width; ++u32X) { + uint32_t srcIndex = + u32Y * width + u32X; // Calculate the source index, but what if it is odd ? + // srcIndex = u32Y*SourceStride/2 + u32X; + uint8_t paletteIndex = 15; + if (singleColor >= 0 && singleColor < 15) + paletteIndex = findClosestPaletteIndexBW(srcBitmap[srcIndex], paletteTable); + else + paletteIndex = findClosestPaletteIndex8(srcBitmap[srcIndex], paletteTable); - //convert to black and white - if (paletteIndex!=15 & paletteIndex>=0){ - paletteIndex=singleColor; - } + if (paletteIndex == 0) // Sigmastar reserved, just in case + paletteIndex = 8; // black + // convert to black and white + if (paletteIndex != 15 & paletteIndex >= 0) { + paletteIndex = singleColor; + } - // No Fucking idea why this is different for x86 and Sigmastar, BUT !!! - //SigmaStar I4 format needs it reversit 4bit pairs. 0x0A, 0x0B needs to be 0XBA -#ifdef __SIGMASTAR__ - if (u32X % 2){ //this is the secret of distorted image !!! + // No Fucking idea why this is different for x86 and Sigmastar, BUT + // !!! SigmaStar I4 format needs it reversit 4bit pairs. 0x0A, + // 0x0B needs to be 0XBA +#ifdef __SIGMASTAR__ + if (u32X % 2) { // this is the secret of distorted image !!! #else - if (u32X % 2==0){ -#endif - u8Value = (*((MI_U8 *)destBitmap + (u32Stride * u32Y) + u32X / 2) & 0x0F) | ((paletteIndex & 0x0f) << 4); - *((MI_U8 *)destBitmap + (u32Stride * u32Y) + u32X / 2) = u8Value; - }else{ - u8Value = (*((MI_U8 *)destBitmap + (u32Stride * u32Y) + u32X / 2) & 0xF0) | (paletteIndex & 0x0f); - *((MI_U8 *)destBitmap + (u32Stride * u32Y) + u32X / 2) = u8Value; - } - } - } + if (u32X % 2 == 0) { +#endif + u8Value = (*((MI_U8 *)destBitmap + (u32Stride * u32Y) + u32X / 2) & 0x0F) | + ((paletteIndex & 0x0f) << 4); + *((MI_U8 *)destBitmap + (u32Stride * u32Y) + u32X / 2) = u8Value; + } else { + u8Value = (*((MI_U8 *)destBitmap + (u32Stride * u32Y) + u32X / 2) & 0xF0) | + (paletteIndex & 0x0f); + *((MI_U8 *)destBitmap + (u32Stride * u32Y) + u32X / 2) = u8Value; + } + } + } } -void setPixelI4(uint8_t* bmpData, uint32_t width, uint32_t x, uint32_t y, uint8_t color, uint32_t rowStride) { - - // Calculate the byte index for the pixel - uint32_t byteIndex = y * rowStride + (x / 2); - - // Determine if it's the high nibble or low nibble -#ifdef __SIGMASTAR__ - if (x % 2 == 1) { -#else - if (x % 2 == 0) { -#endif - // High nibble (first pixel in the byte) - bmpData[byteIndex] = (bmpData[byteIndex] & 0x0F) | (color << 4); - } else { - // Low nibble (second pixel in the byte) - bmpData[byteIndex] = (bmpData[byteIndex] & 0xF0) | (color & 0x0F); - } -} +void setPixelI4( + uint8_t *bmpData, uint32_t width, uint32_t x, uint32_t y, uint8_t color, uint32_t rowStride) { -// Assuming MI_RGN_PaletteTable_t and findClosestPaletteIndex8 are defined elsewhere -void convertRGBAToI4( - uint8_t* srcBitmap, uint32_t width, uint32_t height, - uint8_t* destBitmap, MI_RGN_PaletteTable_t* paletteTable) -{ - unsigned char u8Value = 0; - int u32Stride = getRowStride(width, 4); - - printf("I4 %d:%d Stride:%d\n", width, height, u32Stride); - - for (uint32_t u32Y = 0; u32Y < height; ++u32Y) { - for (int32_t u32X = 0; u32X < width; ++u32X) { - uint32_t srcIndex = (u32Y * width + u32X) * 4; // Calculate the source index (4 bytes per pixel) - - // Extract RGBA values - uint8_t r = srcBitmap[srcIndex + 0]; - uint8_t g = srcBitmap[srcIndex + 1]; - uint8_t b = srcBitmap[srcIndex + 2]; - uint8_t a = srcBitmap[srcIndex + 3]; - - if (a!=0 && r>0) - u8Value=0; - - // Find the closest palette index for the RGBA color - //uint8_t paletteIndex = findClosestPaletteIndex8(r, g, b, a, paletteTable); - uint8_t paletteIndex = findClosestPaletteIndexRGBA(&srcBitmap[srcIndex], paletteTable); - - // Handle specific palette indices as per SigmaStar requirements - // if (paletteIndex == 0) // Sigmastar reserved -// paletteIndex = 8; // Black - if (paletteIndex == 17) // Transparent color - paletteIndex = 15; - - // Handle SigmaStar-specific bit manipulation - /* -#ifdef __SIGMASTAR__ - if (u32X % 2) { // SigmaStar I4 format needs reversed 4-bit pairs + // Calculate the byte index for the pixel + uint32_t byteIndex = y * rowStride + (x / 2); + + // Determine if it's the high nibble or low nibble +#ifdef __SIGMASTAR__ + if (x % 2 == 1) { #else - if (u32X % 2 == 0) { // Other platforms (non-SigmaStar) -#endif - u8Value = (*(destBitmap + (u32Stride * u32Y) + u32X / 2) & 0x0F) | ((paletteIndex & 0x0F) << 4); - *(destBitmap + (u32Stride * u32Y) + u32X / 2) = u8Value; - } else { - u8Value = (*(destBitmap + (u32Stride * u32Y) + u32X / 2) & 0xF0) | (paletteIndex & 0x0F); - *(destBitmap + (u32Stride * u32Y) + u32X / 2) = u8Value; - } - */ - setPixelI4(destBitmap,width, u32X,u32Y, paletteIndex , u32Stride); - } - } + if (x % 2 == 0) { +#endif + // High nibble (first pixel in the byte) + bmpData[byteIndex] = (bmpData[byteIndex] & 0x0F) | (color << 4); + } else { + // Low nibble (second pixel in the byte) + bmpData[byteIndex] = (bmpData[byteIndex] & 0xF0) | (color & 0x0F); + } } +// Assuming MI_RGN_PaletteTable_t and findClosestPaletteIndex8 are defined +// elsewhere +void convertRGBAToI4(uint8_t *srcBitmap, uint32_t width, uint32_t height, uint8_t *destBitmap, + MI_RGN_PaletteTable_t *paletteTable) { + unsigned char u8Value = 0; + int u32Stride = getRowStride(width, 4); + + printf("I4 %d:%d Stride:%d\n", width, height, u32Stride); + + for (uint32_t u32Y = 0; u32Y < height; ++u32Y) { + for (int32_t u32X = 0; u32X < width; ++u32X) { + uint32_t srcIndex = + (u32Y * width + u32X) * 4; // Calculate the source index (4 bytes per pixel) + + // Extract RGBA values + uint8_t r = srcBitmap[srcIndex + 0]; + uint8_t g = srcBitmap[srcIndex + 1]; + uint8_t b = srcBitmap[srcIndex + 2]; + uint8_t a = srcBitmap[srcIndex + 3]; + + if (a != 0 && r > 0) + u8Value = 0; + + // Find the closest palette index for the RGBA color + // uint8_t paletteIndex = findClosestPaletteIndex8(r, g, b, a, + // paletteTable); + uint8_t paletteIndex = findClosestPaletteIndexRGBA(&srcBitmap[srcIndex], paletteTable); + + // Handle specific palette indices as per SigmaStar requirements + // if (paletteIndex == 0) // Sigmastar reserved + // paletteIndex = 8; // Black + if (paletteIndex == 17) // Transparent color + paletteIndex = 15; + + // Handle SigmaStar-specific bit manipulation + /* + #ifdef __SIGMASTAR__ + if (u32X % 2) { // SigmaStar I4 format needs reversed 4-bit pairs + #else + if (u32X % 2 == 0) { // Other platforms (non-SigmaStar) + #endif + u8Value = (*(destBitmap + (u32Stride * u32Y) + u32X / 2) & 0x0F) + | + ((paletteIndex & 0x0F) << 4); + *(destBitmap + (u32Stride * u32Y) + u32X / 2) = u8Value; + } else { + u8Value = (*(destBitmap + (u32Stride * u32Y) + u32X / 2) & 0xF0) + | (paletteIndex & 0x0F); + *(destBitmap + (u32Stride * u32Y) + u32X / 2) = u8Value; + } + */ + setPixelI4(destBitmap, width, u32X, u32Y, paletteIndex, u32Stride); + } + } +} - uint16_t Transform_OVERLAY_WIDTH; - uint16_t Transform_OVERLAY_HEIGHT; - float Transform_Roll; - float Transform_Pitch; +uint16_t Transform_OVERLAY_WIDTH; +uint16_t Transform_OVERLAY_HEIGHT; +float Transform_Roll; +float Transform_Pitch; void rotate_point(Point original, Point img_center, double angle_degrees, Point *rotated) { - // Translate the point to move the center to the origin - int x_translated = original.x - img_center.x; - int y_translated = original.y - img_center.y; + // Translate the point to move the center to the origin + int x_translated = original.x - img_center.x; + int y_translated = original.y - img_center.y; - // Convert the angle from degrees to radians - double angle_radians = angle_degrees * M_PI / 180.0; + // Convert the angle from degrees to radians + double angle_radians = angle_degrees * M_PI / 180.0; - // Compute the rotated positions using the rotation matrix - double cos_theta = cos(angle_radians); - double sin_theta = sin(angle_radians); + // Compute the rotated positions using the rotation matrix + double cos_theta = cos(angle_radians); + double sin_theta = sin(angle_radians); - // Apply the rotation - rotated->x = (int)(x_translated * cos_theta - y_translated * sin_theta); - rotated->y = (int)(x_translated * sin_theta + y_translated * cos_theta); + // Apply the rotation + rotated->x = (int)(x_translated * cos_theta - y_translated * sin_theta); + rotated->y = (int)(x_translated * sin_theta + y_translated * cos_theta); - // Translate the rotated point back to the original center - rotated->x += img_center.x; - rotated->y += img_center.y; + // Translate the rotated point back to the original center + rotated->x += img_center.x; + rotated->y += img_center.y; } - -void ApplyTransform(int posX0, int posY0, uint32_t *posX_R, uint32_t *posY_R){ - uint32_t width = Transform_OVERLAY_WIDTH; - uint32_t height=Transform_OVERLAY_HEIGHT; - // Apply Transform - int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; - Point img_center = {Transform_OVERLAY_WIDTH / 2, Transform_OVERLAY_HEIGHT / 2}; // Center of the image - // Define the four corners of the rectangle before rotation - Point A = {posX0, posY0-OffsY}; - // Rotate each corner around the center - Point rotated_A; - rotate_point(A, img_center, Transform_Roll, &rotated_A); - *posX_R=rotated_A.x; - *posY_R=rotated_A.y; - +void ApplyTransform(int posX0, int posY0, uint32_t *posX_R, uint32_t *posY_R) { + uint32_t width = Transform_OVERLAY_WIDTH; + uint32_t height = Transform_OVERLAY_HEIGHT; + // Apply Transform + int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; + Point img_center = { + Transform_OVERLAY_WIDTH / 2, Transform_OVERLAY_HEIGHT / 2}; // Center of the image + // Define the four corners of the rectangle before rotation + Point A = {posX0, posY0 - OffsY}; + // Rotate each corner around the center + Point rotated_A; + rotate_point(A, img_center, Transform_Roll, &rotated_A); + *posX_R = rotated_A.x; + *posY_R = rotated_A.y; } +void drawLine( + uint8_t *bmpData, int posX0, int posY0, int posX1, int posY1, uint8_t color, int thickness) { -void drawLine(uint8_t* bmpData, int posX0, int posY0, int posX1, int posY1, uint8_t color, int thickness) { + uint32_t width = Transform_OVERLAY_WIDTH; + uint32_t height = Transform_OVERLAY_HEIGHT; + // Apply Transform + int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; + Point img_center = { + Transform_OVERLAY_WIDTH / 2, Transform_OVERLAY_HEIGHT / 2}; // Center of the image - - uint32_t width = Transform_OVERLAY_WIDTH; - uint32_t height=Transform_OVERLAY_HEIGHT; - // Apply Transform - int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; - Point img_center = {Transform_OVERLAY_WIDTH / 2, Transform_OVERLAY_HEIGHT / 2}; // Center of the image + // Define the four corners of the rectangle before rotation + Point A = {posX0, posY0 - OffsY}; + Point B = {posX1, posY1 - OffsY}; - // Define the four corners of the rectangle before rotation - Point A = {posX0, posY0-OffsY}; - Point B = {posX1, posY1-OffsY}; - + // Rotate each corner around the center + Point rotated_A, rotated_B; + rotate_point(A, img_center, Transform_Roll, &rotated_A); + rotate_point(B, img_center, Transform_Roll, &rotated_B); - // Rotate each corner around the center - Point rotated_A, rotated_B; - rotate_point(A, img_center, Transform_Roll, &rotated_A); - rotate_point(B, img_center, Transform_Roll, &rotated_B); - + drawLineI4(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y, color, + thickness); // Right side - drawLineI4(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y, color,thickness); // Right side - - return ; + return; } -void drawThickLineI4(uint8_t* bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1, uint8_t color, int thickness) { - for (int i = -thickness / 2; i <= thickness / 2; i++) { - for (int j = -thickness / 2; j <= thickness / 2; j++) { - drawLineI4(bmpData, width, height, x0 + i, y0 + j, x1 + i, y1 + j, color,1); - } - } +void drawThickLineI4(uint8_t *bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, + int y1, uint8_t color, int thickness) { + for (int i = -thickness / 2; i <= thickness / 2; i++) { + for (int j = -thickness / 2; j <= thickness / 2; j++) { + drawLineI4(bmpData, width, height, x0 + i, y0 + j, x1 + i, y1 + j, color, 1); + } + } } // Helper function to calculate bounding box -void getBoundingBox(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3, int *minX, int *minY, int *maxX, int *maxY) { - *minX = x0 < x1 ? (x0 < x2 ? (x0 < x3 ? x0 : x3) : (x2 < x3 ? x2 : x3)) : (x1 < x2 ? (x1 < x3 ? x1 : x3) : (x2 < x3 ? x2 : x3)); - *minY = y0 < y1 ? (y0 < y2 ? (y0 < y3 ? y0 : y3) : (y2 < y3 ? y2 : y3)) : (y1 < y2 ? (y1 < y3 ? y1 : y3) : (y2 < y3 ? y2 : y3)); - *maxX = x0 > x1 ? (x0 > x2 ? (x0 > x3 ? x0 : x3) : (x2 > x3 ? x2 : x3)) : (x1 > x2 ? (x1 > x3 ? x1 : x3) : (x2 > x3 ? x2 : x3)); - *maxY = y0 > y1 ? (y0 > y2 ? (y0 > y3 ? y0 : y3) : (y2 > y3 ? y2 : y3)) : (y1 > y2 ? (y1 > y3 ? y1 : y3) : (y2 > y3 ? y2 : y3)); +void getBoundingBox(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3, int *minX, + int *minY, int *maxX, int *maxY) { + *minX = x0 < x1 ? (x0 < x2 ? (x0 < x3 ? x0 : x3) : (x2 < x3 ? x2 : x3)) + : (x1 < x2 ? (x1 < x3 ? x1 : x3) : (x2 < x3 ? x2 : x3)); + *minY = y0 < y1 ? (y0 < y2 ? (y0 < y3 ? y0 : y3) : (y2 < y3 ? y2 : y3)) + : (y1 < y2 ? (y1 < y3 ? y1 : y3) : (y2 < y3 ? y2 : y3)); + *maxX = x0 > x1 ? (x0 > x2 ? (x0 > x3 ? x0 : x3) : (x2 > x3 ? x2 : x3)) + : (x1 > x2 ? (x1 > x3 ? x1 : x3) : (x2 > x3 ? x2 : x3)); + *maxY = y0 > y1 ? (y0 > y2 ? (y0 > y3 ? y0 : y3) : (y2 > y3 ? y2 : y3)) + : (y1 > y2 ? (y1 > y3 ? y1 : y3) : (y2 > y3 ? y2 : y3)); } -// Function to check if a point is inside the region using the winding number algorithm -int isPointInPolygon(int x, int y, int* vx, int* vy) { - int windingNumber = 0; - - for (int i = 0; i < 4; i++) { - int x0 = vx[i]; - int y0 = vy[i]; - int x1 = vx[(i + 1) % 4]; - int y1 = vy[(i + 1) % 4]; - - if (y0 <= y) { - if (y1 > y && (x1 - x0) * (y - y0) - (y1 - y0) * (x - x0) > 0) { - windingNumber++; - } - } else { - if (y1 <= y && (x1 - x0) * (y - y0) - (y1 - y0) * (x - x0) < 0) { - windingNumber--; - } - } - } - - return windingNumber != 0; +// Function to check if a point is inside the region using the winding number +// algorithm +int isPointInPolygon(int x, int y, int *vx, int *vy) { + int windingNumber = 0; + + for (int i = 0; i < 4; i++) { + int x0 = vx[i]; + int y0 = vy[i]; + int x1 = vx[(i + 1) % 4]; + int y1 = vy[(i + 1) % 4]; + + if (y0 <= y) { + if (y1 > y && (x1 - x0) * (y - y0) - (y1 - y0) * (x - x0) > 0) { + windingNumber++; + } + } else { + if (y1 <= y && (x1 - x0) * (y - y0) - (y1 - y0) * (x - x0) < 0) { + windingNumber--; + } + } + } + + return windingNumber != 0; } // Function to fill the region in the BMP -void fillRegionI4(uint8_t* bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3, uint8_t color) { - int minX, minY, maxX, maxY; - getBoundingBox(x0, y0, x1, y1, x2, y2, x3, y3, &minX, &minY, &maxX, &maxY); - - int vx[4] = {x0, x1, x2, x3}; - int vy[4] = {y0, y1, y2, y3}; - - uint16_t rowStride = getRowStride(width, 4); - - // Iterate through each pixel in the bounding box - for (int y = minY; y <= maxY; y++) { - for (int x = minX; x <= maxX; x++) { - if (isPointInPolygon(x, y, vx, vy)) { - if (x >= 0 && x < width && y >= 0 && y < height) { - uint32_t byteIndex = y * rowStride + (x / 2); - if (x % 2 == 0) { - bmpData[byteIndex] = (bmpData[byteIndex] & 0x0F) | (color << 4); - } else { - bmpData[byteIndex] = (bmpData[byteIndex] & 0xF0) | (color & 0x0F); - } - } - } - } - } +void fillRegionI4(uint8_t *bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1, + int x2, int y2, int x3, int y3, uint8_t color) { + int minX, minY, maxX, maxY; + getBoundingBox(x0, y0, x1, y1, x2, y2, x3, y3, &minX, &minY, &maxX, &maxY); + + int vx[4] = {x0, x1, x2, x3}; + int vy[4] = {y0, y1, y2, y3}; + + uint16_t rowStride = getRowStride(width, 4); + + // Iterate through each pixel in the bounding box + for (int y = minY; y <= maxY; y++) { + for (int x = minX; x <= maxX; x++) { + if (isPointInPolygon(x, y, vx, vy)) { + if (x >= 0 && x < width && y >= 0 && y < height) { + uint32_t byteIndex = y * rowStride + (x / 2); + if (x % 2 == 0) { + bmpData[byteIndex] = (bmpData[byteIndex] & 0x0F) | (color << 4); + } else { + bmpData[byteIndex] = (bmpData[byteIndex] & 0xF0) | (color & 0x0F); + } + } + } + } + } } -void drawRectangleI4(uint8_t* bmpData, int posX, int posY, int rectWidth, int rectHeight, uint8_t color, int thickness) { - - - uint32_t width = Transform_OVERLAY_WIDTH; - uint32_t height=Transform_OVERLAY_HEIGHT; - - - // Apply Transform - int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; - Point img_center = {Transform_OVERLAY_WIDTH / 2, Transform_OVERLAY_HEIGHT / 2}; // Center of the image - - // Define the four corners of the rectangle before rotation - Point A = {posX, posY - OffsY}; - Point B = {posX + rectWidth, posY - OffsY}; - Point C = {posX + rectWidth, posY + rectHeight - OffsY}; - Point D = {posX, posY + rectHeight - OffsY}; - - // Rotate each corner around the center - Point rotated_A, rotated_B, rotated_C, rotated_D; - rotate_point(A, img_center, Transform_Roll, &rotated_A); - rotate_point(B, img_center, Transform_Roll, &rotated_B); - rotate_point(C, img_center, Transform_Roll, &rotated_C); - rotate_point(D, img_center, Transform_Roll, &rotated_D); - - //Old way - if (rectHeight==1){ - if (color==COLOR_WHITE) - drawLineI4AA(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y); // Top side - else - drawLineI4(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y, color,1); // Top side - return ; - } - if (rectWidth==1){ - if (color==COLOR_WHITE) - drawLineI4AA(bmpData, width, height, rotated_B.x, rotated_B.y, rotated_C.x, rotated_C.y); // Right side - else - drawLineI4(bmpData, width, height, rotated_B.x, rotated_B.y, rotated_C.x, rotated_C.y, color,1); // Right side - return ; - } - - // Draw the four sides of the rectangle - if (thickness==1){ - if (color==COLOR_WHITE){ - drawLineI4AA(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y); // Top side - drawLineI4AA(bmpData, width, height, rotated_B.x, rotated_B.y, rotated_C.x, rotated_C.y); // Right side - drawLineI4AA(bmpData, width, height, rotated_C.x, rotated_C.y, rotated_D.x, rotated_D.y); // Bottom side - drawLineI4AA(bmpData, width, height, rotated_D.x, rotated_D.y, rotated_A.x, rotated_A.y); // Left side - }else{ - drawLineI4(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y, color,1); // Top side - drawLineI4(bmpData, width, height, rotated_B.x, rotated_B.y, rotated_C.x, rotated_C.y, color,1); // Right side - drawLineI4(bmpData, width, height, rotated_C.x, rotated_C.y, rotated_D.x, rotated_D.y, color,1); // Bottom side - drawLineI4(bmpData, width, height, rotated_D.x, rotated_D.y, rotated_A.x, rotated_A.y, color,1); // Left side - } - }else if (thickness>=99){ - fillRegionI4(bmpData, width, height,rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y,rotated_C.x, rotated_C.y, rotated_D.x, rotated_D.y,color); - }else{ - drawThickLineI4(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y, color, thickness); // Top side - drawThickLineI4(bmpData, width, height, rotated_B.x, rotated_B.y, rotated_C.x, rotated_C.y, color, thickness); // Right side - drawThickLineI4(bmpData, width, height, rotated_C.x, rotated_C.y, rotated_D.x, rotated_D.y, color, thickness); // Bottom side - drawThickLineI4(bmpData, width, height, rotated_D.x, rotated_D.y, rotated_A.x, rotated_A.y, color, thickness); // Left side - } +void drawRectangleI4(uint8_t *bmpData, int posX, int posY, int rectWidth, int rectHeight, + uint8_t color, int thickness) { + + uint32_t width = Transform_OVERLAY_WIDTH; + uint32_t height = Transform_OVERLAY_HEIGHT; + + // Apply Transform + int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; + Point img_center = { + Transform_OVERLAY_WIDTH / 2, Transform_OVERLAY_HEIGHT / 2}; // Center of the image + + // Define the four corners of the rectangle before rotation + Point A = {posX, posY - OffsY}; + Point B = {posX + rectWidth, posY - OffsY}; + Point C = {posX + rectWidth, posY + rectHeight - OffsY}; + Point D = {posX, posY + rectHeight - OffsY}; + + // Rotate each corner around the center + Point rotated_A, rotated_B, rotated_C, rotated_D; + rotate_point(A, img_center, Transform_Roll, &rotated_A); + rotate_point(B, img_center, Transform_Roll, &rotated_B); + rotate_point(C, img_center, Transform_Roll, &rotated_C); + rotate_point(D, img_center, Transform_Roll, &rotated_D); + + // Old way + if (rectHeight == 1) { + if (color == COLOR_WHITE) + drawLineI4AA(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, + rotated_B.y); // Top side + else + drawLineI4(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y, + color, + 1); // Top side + return; + } + if (rectWidth == 1) { + if (color == COLOR_WHITE) + drawLineI4AA(bmpData, width, height, rotated_B.x, rotated_B.y, rotated_C.x, + rotated_C.y); // Right side + else + drawLineI4(bmpData, width, height, rotated_B.x, rotated_B.y, rotated_C.x, rotated_C.y, + color, + 1); // Right side + return; + } + + // Draw the four sides of the rectangle + if (thickness == 1) { + if (color == COLOR_WHITE) { + drawLineI4AA(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, + rotated_B.y); // Top side + drawLineI4AA(bmpData, width, height, rotated_B.x, rotated_B.y, rotated_C.x, + rotated_C.y); // Right side + drawLineI4AA(bmpData, width, height, rotated_C.x, rotated_C.y, rotated_D.x, + rotated_D.y); // Bottom side + drawLineI4AA(bmpData, width, height, rotated_D.x, rotated_D.y, rotated_A.x, + rotated_A.y); // Left side + } else { + drawLineI4(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y, + color, + 1); // Top side + drawLineI4(bmpData, width, height, rotated_B.x, rotated_B.y, rotated_C.x, rotated_C.y, + color, + 1); // Right side + drawLineI4(bmpData, width, height, rotated_C.x, rotated_C.y, rotated_D.x, rotated_D.y, + color, + 1); // Bottom side + drawLineI4(bmpData, width, height, rotated_D.x, rotated_D.y, rotated_A.x, rotated_A.y, + color, + 1); // Left side + } + } else if (thickness >= 99) { + fillRegionI4(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y, + rotated_C.x, rotated_C.y, rotated_D.x, rotated_D.y, color); + } else { + drawThickLineI4(bmpData, width, height, rotated_A.x, rotated_A.y, rotated_B.x, rotated_B.y, + color, + thickness); // Top side + drawThickLineI4(bmpData, width, height, rotated_B.x, rotated_B.y, rotated_C.x, rotated_C.y, + color, + thickness); // Right side + drawThickLineI4(bmpData, width, height, rotated_C.x, rotated_C.y, rotated_D.x, rotated_D.y, + color, + thickness); // Bottom side + drawThickLineI4(bmpData, width, height, rotated_D.x, rotated_D.y, rotated_A.x, rotated_A.y, + color, + thickness); // Left side + } } -void drawLineI4Ex(uint8_t* bmpData, uint32_t width, uint32_t height, Point A, Point B, uint8_t color) { +void drawLineI4Ex( + uint8_t *bmpData, uint32_t width, uint32_t height, Point A, Point B, uint8_t color) { - //Apply Transform + // Apply Transform - int OffsY= sin((Transform_Pitch) * (M_PI / 180.0))*400; - Point img_center = {Transform_OVERLAY_WIDTH/2, Transform_OVERLAY_HEIGHT/2}; // Center of the image (example) - Point original_point = A; // Example point - Point original_point2 = B; // Example point - //original_point.y-=OffsY; - //original_point2.y-=OffsY; - Point rotated_pointA,rotated_pointB; + int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; + Point img_center = { + Transform_OVERLAY_WIDTH / 2, Transform_OVERLAY_HEIGHT / 2}; // Center of the image (example) + Point original_point = A; // Example point + Point original_point2 = B; // Example point + // original_point.y-=OffsY; + // original_point2.y-=OffsY; + Point rotated_pointA, rotated_pointB; - int x_rotated, y_rotated; + int x_rotated, y_rotated; - rotate_point(original_point, img_center, Transform_Roll, &rotated_pointA); - rotate_point(original_point2, img_center, Transform_Roll, &rotated_pointB); + rotate_point(original_point, img_center, Transform_Roll, &rotated_pointA); + rotate_point(original_point2, img_center, Transform_Roll, &rotated_pointB); - drawLineI4(bmpData, width, height,rotated_pointA.x,rotated_pointA.y, - rotated_pointB.x, rotated_pointB.y,color,1 ); + drawLineI4(bmpData, width, height, rotated_pointA.x, rotated_pointA.y, rotated_pointB.x, + rotated_pointB.y, color, 1); } - - //--------------------UGLY ----------------- - uint8_t* _bmpData; - uint32_t _width; - uint32_t _height; - int _rowstride; - int _color; - void plot_pixel(int x, int y){ - if (x<0 || x>_width) - return; - - // Set the pixel at (x0, y0) - if (x >= 0 && x < _width && y >= 0 && y < _height) { - uint32_t byteIndex = y * _rowstride + (x / 2); - // Determine if it's the high nibble or low nibble - if (x % 2 == 0) { - _bmpData[byteIndex] = (_bmpData[byteIndex] & 0x0F) | (_color << 4);// High nibble (first pixel in the byte) - } else { - _bmpData[byteIndex] = (_bmpData[byteIndex] & 0xF0) | (_color & 0x0F); - } - } - - } - - void plot_pen_pixel( int x, int y, int pen_width) - { - switch (pen_width) - { - case 1 : plot_pixel(x,y); - break; - - case 2 : { - plot_pixel(x , y ); - plot_pixel(x + 1, y ); - plot_pixel(x + 1, y + 1); - plot_pixel(x , y + 1); - } - break; - - case 3 : { - plot_pixel(x , y - 1); - plot_pixel(x - 1, y - 1); - plot_pixel(x + 1, y - 1); - - plot_pixel(x , y ); - plot_pixel(x - 1, y ); - plot_pixel(x + 1, y ); - - plot_pixel(x , y + 1); - plot_pixel(x - 1, y + 1); - plot_pixel(x + 1, y + 1); - } - break; - - default : plot_pixel(x,y); - break; - } - } - - - - void line_segment(int x1, int y1, int x2, int y2, int width){ - int steep = 0; - int sx = ((x2 - x1) > 0) ? 1 : -1; - int sy = ((y2 - y1) > 0) ? 1 : -1; - int dx = abs(x2 - x1); - int dy = abs(y2 - y1); - - if (dy > dx) - { - int temp = x1; - x1 = y1; - y1 = temp; - temp = dx; - dx = dy; - dy = temp; - temp=sx; - sx = sy; - sy = temp; - steep = 1; - } - - int e = 2 * dy - dx; - - for (int i = 0; i < dx; ++i) - { - if (steep) - plot_pen_pixel(y1,x1,width); - else - plot_pen_pixel(x1,y1,width); - - while (e >= 0) - { - y1 += sy; - e -= (dx << 1); - } - - x1 += sx; - e += (dy << 1); - } - - //plot_pen_pixel(x2,y2, width); - } - - -void drawLineI4(uint8_t* bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1, uint8_t color, int thickness) { - int dx = abs(x1 - x0); - int dy = abs(y1 - y0); - int sx = x0 < x1 ? 1 : -1; - int sy = y0 < y1 ? 1 : -1; - int err = (dx > dy ? dx : -dy) / 2; - int e2; - uint16_t rowStride=getRowStride(width,4); - if (x0<0 || x0>width) - return; - if (x1<0 || x1>width || y0<0 || y0>height || y1<0 || y1>height) - return; - - _bmpData = bmpData; - _width =width; - _height = height; - _rowstride=rowStride; - _color = color; - line_segment(x0,y0,x1,y1,thickness); - return; -// if (color==COLOR_WHITE) -// return drawLineI4AA( bmpData, width, height, x0, y0, x1, y1); - while (1) { - // Set the pixel at (x0, y0) - if (x0 >= 0 && x0 < width && y0 >= 0 && y0 < height) { - //setPixelI4(bmpData, width, x0, y0, color); - // Calculate the byte index for the pixel - uint32_t byteIndex = y0 * rowStride + (x0 / 2); - - // Determine if it's the high nibble or low nibble - if (x0 % 2 == 0) { - // High nibble (first pixel in the byte) - bmpData[byteIndex] = (bmpData[byteIndex] & 0x0F) | (color << 4); - } else { - // Low nibble (second pixel in the byte) - bmpData[byteIndex] = (bmpData[byteIndex] & 0xF0) | (color & 0x0F); - } - } - - // If we've reached the end point, break out of the loop - if (x0 == x1 && y0 == y1) break; - - e2 = err; - if (e2 > -dx) { - err -= dy; - x0 += sx; - } - if (e2 < dy) { - err += dx; - y0 += sy; - } - } +uint8_t *_bmpData; +uint32_t _width; +uint32_t _height; +int _rowstride; +int _color; + +void plot_pixel(int x, int y) { + if (x < 0 || x > _width) + return; + + // Set the pixel at (x0, y0) + if (x >= 0 && x < _width && y >= 0 && y < _height) { + uint32_t byteIndex = y * _rowstride + (x / 2); + // Determine if it's the high nibble or low nibble + if (x % 2 == 0) { + _bmpData[byteIndex] = (_bmpData[byteIndex] & 0x0F) | + (_color << 4); // High nibble (first pixel in the byte) + } else { + _bmpData[byteIndex] = (_bmpData[byteIndex] & 0xF0) | (_color & 0x0F); + } + } } +void plot_pen_pixel(int x, int y, int pen_width) { + switch (pen_width) { + case 1: + plot_pixel(x, y); + break; + + case 2: { + plot_pixel(x, y); + plot_pixel(x + 1, y); + plot_pixel(x + 1, y + 1); + plot_pixel(x, y + 1); + } break; + + case 3: { + plot_pixel(x, y - 1); + plot_pixel(x - 1, y - 1); + plot_pixel(x + 1, y - 1); + + plot_pixel(x, y); + plot_pixel(x - 1, y); + plot_pixel(x + 1, y); + + plot_pixel(x, y + 1); + plot_pixel(x - 1, y + 1); + plot_pixel(x + 1, y + 1); + } break; + + default: + plot_pixel(x, y); + break; + } +} +void line_segment(int x1, int y1, int x2, int y2, int width) { + int steep = 0; + int sx = ((x2 - x1) > 0) ? 1 : -1; + int sy = ((y2 - y1) > 0) ? 1 : -1; + int dx = abs(x2 - x1); + int dy = abs(y2 - y1); + + if (dy > dx) { + int temp = x1; + x1 = y1; + y1 = temp; + temp = dx; + dx = dy; + dy = temp; + temp = sx; + sx = sy; + sy = temp; + steep = 1; + } + + int e = 2 * dy - dx; + + for (int i = 0; i < dx; ++i) { + if (steep) + plot_pen_pixel(y1, x1, width); + else + plot_pen_pixel(x1, y1, width); + + while (e >= 0) { + y1 += sy; + e -= (dx << 1); + } + + x1 += sx; + e += (dy << 1); + } + + // plot_pen_pixel(x2,y2, width); +} + +void drawLineI4(uint8_t *bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1, + uint8_t color, int thickness) { + int dx = abs(x1 - x0); + int dy = abs(y1 - y0); + int sx = x0 < x1 ? 1 : -1; + int sy = y0 < y1 ? 1 : -1; + int err = (dx > dy ? dx : -dy) / 2; + int e2; + uint16_t rowStride = getRowStride(width, 4); + if (x0 < 0 || x0 > width) + return; + if (x1 < 0 || x1 > width || y0 < 0 || y0 > height || y1 < 0 || y1 > height) + return; + + _bmpData = bmpData; + _width = width; + _height = height; + _rowstride = rowStride; + _color = color; + line_segment(x0, y0, x1, y1, thickness); + return; + // if (color==COLOR_WHITE) + // return drawLineI4AA( bmpData, width, height, x0, y0, x1, y1); + while (1) { + // Set the pixel at (x0, y0) + if (x0 >= 0 && x0 < width && y0 >= 0 && y0 < height) { + // setPixelI4(bmpData, width, x0, y0, color); + // Calculate the byte index for the pixel + uint32_t byteIndex = y0 * rowStride + (x0 / 2); + + // Determine if it's the high nibble or low nibble + if (x0 % 2 == 0) { + // High nibble (first pixel in the byte) + bmpData[byteIndex] = (bmpData[byteIndex] & 0x0F) | (color << 4); + } else { + // Low nibble (second pixel in the byte) + bmpData[byteIndex] = (bmpData[byteIndex] & 0xF0) | (color & 0x0F); + } + } + + // If we've reached the end point, break out of the loop + if (x0 == x1 && y0 == y1) + break; + + e2 = err; + if (e2 > -dx) { + err -= dy; + x0 += sx; + } + if (e2 < dy) { + err += dx; + y0 += sy; + } + } +} // Function to plot a pixel with a specified grayscale level -void setPixelI4AA(uint8_t* bmpData, uint32_t width, uint32_t height, int x, int y, uint8_t color) { - uint16_t rowStride = getRowStride(width, 4); - if (x >= 0 && x < width && y >= 0 && y < height) { - uint32_t byteIndex = y * rowStride + (x / 2); - if (x % 2 == 0) { - bmpData[byteIndex] = (bmpData[byteIndex] & 0x0F) | (color << 4); - } else { - bmpData[byteIndex] = (bmpData[byteIndex] & 0xF0) | (color & 0x0F); - } - } +void setPixelI4AA(uint8_t *bmpData, uint32_t width, uint32_t height, int x, int y, uint8_t color) { + uint16_t rowStride = getRowStride(width, 4); + if (x >= 0 && x < width && y >= 0 && y < height) { + uint32_t byteIndex = y * rowStride + (x / 2); + if (x % 2 == 0) { + bmpData[byteIndex] = (bmpData[byteIndex] & 0x0F) | (color << 4); + } else { + bmpData[byteIndex] = (bmpData[byteIndex] & 0xF0) | (color & 0x0F); + } + } } // Function to draw an anti-aliased line -void drawLineI4AA(uint8_t* bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1) { - int dx = abs(x1 - x0); - int dy = abs(y1 - y0); - int sx = x0 < x1 ? 1 : -1; - int sy = y0 < y1 ? 1 : -1; - int err = dx - dy; - - float ed = (dx + dy == 0) ? 1.0f : sqrtf((float)dx * dx + (float)dy * dy); - - while (1) { - // Calculate the intensity of the color based on the distance to the actual line - float err2 = abs(err - dx + dy) / ed; - uint8_t color = COLOR_WHITE; - - if (err2 > 0.9f) { - - color = COLOR_GRAY_Dark; - } else if (err2 > 0.7f) { - // color = COLOR_GRAY_Darker; - color = COLOR_GRAY_Dark; - } else if (err2 > 0.5f) { - color = COLOR_GRAY_Dark; - } else if (err2 > 0.3f) { - color = COLOR_GRAY_Dark; - } else if (err2 > 0.1f) { - color = COLOR_GRAY_Light; - } else { - color = COLOR_WHITE; - } - - // Set the pixel at the current position with the calculated color - setPixelI4AA(bmpData, width, height, x0, y0, color); - - // If we've reached the end point, break out of the loop - if (x0 == x1 && y0 == y1) break; - - int e2 = err; - if (e2 * 2 > -dy) { - err -= dy; - x0 += sx; - } - if (e2 * 2 < dx) { - err += dx; - y0 += sy; - } - } +void drawLineI4AA( + uint8_t *bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1) { + int dx = abs(x1 - x0); + int dy = abs(y1 - y0); + int sx = x0 < x1 ? 1 : -1; + int sy = y0 < y1 ? 1 : -1; + int err = dx - dy; + + float ed = (dx + dy == 0) ? 1.0f : sqrtf((float)dx * dx + (float)dy * dy); + + while (1) { + // Calculate the intensity of the color based on the distance to the + // actual line + float err2 = abs(err - dx + dy) / ed; + uint8_t color = COLOR_WHITE; + + if (err2 > 0.9f) { + + color = COLOR_GRAY_Dark; + } else if (err2 > 0.7f) { + // color = COLOR_GRAY_Darker; + color = COLOR_GRAY_Dark; + } else if (err2 > 0.5f) { + color = COLOR_GRAY_Dark; + } else if (err2 > 0.3f) { + color = COLOR_GRAY_Dark; + } else if (err2 > 0.1f) { + color = COLOR_GRAY_Light; + } else { + color = COLOR_WHITE; + } + + // Set the pixel at the current position with the calculated color + setPixelI4AA(bmpData, width, height, x0, y0, color); + + // If we've reached the end point, break out of the loop + if (x0 == x1 && y0 == y1) + break; + + int e2 = err; + if (e2 * 2 > -dy) { + err -= dy; + x0 += sx; + } + if (e2 * 2 < dx) { + err += dx; + y0 += sy; + } + } } void convertRGBAToARGB1555( - uint8_t* srcBitmap, uint32_t width, uint32_t height, - uint16_t* destBitmap) -{ - int u32Stride = getRowStride(width, 16); // ARGB1555 uses 2 bytes per pixel - - for (uint32_t u32Y = 0; u32Y < height; ++u32Y) { - for (int32_t u32X = 0; u32X < width; ++u32X) { - uint32_t srcIndex = (u32Y * width + u32X) * 4; // Calculate the source index (4 bytes per pixel) - - // Extract RGBA values - uint8_t r = srcBitmap[srcIndex + 0]; - uint8_t g = srcBitmap[srcIndex + 1]; - uint8_t b = srcBitmap[srcIndex + 2]; - uint8_t a = srcBitmap[srcIndex + 3]; - - // Convert to ARGB1555 format - uint16_t pixel = 0; - - // Set alpha bit (1 bit) - if (a > 199) { // Assuming any alpha value above 127 is considered opaque - // Needs to be higher - pixel |= 0x8000; // Set the alpha bit (1 << 15) - } - - // Set red (5 bits), green (5 bits), and blue (5 bits) - pixel |= (r >> 3) << 10; // Red: take the top 5 bits - pixel |= (g >> 3) << 5; // Green: take the top 5 bits - pixel |= (b >> 3); // Blue: take the top 5 bits - - // Write the pixel to the destination bitmap - uint32_t destIndex = u32Y * (u32Stride / 2) + u32X; // 2 bytes per pixel in ARGB1555 - destBitmap[destIndex] = pixel; - } - } + uint8_t *srcBitmap, uint32_t width, uint32_t height, uint16_t *destBitmap) { + int u32Stride = getRowStride(width, 16); // ARGB1555 uses 2 bytes per pixel + + for (uint32_t u32Y = 0; u32Y < height; ++u32Y) { + for (int32_t u32X = 0; u32X < width; ++u32X) { + uint32_t srcIndex = + (u32Y * width + u32X) * 4; // Calculate the source index (4 bytes per pixel) + + // Extract RGBA values + uint8_t r = srcBitmap[srcIndex + 0]; + uint8_t g = srcBitmap[srcIndex + 1]; + uint8_t b = srcBitmap[srcIndex + 2]; + uint8_t a = srcBitmap[srcIndex + 3]; + + // Convert to ARGB1555 format + uint16_t pixel = 0; + + // Set alpha bit (1 bit) + if (a > 199) { // Assuming any alpha value above 127 is considered + // opaque Needs to be higher + pixel |= 0x8000; // Set the alpha bit (1 << 15) + } + + // Set red (5 bits), green (5 bits), and blue (5 bits) + pixel |= (r >> 3) << 10; // Red: take the top 5 bits + pixel |= (g >> 3) << 5; // Green: take the top 5 bits + pixel |= (b >> 3); // Blue: take the top 5 bits + + // Write the pixel to the destination bitmap + uint32_t destIndex = u32Y * (u32Stride / 2) + u32X; // 2 bytes per pixel in ARGB1555 + destBitmap[destIndex] = pixel; + } + } } -void convertRGBAToARGB( - uint8_t* srcBitmap, uint32_t width, uint32_t height, - uint32_t* destBitmap) -{ - // Iterate over each pixel in the image - for (uint32_t y = 0; y < height; ++y) { - for (uint32_t x = 0; x < width; ++x) { - uint32_t srcIndex = (y * width + x) * 4; // Calculate the source index (4 bytes per pixel) - - // Extract RGBA values - uint8_t r = srcBitmap[srcIndex + 0]; - uint8_t g = srcBitmap[srcIndex + 1]; - uint8_t b = srcBitmap[srcIndex + 2]; - uint8_t a = srcBitmap[srcIndex + 3]; - if (a<222) - a=0; - - // Convert to ARGB format (store alpha first) - uint32_t argbPixel = (a << 24) | (r << 16) | (g << 8) | b; - - // Write the pixel to the destination bitmap - uint32_t destIndex = y * width + x; // Direct index for 32-bit ARGB - destBitmap[destIndex] = argbPixel; - } - } +void convertRGBAToARGB(uint8_t *srcBitmap, uint32_t width, uint32_t height, uint32_t *destBitmap) { + // Iterate over each pixel in the image + for (uint32_t y = 0; y < height; ++y) { + for (uint32_t x = 0; x < width; ++x) { + uint32_t srcIndex = + (y * width + x) * 4; // Calculate the source index (4 bytes per pixel) + + // Extract RGBA values + uint8_t r = srcBitmap[srcIndex + 0]; + uint8_t g = srcBitmap[srcIndex + 1]; + uint8_t b = srcBitmap[srcIndex + 2]; + uint8_t a = srcBitmap[srcIndex + 3]; + if (a < 222) + a = 0; + + // Convert to ARGB format (store alpha first) + uint32_t argbPixel = (a << 24) | (r << 16) | (g << 8) | b; + + // Write the pixel to the destination bitmap + uint32_t destIndex = y * width + x; // Direct index for 32-bit ARGB + destBitmap[destIndex] = argbPixel; + } + } } - - - - - - - - diff --git a/bmp/bitmap.h b/bmp/bitmap.h index cc07a67..ef056e7 100644 --- a/bmp/bitmap.h +++ b/bmp/bitmap.h @@ -3,226 +3,205 @@ #ifdef __cplusplus #if __cplusplus -extern "C" -{ +extern "C" { #endif #endif #include "common.h" #include - typedef enum osd_color_fmt - { - OSD_COLOR_FMT_RGB444 = 0, - OSD_COLOR_FMT_RGB4444 = 1, - OSD_COLOR_FMT_RGB555 = 2, - OSD_COLOR_FMT_RGB565 = 3, - OSD_COLOR_FMT_RGB1555 = 4, - OSD_COLOR_FMT_RGB888 = 6, - OSD_COLOR_FMT_RGB8888 = 7, - OSD_COLOR_FMT_BUTT - } OSD_COLOR_FMT_E; - - typedef struct osd_rgb - { - unsigned char u8B; - unsigned char u8G; - unsigned char u8R; - unsigned char u8Reserved; - } OSD_RGB_S; - - typedef struct osd_surface - { - OSD_COLOR_FMT_E enColorFmt; /* color format */ - unsigned char *pu8PhyAddr; /* physical address */ - unsigned short u16Height; /* operation height */ - unsigned short u16Width; /* operation width */ - unsigned short u16Stride; /* surface stride */ - unsigned short u16Reserved; - } OSD_SURFACE_S; - - typedef struct osd_logo - { - unsigned int width; /* out */ - unsigned int height; /* out */ - unsigned int stride; /* in */ - unsigned char *pRGBBuffer; /* in/out */ - } OSD_LOGO_T; - - typedef struct osd_bitmapinfoheader - { - unsigned short biSize; - unsigned int biWidth; - int biHeight; - unsigned short biPlanes; - unsigned short biBitCount; - unsigned int biCompression; - unsigned int biSizeImage; - unsigned int biXPelsPerMeter; - unsigned int biYPelsPerMeter; - unsigned int biClrUsed; - unsigned int biClrImportant; - } OSD_BITMAPINFOHEADER; - - typedef struct osd_bitmapfileheader - { - unsigned int bfSize; - unsigned short bfReserved1; - unsigned short bfReserved2; - unsigned int bfOffBits; - } OSD_BITMAPFILEHEADER; - - typedef struct osd_rgbquad - { - unsigned char rgbBlue; - unsigned char rgbGreen; - unsigned char rgbRed; - unsigned char rgbReserved; - } OSD_RGBQUAD; - - typedef struct osd_bitmapinfo - { - OSD_BITMAPINFOHEADER bmiHeader; - OSD_RGBQUAD bmiColors[1]; - } OSD_BITMAPINFO; - - typedef struct osd_comp_info - { - int alen; - int rlen; - int glen; - int blen; - } OSD_COMP_INFO; +typedef enum osd_color_fmt { + OSD_COLOR_FMT_RGB444 = 0, + OSD_COLOR_FMT_RGB4444 = 1, + OSD_COLOR_FMT_RGB555 = 2, + OSD_COLOR_FMT_RGB565 = 3, + OSD_COLOR_FMT_RGB1555 = 4, + OSD_COLOR_FMT_RGB888 = 6, + OSD_COLOR_FMT_RGB8888 = 7, + OSD_COLOR_FMT_BUTT +} OSD_COLOR_FMT_E; + +typedef struct osd_rgb { + unsigned char u8B; + unsigned char u8G; + unsigned char u8R; + unsigned char u8Reserved; +} OSD_RGB_S; + +typedef struct osd_surface { + OSD_COLOR_FMT_E enColorFmt; /* color format */ + unsigned char *pu8PhyAddr; /* physical address */ + unsigned short u16Height; /* operation height */ + unsigned short u16Width; /* operation width */ + unsigned short u16Stride; /* surface stride */ + unsigned short u16Reserved; +} OSD_SURFACE_S; + +typedef struct osd_logo { + unsigned int width; /* out */ + unsigned int height; /* out */ + unsigned int stride; /* in */ + unsigned char *pRGBBuffer; /* in/out */ +} OSD_LOGO_T; + +typedef struct osd_bitmapinfoheader { + unsigned short biSize; + unsigned int biWidth; + int biHeight; + unsigned short biPlanes; + unsigned short biBitCount; + unsigned int biCompression; + unsigned int biSizeImage; + unsigned int biXPelsPerMeter; + unsigned int biYPelsPerMeter; + unsigned int biClrUsed; + unsigned int biClrImportant; +} OSD_BITMAPINFOHEADER; + +typedef struct osd_bitmapfileheader { + unsigned int bfSize; + unsigned short bfReserved1; + unsigned short bfReserved2; + unsigned int bfOffBits; +} OSD_BITMAPFILEHEADER; + +typedef struct osd_rgbquad { + unsigned char rgbBlue; + unsigned char rgbGreen; + unsigned char rgbRed; + unsigned char rgbReserved; +} OSD_RGBQUAD; + +typedef struct osd_bitmapinfo { + OSD_BITMAPINFOHEADER bmiHeader; + OSD_RGBQUAD bmiColors[1]; +} OSD_BITMAPINFO; + +typedef struct osd_comp_info { + int alen; + int rlen; + int glen; + int blen; +} OSD_COMP_INFO; #ifndef __SIGMASTAR__ -typedef struct MI_RGN_PaletteElement_s -{ - unsigned char u8Alpha; - unsigned char u8Red; - unsigned char u8Green; - unsigned char u8Blue; -}MI_RGN_PaletteElement_t; - -typedef struct MI_RGN_PaletteTable_s -{ - MI_RGN_PaletteElement_t astElement[256]; -}MI_RGN_PaletteTable_t; +typedef struct MI_RGN_PaletteElement_s { + unsigned char u8Alpha; + unsigned char u8Red; + unsigned char u8Green; + unsigned char u8Blue; +} MI_RGN_PaletteElement_t; + +typedef struct MI_RGN_PaletteTable_s { + MI_RGN_PaletteElement_t astElement[256]; +} MI_RGN_PaletteTable_t; #endif - typedef struct { - uint32_t x; - uint32_t y; - } Point; - - int parse_bitmap(const char *filename, OSD_BITMAPFILEHEADER *pBmpFileHeader, OSD_BITMAPINFO *pBmpInfo); - int CreateSurfaceByBitMap(const char *pszFileName, OSD_SURFACE_S *pstSurface, unsigned char *pu8Virt); - - uint32_t colorDistance8(uint8_t r1, uint8_t g1, uint8_t b1, uint8_t r2, uint8_t g2, uint8_t b2) ; - uint8_t findClosestPaletteIndex8(uint16_t color, MI_RGN_PaletteTable_t* paletteTable); - - void convertBitmap1555ToI8( - uint16_t* srcBitmap, uint32_t width, uint32_t height, - uint8_t* destBitmap, MI_RGN_PaletteTable_t* paletteTable); - void Convert1555ToRGBA(unsigned short* bitmap1555, unsigned char* rgbaData, unsigned int width, unsigned int height); - void convertBitmap1555ToI4( - uint16_t* srcBitmap, uint32_t width, uint32_t height, - uint8_t* destBitmap,int singleColor); - - void convertRGBAToI4( - uint8_t* srcBitmap, uint32_t width, uint32_t height, - uint8_t* destBitmap, MI_RGN_PaletteTable_t* paletteTable); - - void convertRGBAToARGB1555( - uint8_t* srcBitmap, uint32_t width, uint32_t height, - uint16_t* destBitmap); - - - void convertRGBAToARGB( - uint8_t* srcBitmap, uint32_t width, uint32_t height, - uint32_t* destBitmap); - - - void convertBitmap1555ToI4_Works_blurry( - uint16_t* srcBitmap, uint32_t width, uint32_t height, - uint8_t* destBitmap, MI_RGN_PaletteTable_t* paletteTable); - - void ConvertI8ToRGBA(uint8_t* bitmapI8, uint8_t* rgbaData, uint32_t width, uint32_t height, MI_RGN_PaletteElement_t* palette); - - void ConvertI4ToRGBA(uint8_t* bitmapI4, uint8_t* rgbaData, uint32_t width, uint32_t height, MI_RGN_PaletteElement_t* palette) ; - - void drawLine(uint8_t* bmpData, int posX0, int posY0, int posX1, int posY1, uint8_t color, int thickness); - - void drawLineI4(uint8_t* bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1, uint8_t color, int thickness); - - void drawLineI4Ex(uint8_t* bmpData, uint32_t width, uint32_t height, Point A, Point B, uint8_t color); - void drawRectangleI4(uint8_t* bmpData, int posX, int posY, int rectWidth, int rectHeight, uint8_t color, int thickness); - - void ApplyTransform(int posX0, int posY0, uint32_t *posX_R, uint32_t *posY_R); - - void drawLineI4AA(uint8_t* bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1); - void drawFilledRectangleI4AA(uint8_t* bmpData, uint32_t width, uint32_t height, int posX, int posY, int rectWidth, int rectHeight); - - void copyRectARGB1555( - uint16_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, - uint16_t* destBitmap, uint32_t destWidth, uint32_t destHeight, - uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, - uint32_t destX, uint32_t destY); - - void copyRectRGBA8888( - uint32_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, - uint32_t* destBitmap, uint32_t destWidth, uint32_t destHeight, - uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, - uint32_t destX, uint32_t destY); - - void copyRectI8( - uint8_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, - uint8_t* destBitmap, uint32_t destWidth, uint32_t destHeight, - uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, - uint32_t destX, uint32_t destY); - - void copyRectI4( - uint8_t* srcBitmap, uint32_t srcWidth, uint32_t srcHeight, - uint8_t* destBitmap, uint32_t destWidth, uint32_t destHeight, - uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, - uint32_t destX, uint32_t destY) ; - - int getRowStride(int width, int BitsPerPixel); - - #define COLOR_RED 1 - #define COLOR_GREEN 2 - #define COLOR_BLUE 3 - #define COLOR_YELLOW 4 - #define COLOR_MAGENTA 5 - #define COLOR_CYAN 6 - #define COLOR_WHITE 7 - #define COLOR_BLACK 8 - #define COLOR_GRAY_Darker 9 - #define COLOR_GRAY_Darkest 10 - #define COLOR_GRAY_Medium 11 - #define COLOR_GRAY_Lighter 12 - #define COLOR_GRAY_Light 13 - #define COLOR_GRAY_Dark 14 - - /* - {0xFF, 0x84, 0x10, 0x10}, // 0x4210 -> Gray (Darker) - {0xFF, 0x42, 0x08, 0x08}, // 0x2108 -> Gray (Even Darker) - {0xFF, 0x63, 0x18, 0xC6}, // 0x318C -> Gray (Medium) - {0xFF, 0xAD, 0x52, 0xD6}, // 0x5AD6 -> Gray (Lighter) - {0xFF, 0xCE, 0x73, 0x9C}, // 0x739C -> Gray (Light) - {0xFF, 0x31, 0x8C, 0x6C}, // 0x18C6 -> Gray (Dark) - */ - - - - // Declaration of global palette table - extern MI_RGN_PaletteTable_t g_stPaletteTable; - - - extern uint16_t Transform_OVERLAY_WIDTH; - extern uint16_t Transform_OVERLAY_HEIGHT; - extern float Transform_Roll; - extern float Transform_Pitch; +typedef struct { + uint32_t x; + uint32_t y; +} Point; + +int parse_bitmap( + const char *filename, OSD_BITMAPFILEHEADER *pBmpFileHeader, OSD_BITMAPINFO *pBmpInfo); +int CreateSurfaceByBitMap( + const char *pszFileName, OSD_SURFACE_S *pstSurface, unsigned char *pu8Virt); + +uint32_t colorDistance8(uint8_t r1, uint8_t g1, uint8_t b1, uint8_t r2, uint8_t g2, uint8_t b2); +uint8_t findClosestPaletteIndex8(uint16_t color, MI_RGN_PaletteTable_t *paletteTable); + +void convertBitmap1555ToI8(uint16_t *srcBitmap, uint32_t width, uint32_t height, + uint8_t *destBitmap, MI_RGN_PaletteTable_t *paletteTable); +void Convert1555ToRGBA( + unsigned short *bitmap1555, unsigned char *rgbaData, unsigned int width, unsigned int height); +void convertBitmap1555ToI4( + uint16_t *srcBitmap, uint32_t width, uint32_t height, uint8_t *destBitmap, int singleColor); + +void convertRGBAToI4(uint8_t *srcBitmap, uint32_t width, uint32_t height, uint8_t *destBitmap, + MI_RGN_PaletteTable_t *paletteTable); + +void convertRGBAToARGB1555( + uint8_t *srcBitmap, uint32_t width, uint32_t height, uint16_t *destBitmap); + +void convertRGBAToARGB(uint8_t *srcBitmap, uint32_t width, uint32_t height, uint32_t *destBitmap); + +void convertBitmap1555ToI4_Works_blurry(uint16_t *srcBitmap, uint32_t width, uint32_t height, + uint8_t *destBitmap, MI_RGN_PaletteTable_t *paletteTable); + +void ConvertI8ToRGBA(uint8_t *bitmapI8, uint8_t *rgbaData, uint32_t width, uint32_t height, + MI_RGN_PaletteElement_t *palette); + +void ConvertI4ToRGBA(uint8_t *bitmapI4, uint8_t *rgbaData, uint32_t width, uint32_t height, + MI_RGN_PaletteElement_t *palette); + +void drawLine( + uint8_t *bmpData, int posX0, int posY0, int posX1, int posY1, uint8_t color, int thickness); + +void drawLineI4(uint8_t *bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1, + uint8_t color, int thickness); + +void drawLineI4Ex( + uint8_t *bmpData, uint32_t width, uint32_t height, Point A, Point B, uint8_t color); +void drawRectangleI4(uint8_t *bmpData, int posX, int posY, int rectWidth, int rectHeight, + uint8_t color, int thickness); + +void ApplyTransform(int posX0, int posY0, uint32_t *posX_R, uint32_t *posY_R); + +void drawLineI4AA( + uint8_t *bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1); +void drawFilledRectangleI4AA(uint8_t *bmpData, uint32_t width, uint32_t height, int posX, int posY, + int rectWidth, int rectHeight); + +void copyRectARGB1555(uint16_t *srcBitmap, uint32_t srcWidth, uint32_t srcHeight, + uint16_t *destBitmap, uint32_t destWidth, uint32_t destHeight, uint32_t srcX, uint32_t srcY, + uint32_t width, uint32_t height, uint32_t destX, uint32_t destY); + +void copyRectRGBA8888(uint32_t *srcBitmap, uint32_t srcWidth, uint32_t srcHeight, + uint32_t *destBitmap, uint32_t destWidth, uint32_t destHeight, uint32_t srcX, uint32_t srcY, + uint32_t width, uint32_t height, uint32_t destX, uint32_t destY); + +void copyRectI8(uint8_t *srcBitmap, uint32_t srcWidth, uint32_t srcHeight, uint8_t *destBitmap, + uint32_t destWidth, uint32_t destHeight, uint32_t srcX, uint32_t srcY, uint32_t width, + uint32_t height, uint32_t destX, uint32_t destY); + +void copyRectI4(uint8_t *srcBitmap, uint32_t srcWidth, uint32_t srcHeight, uint8_t *destBitmap, + uint32_t destWidth, uint32_t destHeight, uint32_t srcX, uint32_t srcY, uint32_t width, + uint32_t height, uint32_t destX, uint32_t destY); + +int getRowStride(int width, int BitsPerPixel); + +#define COLOR_RED 1 +#define COLOR_GREEN 2 +#define COLOR_BLUE 3 +#define COLOR_YELLOW 4 +#define COLOR_MAGENTA 5 +#define COLOR_CYAN 6 +#define COLOR_WHITE 7 +#define COLOR_BLACK 8 +#define COLOR_GRAY_Darker 9 +#define COLOR_GRAY_Darkest 10 +#define COLOR_GRAY_Medium 11 +#define COLOR_GRAY_Lighter 12 +#define COLOR_GRAY_Light 13 +#define COLOR_GRAY_Dark 14 + +/* + {0xFF, 0x84, 0x10, 0x10}, // 0x4210 -> Gray (Darker) + {0xFF, 0x42, 0x08, 0x08}, // 0x2108 -> Gray (Even Darker) + {0xFF, 0x63, 0x18, 0xC6}, // 0x318C -> Gray (Medium) + {0xFF, 0xAD, 0x52, 0xD6}, // 0x5AD6 -> Gray (Lighter) + {0xFF, 0xCE, 0x73, 0x9C}, // 0x739C -> Gray (Light) + {0xFF, 0x31, 0x8C, 0x6C}, // 0x18C6 -> Gray (Dark) +*/ + +// Declaration of global palette table +extern MI_RGN_PaletteTable_t g_stPaletteTable; + +extern uint16_t Transform_OVERLAY_WIDTH; +extern uint16_t Transform_OVERLAY_HEIGHT; +extern float Transform_Roll; +extern float Transform_Pitch; #ifdef __cplusplus #if __cplusplus diff --git a/bmp/common.h b/bmp/common.h index 53088ed..397dbc2 100644 --- a/bmp/common.h +++ b/bmp/common.h @@ -1,13 +1,13 @@ #ifndef COMMON_H_ #define COMMON_H_ -#include // FILE, fseek, (f|p)open, (as|f)printf +#include // isdigit +#include // ceil +#include // FILE, fseek, (f|p)open, (as|f)printf #include // abort, atoi, exit, free, malloc #include // memcpy, memset, strcmp, strlen +#include // clock_(get|set)time, timespec #include // getopt, optarg, opterr -#include // isdigit -#include // clock_(get|set)time, timespec -#include // ceil #include #include @@ -22,8 +22,7 @@ #ifdef __cplusplus #if __cplusplus -extern "C" -{ +extern "C" { #endif #endif @@ -41,18 +40,18 @@ extern "C" #define PIXEL_FORMAT_1555 E_MI_RGN_PIXEL_FORMAT_ARGB1555 #define PIXEL_FORMAT_2BPP E_MI_RGN_PIXEL_FORMAT_I2 #define PIXEL_FORMAT_8888 E_MI_RGN_PIXEL_FORMAT_ARGB8888 -#define PIXEL_FORMAT_I4 E_MI_RGN_PIXEL_FORMAT_I4 +#define PIXEL_FORMAT_I4 E_MI_RGN_PIXEL_FORMAT_I4 #elif defined(__INGENIC__) -#include "imp_system.h" -#include "imp_osd.h" #include "imp_isp.h" +#include "imp_osd.h" +#include "imp_system.h" #define PIXEL_FORMAT_4444 0 #define PIXEL_FORMAT_1555 PIX_FMT_RGB555LE #define PIXEL_FORMAT_2BPP PIX_FMT_0RGB #define PIXEL_FORMAT_8888 PIX_FMT_ARGB -#define PIXEL_FORMAT_I4 E_MI_RGN_PIXEL_FORMAT_I4 +#define PIXEL_FORMAT_I4 E_MI_RGN_PIXEL_FORMAT_I4 #else #include "hi_common.h" #include "hi_math.h" @@ -64,11 +63,10 @@ extern "C" #define PIXEL_FORMAT_1555 PIXEL_FORMAT_ARGB_1555 #define PIXEL_FORMAT_2BPP PIXEL_FORMAT_ARGB_2BPP #define PIXEL_FORMAT_8888 PIXEL_FORMAT_ARGB_8888 -#define PIXEL_FORMAT_I4 3 //This will not work on GOKE anyway +#define PIXEL_FORMAT_I4 3 // This will not work on GOKE anyway #endif - #ifndef DIV_UP #define DIV_UP(x, a) (((x) + ((a)-1)) / a) #endif @@ -81,100 +79,85 @@ extern "C" #define starts_with(a, b) !strncmp(a, b, strlen(b)) #define equals(a, b) !strcmp(a, b) -#define ends_with(a, b) \ - size_t alen = strlen(a); \ - size_t blen = strlen(b); \ - return (alen > blen) && strcmp(a + alen - blen, b); +#define ends_with(a, b) \ + size_t alen = strlen(a); \ + size_t blen = strlen(b); \ + return (alen > blen) && strcmp(a + alen - blen, b); #define empty(x) (x[0] == '\0') - typedef struct osd - { - double size; - int hand; - short posx, posy; - char updt; - char font[32]; - char text[80]; - short width, height; - } OSD; - - typedef struct bitmap - { - int enPixelFormat; - unsigned int u32Width; - unsigned int u32Height; - void *pData; - } BITMAP; - - typedef struct rect - { - short width, height; - } RECT; - - static void fatal(const char *message) - { - fprintf(stderr, "%s\n", message); - exit(1); - } +typedef struct osd { + double size; + int hand; + short posx, posy; + char updt; + char font[32]; + char text[80]; + short width, height; +} OSD; + +typedef struct bitmap { + int enPixelFormat; + unsigned int u32Width; + unsigned int u32Height; + void *pData; +} BITMAP; + +typedef struct rect { + short width, height; +} RECT; + +static void fatal(const char *message) { + fprintf(stderr, "%s\n", message); + exit(1); +} #ifdef SUPP_UTF32 - static int utf8_to_utf32(const uint8_t *utf8, uint32_t *utf32, int max) - { - unsigned int c; - int i = 0; - --max; - while (*utf8) - { - if (i >= max) - return 0; - if (!(*utf8 & 0x80U)) - { - utf32[i++] = *utf8++; - } - else if ((*utf8 & 0xe0U) == 0xc0U) - { - c = (*utf8++ & 0x1fU) << 6; - if ((*utf8 & 0xc0U) != 0x80U) - return 0; - utf32[i++] = c + (*utf8++ & 0x3fU); - } - else if ((*utf8 & 0xf0U) == 0xe0U) - { - c = (*utf8++ & 0x0fU) << 12; - if ((*utf8 & 0xc0U) != 0x80U) - return 0; - c += (*utf8++ & 0x3fU) << 6; - if ((*utf8 & 0xc0U) != 0x80U) - return 0; - utf32[i++] = c + (*utf8++ & 0x3fU); - } - else if ((*utf8 & 0xf8U) == 0xf0U) - { - c = (*utf8++ & 0x07U) << 18; - if ((*utf8 & 0xc0U) != 0x80U) - return 0; - c += (*utf8++ & 0x3fU) << 12; - if ((*utf8 & 0xc0U) != 0x80U) - return 0; - c += (*utf8++ & 0x3fU) << 6; - if ((*utf8 & 0xc0U) != 0x80U) - return 0; - c += (*utf8++ & 0x3fU); - if ((c & 0xFFFFF800U) == 0xD800U) - return 0; - utf32[i++] = c; - } - else - return 0; - } - utf32[i] = 0; - return i; - } +static int utf8_to_utf32(const uint8_t *utf8, uint32_t *utf32, int max) { + unsigned int c; + int i = 0; + --max; + while (*utf8) { + if (i >= max) + return 0; + if (!(*utf8 & 0x80U)) { + utf32[i++] = *utf8++; + } else if ((*utf8 & 0xe0U) == 0xc0U) { + c = (*utf8++ & 0x1fU) << 6; + if ((*utf8 & 0xc0U) != 0x80U) + return 0; + utf32[i++] = c + (*utf8++ & 0x3fU); + } else if ((*utf8 & 0xf0U) == 0xe0U) { + c = (*utf8++ & 0x0fU) << 12; + if ((*utf8 & 0xc0U) != 0x80U) + return 0; + c += (*utf8++ & 0x3fU) << 6; + if ((*utf8 & 0xc0U) != 0x80U) + return 0; + utf32[i++] = c + (*utf8++ & 0x3fU); + } else if ((*utf8 & 0xf8U) == 0xf0U) { + c = (*utf8++ & 0x07U) << 18; + if ((*utf8 & 0xc0U) != 0x80U) + return 0; + c += (*utf8++ & 0x3fU) << 12; + if ((*utf8 & 0xc0U) != 0x80U) + return 0; + c += (*utf8++ & 0x3fU) << 6; + if ((*utf8 & 0xc0U) != 0x80U) + return 0; + c += (*utf8++ & 0x3fU); + if ((c & 0xFFFFF800U) == 0xD800U) + return 0; + utf32[i++] = c; + } else + return 0; + } + utf32[i] = 0; + return i; +} #endif extern int PIXEL_FORMAT_DEFAULT; - #ifdef __cplusplus #if __cplusplus } diff --git a/bmp/config.h b/bmp/config.h index e3c8e4d..c74b7b6 100644 --- a/bmp/config.h +++ b/bmp/config.h @@ -1,5 +1,5 @@ // Good for ARGB8888 360x360 and ARGB1555 512x512 -#define BUF_SIZE (512*1024) +#define BUF_SIZE (512 * 1024) // OpenIPC font must be replaced for Unicode support #define DEF_FONT "UbuntuMono-Regular" #define DEF_POSX 16 @@ -7,7 +7,7 @@ #define DEF_SIZE 32.0f #define DEF_TIMEFMT "%Y/%m/%d %H:%M:%S" #define MAX_CONN 16 -//get two more than osd-tool in order not to interfere with it +// get two more than osd-tool in order not to interfere with it #define MAX_OSD 10 #define PORT "9000" #define QUEUE_SIZE 1000000 diff --git a/bmp/lib/schrift.c b/bmp/lib/schrift.c index 4c1dc1e..1adfe6b 100644 --- a/bmp/lib/schrift.c +++ b/bmp/lib/schrift.c @@ -5,7 +5,7 @@ * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -22,80 +22,91 @@ #include #if defined(_MSC_VER) -# define restrict __restrict +#define restrict __restrict #endif #if defined(_WIN32) -# define WIN32_LEAN_AND_MEAN 1 -# include +#define WIN32_LEAN_AND_MEAN 1 +#include #else #ifndef _POSIX_C_SOURCE -# define _POSIX_C_SOURCE 1 +#define _POSIX_C_SOURCE 1 #endif -# include -# include -# include -# include +#include +#include +#include +#include #endif #include "schrift.h" #define SCHRIFT_VERSION "0.10.2" -#define FILE_MAGIC_ONE 0x00010000 -#define FILE_MAGIC_TWO 0x74727565 - -#define HORIZONTAL_KERNING 0x01 -#define MINIMUM_KERNING 0x02 -#define CROSS_STREAM_KERNING 0x04 -#define OVERRIDE_KERNING 0x08 - -#define POINT_IS_ON_CURVE 0x01 -#define X_CHANGE_IS_SMALL 0x02 -#define Y_CHANGE_IS_SMALL 0x04 -#define REPEAT_FLAG 0x08 -#define X_CHANGE_IS_ZERO 0x10 -#define X_CHANGE_IS_POSITIVE 0x10 -#define Y_CHANGE_IS_ZERO 0x20 -#define Y_CHANGE_IS_POSITIVE 0x20 - -#define OFFSETS_ARE_LARGE 0x001 -#define ACTUAL_XY_OFFSETS 0x002 -#define GOT_A_SINGLE_SCALE 0x008 -#define THERE_ARE_MORE_COMPONENTS 0x020 -#define GOT_AN_X_AND_Y_SCALE 0x040 -#define GOT_A_SCALE_MATRIX 0x080 +#define FILE_MAGIC_ONE 0x00010000 +#define FILE_MAGIC_TWO 0x74727565 + +#define HORIZONTAL_KERNING 0x01 +#define MINIMUM_KERNING 0x02 +#define CROSS_STREAM_KERNING 0x04 +#define OVERRIDE_KERNING 0x08 + +#define POINT_IS_ON_CURVE 0x01 +#define X_CHANGE_IS_SMALL 0x02 +#define Y_CHANGE_IS_SMALL 0x04 +#define REPEAT_FLAG 0x08 +#define X_CHANGE_IS_ZERO 0x10 +#define X_CHANGE_IS_POSITIVE 0x10 +#define Y_CHANGE_IS_ZERO 0x20 +#define Y_CHANGE_IS_POSITIVE 0x20 + +#define OFFSETS_ARE_LARGE 0x001 +#define ACTUAL_XY_OFFSETS 0x002 +#define GOT_A_SINGLE_SCALE 0x008 +#define THERE_ARE_MORE_COMPONENTS 0x020 +#define GOT_AN_X_AND_Y_SCALE 0x040 +#define GOT_A_SCALE_MATRIX 0x080 /* macros */ #define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define SIGN(x) (((x) > 0) - ((x) < 0)) +#define SIGN(x) (((x) > 0) - ((x) < 0)) /* Allocate values on the stack if they are small enough, else spill to heap. */ -#define STACK_ALLOC(var, type, thresh, count) \ - type var##_stack_[thresh]; \ +#define STACK_ALLOC(var, type, thresh, count) \ + type var##_stack_[thresh]; \ var = (count) <= (thresh) ? var##_stack_ : calloc(sizeof(type), count); -#define STACK_FREE(var) \ - if (var != var##_stack_) free(var); +#define STACK_FREE(var) \ + if (var != var##_stack_) \ + free(var); enum { SrcMapping, SrcUser }; /* structs */ -typedef struct Point Point; -typedef struct Line Line; -typedef struct Curve Curve; -typedef struct Cell Cell; +typedef struct Point Point; +typedef struct Line Line; +typedef struct Curve Curve; +typedef struct Cell Cell; typedef struct Outline Outline; -typedef struct Raster Raster; +typedef struct Raster Raster; -struct Point { double x, y; }; -struct Line { uint_least16_t beg, end; }; -struct Curve { uint_least16_t beg, end, ctrl; }; -struct Cell { double area, cover; }; +struct Point { + double x, y; +}; -struct Outline -{ +struct Line { + uint_least16_t beg, end; +}; + +struct Curve { + uint_least16_t beg, end, ctrl; +}; + +struct Cell { + double area, cover; +}; + +struct Outline { Point *points; Curve *curves; - Line *lines; + Line *lines; uint_least16_t numPoints; uint_least16_t capPoints; uint_least16_t numCurves; @@ -104,97 +115,94 @@ struct Outline uint_least16_t capLines; }; -struct Raster -{ +struct Raster { Cell *cells; - int width; - int height; + int width; + int height; }; -struct SFT_Font -{ +struct SFT_Font { const uint8_t *memory; - uint_fast32_t size; + uint_fast32_t size; #if defined(_WIN32) - HANDLE mapping; + HANDLE mapping; #endif - int source; - + int source; + uint_least16_t unitsPerEm; - int_least16_t locaFormat; + int_least16_t locaFormat; uint_least16_t numLongHmtx; }; /* function declarations */ /* generic utility functions */ -//static void *reallocarray(void *optr, size_t nmemb, size_t size); +// static void *reallocarray(void *optr, size_t nmemb, size_t size); static inline int fast_floor(double x); -static inline int fast_ceil (double x); +static inline int fast_ceil(double x); /* file loading */ -static int map_file (SFT_Font *font, const char *filename); +static int map_file(SFT_Font *font, const char *filename); static void unmap_file(SFT_Font *font); -static int init_font (SFT_Font *font); +static int init_font(SFT_Font *font); /* simple mathematical operations */ static Point midpoint(Point a, Point b); static void transform_points(unsigned int numPts, Point *points, double trf[6]); static void clip_points(unsigned int numPts, Point *points, int width, int height); /* 'outline' data structure management */ -static int init_outline(Outline *outl); +static int init_outline(Outline *outl); static void free_outline(Outline *outl); -static int grow_points (Outline *outl); -static int grow_curves (Outline *outl); -static int grow_lines (Outline *outl); +static int grow_points(Outline *outl); +static int grow_curves(Outline *outl); +static int grow_lines(Outline *outl); /* TTF parsing utilities */ static inline int is_safe_offset(SFT_Font *font, uint_fast32_t offset, uint_fast32_t margin); -static void *csearch(const void *key, const void *base, - size_t nmemb, size_t size, int (*compar)(const void *, const void *)); -static int cmpu16(const void *a, const void *b); -static int cmpu32(const void *a, const void *b); -static inline uint_least8_t getu8 (SFT_Font *font, uint_fast32_t offset); -static inline int_least8_t geti8 (SFT_Font *font, uint_fast32_t offset); +static void *csearch(const void *key, const void *base, size_t nmemb, size_t size, + int (*compar)(const void *, const void *)); +static int cmpu16(const void *a, const void *b); +static int cmpu32(const void *a, const void *b); +static inline uint_least8_t getu8(SFT_Font *font, uint_fast32_t offset); +static inline int_least8_t geti8(SFT_Font *font, uint_fast32_t offset); static inline uint_least16_t getu16(SFT_Font *font, uint_fast32_t offset); -static inline int_least16_t geti16(SFT_Font *font, uint_fast32_t offset); +static inline int_least16_t geti16(SFT_Font *font, uint_fast32_t offset); static inline uint_least32_t getu32(SFT_Font *font, uint_fast32_t offset); static int gettable(SFT_Font *font, char tag[4], uint_fast32_t *offset); /* codepoint to glyph id translation */ -static int cmap_fmt4(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, uint_fast32_t *glyph); -static int cmap_fmt6(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, uint_fast32_t *glyph); -static int glyph_id(SFT_Font *font, SFT_UChar charCode, uint_fast32_t *glyph); +static int cmap_fmt4(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, uint_fast32_t *glyph); +static int cmap_fmt6(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, uint_fast32_t *glyph); +static int glyph_id(SFT_Font *font, SFT_UChar charCode, uint_fast32_t *glyph); /* glyph metrics lookup */ -static int hor_metrics(SFT_Font *font, uint_fast32_t glyph, int *advanceWidth, int *leftSideBearing); -static int glyph_bbox(const SFT *sft, uint_fast32_t outline, int box[4]); +static int hor_metrics( + SFT_Font *font, uint_fast32_t glyph, int *advanceWidth, int *leftSideBearing); +static int glyph_bbox(const SFT *sft, uint_fast32_t outline, int box[4]); /* decoding outlines */ -static int outline_offset(SFT_Font *font, uint_fast32_t glyph, uint_fast32_t *offset); -static int simple_flags(SFT_Font *font, uint_fast32_t *offset, uint_fast16_t numPts, uint8_t *flags); -static int simple_points(SFT_Font *font, uint_fast32_t offset, uint_fast16_t numPts, uint8_t *flags, Point *points); -static int decode_contour(uint8_t *flags, uint_fast16_t basePoint, uint_fast16_t count, Outline *outl); -static int simple_outline(SFT_Font *font, uint_fast32_t offset, unsigned int numContours, Outline *outl); -static int compound_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *outl); -static int decode_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *outl); +static int outline_offset(SFT_Font *font, uint_fast32_t glyph, uint_fast32_t *offset); +static int simple_flags( + SFT_Font *font, uint_fast32_t *offset, uint_fast16_t numPts, uint8_t *flags); +static int simple_points( + SFT_Font *font, uint_fast32_t offset, uint_fast16_t numPts, uint8_t *flags, Point *points); +static int decode_contour( + uint8_t *flags, uint_fast16_t basePoint, uint_fast16_t count, Outline *outl); +static int simple_outline( + SFT_Font *font, uint_fast32_t offset, unsigned int numContours, Outline *outl); +static int compound_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *outl); +static int decode_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *outl); /* tesselation */ -static int is_flat(Outline *outl, Curve curve); -static int tesselate_curve(Curve curve, Outline *outl); -static int tesselate_curves(Outline *outl); +static int is_flat(Outline *outl, Curve curve); +static int tesselate_curve(Curve curve, Outline *outl); +static int tesselate_curves(Outline *outl); /* silhouette rasterization */ static void draw_line(Raster buf, Point origin, Point goal); static void draw_lines(Outline *outl, Raster buf); /* post-processing */ static void post_process(Raster buf, uint8_t *image); /* glyph rendering */ -static int render_outline(Outline *outl, double transform[6], SFT_Image image); +static int render_outline(Outline *outl, double transform[6], SFT_Image image); /* function implementations */ -const char * -sft_version(void) -{ - return SCHRIFT_VERSION; -} +const char *sft_version(void) { return SCHRIFT_VERSION; } /* Loads a font from a user-supplied memory range. */ -SFT_Font * -sft_loadmem(const void *mem, size_t size) -{ +SFT_Font *sft_loadmem(const void *mem, size_t size) { SFT_Font *font; if (size > UINT32_MAX) { return NULL; @@ -203,7 +211,7 @@ sft_loadmem(const void *mem, size_t size) return NULL; } font->memory = mem; - font->size = (uint_fast32_t) size; + font->size = (uint_fast32_t)size; font->source = SrcUser; if (init_font(font) < 0) { sft_freefont(font); @@ -212,10 +220,9 @@ sft_loadmem(const void *mem, size_t size) return font; } -/* Loads a font from the file system. To do so, it has to map the entire font into memory. */ -SFT_Font * -sft_loadfile(char const *filename) -{ +/* Loads a font from the file system. To do so, it has to map the entire font + * into memory. */ +SFT_Font *sft_loadfile(char const *filename) { SFT_Font *font; if (!(font = calloc(1, sizeof *font))) { return NULL; @@ -231,19 +238,16 @@ sft_loadfile(char const *filename) return font; } -void -sft_freefont(SFT_Font *font) -{ - if (!font) return; +void sft_freefont(SFT_Font *font) { + if (!font) + return; /* Only unmap if we mapped it ourselves. */ if (font->source == SrcMapping) unmap_file(font); free(font); } -int -sft_lmetrics(const SFT *sft, SFT_LMetrics *metrics) -{ +int sft_lmetrics(const SFT *sft, SFT_LMetrics *metrics) { double factor; uint_fast32_t hhea; memset(metrics, 0, sizeof *metrics); @@ -252,21 +256,17 @@ sft_lmetrics(const SFT *sft, SFT_LMetrics *metrics) if (!is_safe_offset(sft->font, hhea, 36)) return -1; factor = sft->yScale / sft->font->unitsPerEm; - metrics->ascender = geti16(sft->font, hhea + 4) * factor; + metrics->ascender = geti16(sft->font, hhea + 4) * factor; metrics->descender = geti16(sft->font, hhea + 6) * factor; - metrics->lineGap = geti16(sft->font, hhea + 8) * factor; + metrics->lineGap = geti16(sft->font, hhea + 8) * factor; return 0; } -int -sft_lookup(const SFT *sft, SFT_UChar codepoint, SFT_Glyph *glyph) -{ +int sft_lookup(const SFT *sft, SFT_UChar codepoint, SFT_Glyph *glyph) { return glyph_id(sft->font, codepoint, glyph); } -int -sft_gmetrics(const SFT *sft, SFT_Glyph glyph, SFT_GMetrics *metrics) -{ +int sft_gmetrics(const SFT *sft, SFT_Glyph glyph, SFT_GMetrics *metrics) { int adv, lsb; double xScale = sft->xScale / sft->font->unitsPerEm; uint_fast32_t outline; @@ -276,7 +276,7 @@ sft_gmetrics(const SFT *sft, SFT_Glyph glyph, SFT_GMetrics *metrics) if (hor_metrics(sft->font, glyph, &adv, &lsb) < 0) return -1; - metrics->advanceWidth = adv * xScale; + metrics->advanceWidth = adv * xScale; metrics->leftSideBearing = lsb * xScale + sft->xOffset; if (outline_offset(sft->font, glyph, &outline) < 0) @@ -285,17 +285,14 @@ sft_gmetrics(const SFT *sft, SFT_Glyph glyph, SFT_GMetrics *metrics) return 0; if (glyph_bbox(sft, outline, bbox) < 0) return -1; - metrics->minWidth = bbox[2] - bbox[0] + 1; + metrics->minWidth = bbox[2] - bbox[0] + 1; metrics->minHeight = bbox[3] - bbox[1] + 1; - metrics->yOffset = sft->flags & SFT_DOWNWARD_Y ? -bbox[3] : bbox[1]; + metrics->yOffset = sft->flags & SFT_DOWNWARD_Y ? -bbox[3] : bbox[1]; return 0; } -int -sft_kerning(const SFT *sft, SFT_Glyph leftGlyph, SFT_Glyph rightGlyph, - SFT_Kerning *kerning) -{ +int sft_kerning(const SFT *sft, SFT_Glyph leftGlyph, SFT_Glyph rightGlyph, SFT_Kerning *kerning) { void *match; uint_fast32_t offset; unsigned int numTables, numPairs, length, format, flags; @@ -320,8 +317,8 @@ sft_kerning(const SFT *sft, SFT_Glyph leftGlyph, SFT_Glyph rightGlyph, if (!is_safe_offset(sft->font, offset, 6)) return -1; length = getu16(sft->font, offset + 2); - format = getu8 (sft->font, offset + 4); - flags = getu8 (sft->font, offset + 5); + format = getu8(sft->font, offset + 4); + flags = getu8(sft->font, offset + 5); offset += 6; if (format == 0 && (flags & HORIZONTAL_KERNING) && !(flags & MINIMUM_KERNING)) { @@ -331,21 +328,20 @@ sft_kerning(const SFT *sft, SFT_Glyph leftGlyph, SFT_Glyph rightGlyph, numPairs = getu16(sft->font, offset); offset += 8; /* Look up character code pair via binary search. */ - key[0] = (leftGlyph >> 8) & 0xFF; - key[1] = leftGlyph & 0xFF; + key[0] = (leftGlyph >> 8) & 0xFF; + key[1] = leftGlyph & 0xFF; key[2] = (rightGlyph >> 8) & 0xFF; - key[3] = rightGlyph & 0xFF; - if ((match = bsearch(key, sft->font->memory + offset, - numPairs, 6, cmpu32)) != NULL) { - - value = geti16(sft->font, (uint_fast32_t) ((uint8_t *) match - sft->font->memory + 4)); + key[3] = rightGlyph & 0xFF; + if ((match = bsearch(key, sft->font->memory + offset, numPairs, 6, cmpu32)) != NULL) { + + value = + geti16(sft->font, (uint_fast32_t)((uint8_t *)match - sft->font->memory + 4)); if (flags & CROSS_STREAM_KERNING) { kerning->yShift += value; } else { kerning->xShift += value; } } - } offset += length; @@ -358,9 +354,7 @@ sft_kerning(const SFT *sft, SFT_Glyph leftGlyph, SFT_Glyph rightGlyph, return 0; } -int -sft_render(const SFT *sft, SFT_Glyph glyph, SFT_Image image) -{ +int sft_render(const SFT *sft, SFT_Glyph glyph, SFT_Image image) { uint_fast32_t outline; double transform[6]; int bbox[4]; @@ -386,7 +380,7 @@ sft_render(const SFT *sft, SFT_Glyph glyph, SFT_Image image) transform[3] = +sft->yScale / sft->font->unitsPerEm; transform[5] = sft->yOffset - bbox[1]; } - + memset(&outl, 0, sizeof outl); if (init_outline(&outl) < 0) goto failure; @@ -406,7 +400,7 @@ sft_render(const SFT *sft, SFT_Glyph glyph, SFT_Image image) /* This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW */ -#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) +#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) /* OpenBSD's reallocarray() standard libary function. * A wrapper for realloc() that takes two size args like calloc(). @@ -414,39 +408,33 @@ sft_render(const SFT *sft, SFT_Glyph glyph, SFT_Image image) /*static void * reallocarray(void *optr, size_t nmemb, size_t size) { - if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && - nmemb > 0 && SIZE_MAX / nmemb < size) { - errno = ENOMEM; - return NULL; - } - return realloc(optr, size * nmemb); + if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && + nmemb > 0 && SIZE_MAX / nmemb < size) { + errno = ENOMEM; + return NULL; + } + return realloc(optr, size * nmemb); }*/ /* TODO maybe we should use long here instead of int. */ -static inline int -fast_floor(double x) -{ - int i = (int) x; +static inline int fast_floor(double x) { + int i = (int)x; return i - (i > x); } -static inline int -fast_ceil(double x) -{ - int i = (int) x; +static inline int fast_ceil(double x) { + int i = (int)x; return i + (i < x); } #if defined(_WIN32) -static int -map_file(SFT_Font *font, const char *filename) -{ +static int map_file(SFT_Font *font, const char *filename) { HANDLE file; DWORD high, low; font->mapping = NULL; - font->memory = NULL; + font->memory = NULL; file = CreateFileA(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (file == INVALID_HANDLE_VALUE) { @@ -479,9 +467,7 @@ map_file(SFT_Font *font, const char *filename) return 0; } -static void -unmap_file(SFT_Font *font) -{ +static void unmap_file(SFT_Font *font) { if (font->memory) { UnmapViewOfFile(font->memory); font->memory = NULL; @@ -494,13 +480,11 @@ unmap_file(SFT_Font *font) #else -static int -map_file(SFT_Font *font, const char *filename) -{ +static int map_file(SFT_Font *font, const char *filename) { struct stat info; int fd; font->memory = MAP_FAILED; - font->size = 0; + font->size = 0; font->source = SrcMapping; if ((fd = open(filename, O_RDONLY)) < 0) { return -1; @@ -509,25 +493,22 @@ map_file(SFT_Font *font, const char *filename) close(fd); return -1; } - /* FIXME do some basic validation on info.st_size maybe - it is signed for example, so it *could* be negative .. */ - font->memory = mmap(NULL, (size_t) info.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - font->size = (uint_fast32_t) info.st_size; + /* FIXME do some basic validation on info.st_size maybe - it is signed for + * example, so it *could* be negative .. */ + font->memory = mmap(NULL, (size_t)info.st_size, PROT_READ, MAP_PRIVATE, fd, 0); + font->size = (uint_fast32_t)info.st_size; close(fd); return font->memory == MAP_FAILED ? -1 : 0; } -static void -unmap_file(SFT_Font *font) -{ +static void unmap_file(SFT_Font *font) { assert(font->memory != MAP_FAILED); - munmap((void *) font->memory, font->size); + munmap((void *)font->memory, font->size); } #endif -static int -init_font(SFT_Font *font) -{ +static int init_font(SFT_Font *font) { uint_fast32_t scalerType, head, hhea; if (!is_safe_offset(font, 0, 12)) @@ -543,7 +524,7 @@ init_font(SFT_Font *font) return -1; font->unitsPerEm = getu16(font, head + 18); font->locaFormat = geti16(font, head + 50); - + if (gettable(font, "hhea", &hhea) < 0) return -1; if (!is_safe_offset(font, hhea, 36)) @@ -553,33 +534,20 @@ init_font(SFT_Font *font) return 0; } -static Point -midpoint(Point a, Point b) -{ - return (Point) { - 0.5 * (a.x + b.x), - 0.5 * (a.y + b.y) - }; -} +static Point midpoint(Point a, Point b) { return (Point){0.5 * (a.x + b.x), 0.5 * (a.y + b.y)}; } /* Applies an affine linear transformation matrix to a set of points. */ -static void -transform_points(unsigned int numPts, Point *points, double trf[6]) -{ +static void transform_points(unsigned int numPts, Point *points, double trf[6]) { Point pt; unsigned int i; for (i = 0; i < numPts; ++i) { pt = points[i]; - points[i] = (Point) { - pt.x * trf[0] + pt.y * trf[2] + trf[4], - pt.x * trf[1] + pt.y * trf[3] + trf[5] - }; + points[i] = + (Point){pt.x * trf[0] + pt.y * trf[2] + trf[4], pt.x * trf[1] + pt.y * trf[3] + trf[5]}; } } -static void -clip_points(unsigned int numPts, Point *points, int width, int height) -{ +static void clip_points(unsigned int numPts, Point *points, int width, int height) { Point pt; unsigned int i; @@ -601,9 +569,7 @@ clip_points(unsigned int numPts, Point *points, int width, int height) } } -static int -init_outline(Outline *outl) -{ +static int init_outline(Outline *outl) { /* TODO Smaller initial allocations */ outl->numPoints = 0; outl->capPoints = 64; @@ -620,80 +586,72 @@ init_outline(Outline *outl) return 0; } -static void -free_outline(Outline *outl) -{ +static void free_outline(Outline *outl) { free(outl->points); free(outl->curves); free(outl->lines); } -static int -grow_points(Outline *outl) -{ +static int grow_points(Outline *outl) { void *mem; uint_fast16_t cap; assert(outl->capPoints); - /* Since we use uint_fast16_t for capacities, we have to be extra careful not to trigger integer overflow. */ + /* Since we use uint_fast16_t for capacities, we have to be extra careful + * not to trigger integer overflow. */ if (outl->capPoints > UINT16_MAX / 2) return -1; - cap = (uint_fast16_t) (2U * outl->capPoints); + cap = (uint_fast16_t)(2U * outl->capPoints); if (!(mem = reallocarray(outl->points, cap, sizeof *outl->points))) return -1; - outl->capPoints = (uint_least16_t) cap; - outl->points = mem; + outl->capPoints = (uint_least16_t)cap; + outl->points = mem; return 0; } -static int -grow_curves(Outline *outl) -{ +static int grow_curves(Outline *outl) { void *mem; uint_fast16_t cap; assert(outl->capCurves); if (outl->capCurves > UINT16_MAX / 2) return -1; - cap = (uint_fast16_t) (2U * outl->capCurves); + cap = (uint_fast16_t)(2U * outl->capCurves); if (!(mem = reallocarray(outl->curves, cap, sizeof *outl->curves))) return -1; - outl->capCurves = (uint_least16_t) cap; - outl->curves = mem; + outl->capCurves = (uint_least16_t)cap; + outl->curves = mem; return 0; } -static int -grow_lines(Outline *outl) -{ +static int grow_lines(Outline *outl) { void *mem; uint_fast16_t cap; assert(outl->capLines); if (outl->capLines > UINT16_MAX / 2) return -1; - cap = (uint_fast16_t) (2U * outl->capLines); + cap = (uint_fast16_t)(2U * outl->capLines); if (!(mem = reallocarray(outl->lines, cap, sizeof *outl->lines))) return -1; - outl->capLines = (uint_least16_t) cap; - outl->lines = mem; + outl->capLines = (uint_least16_t)cap; + outl->lines = mem; return 0; } -static inline int -is_safe_offset(SFT_Font *font, uint_fast32_t offset, uint_fast32_t margin) -{ - if (offset > font->size) return 0; - if (font->size - offset < margin) return 0; +static inline int is_safe_offset(SFT_Font *font, uint_fast32_t offset, uint_fast32_t margin) { + if (offset > font->size) + return 0; + if (font->size - offset < margin) + return 0; return 1; } -/* Like bsearch(), but returns the next highest element if key could not be found. */ -static void * -csearch(const void *key, const void *base, - size_t nmemb, size_t size, - int (*compar)(const void *, const void *)) -{ +/* Like bsearch(), but returns the next highest element if key could not be + * found. */ +static void *csearch(const void *key, const void *base, size_t nmemb, size_t size, + int (*compar)(const void *, const void *)) { const uint8_t *bytes = base, *sample; size_t low = 0, high = nmemb - 1, mid; - if (!nmemb) return NULL; + if (!nmemb) + return NULL; while (low != high) { mid = low + (high - low) / 2; sample = bytes + mid * size; @@ -703,106 +661,87 @@ csearch(const void *key, const void *base, high = mid; } } - return (uint8_t *) bytes + low * size; + return (uint8_t *)bytes + low * size; } /* Used as a comparison function for [bc]search(). */ -static int -cmpu16(const void *a, const void *b) -{ - return memcmp(a, b, 2); -} +static int cmpu16(const void *a, const void *b) { return memcmp(a, b, 2); } /* Used as a comparison function for [bc]search(). */ -static int -cmpu32(const void *a, const void *b) -{ - return memcmp(a, b, 4); -} +static int cmpu32(const void *a, const void *b) { return memcmp(a, b, 4); } -static inline uint_least8_t -getu8(SFT_Font *font, uint_fast32_t offset) -{ +static inline uint_least8_t getu8(SFT_Font *font, uint_fast32_t offset) { assert(offset + 1 <= font->size); return *(font->memory + offset); } -static inline int_least8_t -geti8(SFT_Font *font, uint_fast32_t offset) -{ - return (int_least8_t) getu8(font, offset); +static inline int_least8_t geti8(SFT_Font *font, uint_fast32_t offset) { + return (int_least8_t)getu8(font, offset); } -static inline uint_least16_t -getu16(SFT_Font *font, uint_fast32_t offset) -{ +static inline uint_least16_t getu16(SFT_Font *font, uint_fast32_t offset) { assert(offset + 2 <= font->size); const uint8_t *base = font->memory + offset; - uint_least16_t b1 = base[0], b0 = base[1]; - return (uint_least16_t) (b1 << 8 | b0); + uint_least16_t b1 = base[0], b0 = base[1]; + return (uint_least16_t)(b1 << 8 | b0); } -static inline int16_t -geti16(SFT_Font *font, uint_fast32_t offset) -{ - return (int_least16_t) getu16(font, offset); +static inline int16_t geti16(SFT_Font *font, uint_fast32_t offset) { + return (int_least16_t)getu16(font, offset); } -static inline uint32_t -getu32(SFT_Font *font, uint_fast32_t offset) -{ +static inline uint32_t getu32(SFT_Font *font, uint_fast32_t offset) { assert(offset + 4 <= font->size); const uint8_t *base = font->memory + offset; - uint_least32_t b3 = base[0], b2 = base[1], b1 = base[2], b0 = base[3]; - return (uint_least32_t) (b3 << 24 | b2 << 16 | b1 << 8 | b0); + uint_least32_t b3 = base[0], b2 = base[1], b1 = base[2], b0 = base[3]; + return (uint_least32_t)(b3 << 24 | b2 << 16 | b1 << 8 | b0); } -static int -gettable(SFT_Font *font, char tag[4], uint_fast32_t *offset) -{ +static int gettable(SFT_Font *font, char tag[4], uint_fast32_t *offset) { void *match; unsigned int numTables; - /* No need to bounds-check access to the first 12 bytes - this gets already checked by init_font(). */ + /* No need to bounds-check access to the first 12 bytes - this gets already + * checked by init_font(). */ numTables = getu16(font, 4); - if (!is_safe_offset(font, 12, (uint_fast32_t) numTables * 16)) + if (!is_safe_offset(font, 12, (uint_fast32_t)numTables * 16)) return -1; if (!(match = bsearch(tag, font->memory + 12, numTables, 16, cmpu32))) return -1; - *offset = getu32(font, (uint_fast32_t) ((uint8_t *) match - font->memory + 8)); + *offset = getu32(font, (uint_fast32_t)((uint8_t *)match - font->memory + 8)); return 0; } -static int -cmap_fmt4(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph *glyph) -{ +static int cmap_fmt4(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph *glyph) { const uint8_t *segPtr; uint_fast32_t segIdxX2; uint_fast32_t endCodes, startCodes, idDeltas, idRangeOffsets, idOffset; uint_fast16_t segCountX2, idRangeOffset, startCode, shortCode, idDelta, id; - uint8_t key[2] = { (uint8_t) (charCode >> 8), (uint8_t) charCode }; + uint8_t key[2] = {(uint8_t)(charCode >> 8), (uint8_t)charCode}; /* cmap format 4 only supports the Unicode BMP. */ if (charCode > 0xFFFF) { *glyph = 0; return 0; } - shortCode = (uint_fast16_t) charCode; + shortCode = (uint_fast16_t)charCode; if (!is_safe_offset(font, table, 8)) return -1; segCountX2 = getu16(font, table); if ((segCountX2 & 1) || !segCountX2) return -1; /* Find starting positions of the relevant arrays. */ - endCodes = table + 8; - startCodes = endCodes + segCountX2 + 2; - idDeltas = startCodes + segCountX2; + endCodes = table + 8; + startCodes = endCodes + segCountX2 + 2; + idDeltas = startCodes + segCountX2; idRangeOffsets = idDeltas + segCountX2; if (!is_safe_offset(font, idRangeOffsets, segCountX2)) return -1; /* Find the segment that contains shortCode by binary searching over * the highest codes in the segments. */ segPtr = csearch(key, font->memory + endCodes, segCountX2 / 2, 2, cmpu16); - segIdxX2 = (uint_fast32_t) (segPtr - (font->memory + endCodes)); - /* Look up segment info from the arrays & short circuit if the spec requires. */ + segIdxX2 = (uint_fast32_t)(segPtr - (font->memory + endCodes)); + /* Look up segment info from the arrays & short circuit if the spec + * requires. + */ if ((startCode = getu16(font, startCodes + segIdxX2)) > shortCode) return 0; idDelta = getu16(font, idDeltas + segIdxX2); @@ -812,7 +751,8 @@ cmap_fmt4(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph *gl return 0; } /* Calculate offset into glyph array and determine ultimate value. */ - idOffset = idRangeOffsets + segIdxX2 + idRangeOffset + 2U * (unsigned int) (shortCode - startCode); + idOffset = + idRangeOffsets + segIdxX2 + idRangeOffset + 2U * (unsigned int)(shortCode - startCode); if (!is_safe_offset(font, idOffset, 2)) return -1; id = getu16(font, idOffset); @@ -821,9 +761,7 @@ cmap_fmt4(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph *gl return 0; } -static int -cmap_fmt6(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph *glyph) -{ +static int cmap_fmt6(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph *glyph) { unsigned int firstCode, entryCount; /* cmap format 6 only supports the Unicode BMP. */ if (charCode > 0xFFFF) { @@ -832,7 +770,7 @@ cmap_fmt6(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph *gl } if (!is_safe_offset(font, table, 4)) return -1; - firstCode = getu16(font, table); + firstCode = getu16(font, table); entryCount = getu16(font, table + 2); if (!is_safe_offset(font, table, 4 + 2 * entryCount)) return -1; @@ -845,15 +783,14 @@ cmap_fmt6(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph *gl return 0; } -static int -cmap_fmt12_13(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph *glyph, int which) -{ +static int cmap_fmt12_13( + SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph *glyph, int which) { uint32_t len, numEntries; uint_fast32_t i; *glyph = 0; - /* check that the entire header is present */ + /* check that the entire header is present */ if (!is_safe_offset(font, table, 16)) return -1; @@ -876,7 +813,7 @@ cmap_fmt12_13(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph continue; glyphOffset = getu32(font, table + (i * 12) + 16 + 8); if (which == 12) - *glyph = (charCode-firstCode) + glyphOffset; + *glyph = (charCode - firstCode) + glyphOffset; else *glyph = glyphOffset; return 0; @@ -886,13 +823,11 @@ cmap_fmt12_13(SFT_Font *font, uint_fast32_t table, SFT_UChar charCode, SFT_Glyph } /* Maps Unicode code points to glyph indices. */ -static int -glyph_id(SFT_Font *font, SFT_UChar charCode, SFT_Glyph *glyph) -{ +static int glyph_id(SFT_Font *font, SFT_UChar charCode, SFT_Glyph *glyph) { uint_fast32_t cmap, entry, table; unsigned int idx, numEntries; int type, format; - + *glyph = 0; if (gettable(font, "cmap", &cmap) < 0) @@ -949,9 +884,7 @@ glyph_id(SFT_Font *font, SFT_UChar charCode, SFT_Glyph *glyph) return -1; } -static int -hor_metrics(SFT_Font *font, SFT_Glyph glyph, int *advanceWidth, int *leftSideBearing) -{ +static int hor_metrics(SFT_Font *font, SFT_Glyph glyph, int *advanceWidth, int *leftSideBearing) { uint_fast32_t hmtx, offset, boundary; if (gettable(font, "hmtx", &hmtx) < 0) return -1; @@ -965,15 +898,15 @@ hor_metrics(SFT_Font *font, SFT_Glyph glyph, int *advanceWidth, int *leftSideBea return 0; } else { /* glyph is inside short metrics segment. */ - boundary = hmtx + 4U * (uint_fast32_t) font->numLongHmtx; + boundary = hmtx + 4U * (uint_fast32_t)font->numLongHmtx; if (boundary < 4) return -1; - + offset = boundary - 4; if (!is_safe_offset(font, offset, 4)) return -1; *advanceWidth = getu16(font, offset); - + offset = boundary + 2 * (glyph - font->numLongHmtx); if (!is_safe_offset(font, offset, 2)) return -1; @@ -982,9 +915,7 @@ hor_metrics(SFT_Font *font, SFT_Glyph glyph, int *advanceWidth, int *leftSideBea } } -static int -glyph_bbox(const SFT *sft, uint_fast32_t outline, int box[4]) -{ +static int glyph_bbox(const SFT *sft, uint_fast32_t outline, int box[4]) { double xScale, yScale; /* Read the bounding box from the font file verbatim. */ if (!is_safe_offset(sft->font, outline, 10)) @@ -998,17 +929,15 @@ glyph_bbox(const SFT *sft, uint_fast32_t outline, int box[4]) /* Transform the bounding box into SFT coordinate space. */ xScale = sft->xScale / sft->font->unitsPerEm; yScale = sft->yScale / sft->font->unitsPerEm; - box[0] = (int) floor(box[0] * xScale + sft->xOffset); - box[1] = (int) floor(box[1] * yScale + sft->yOffset); - box[2] = (int) ceil (box[2] * xScale + sft->xOffset); - box[3] = (int) ceil (box[3] * yScale + sft->yOffset); + box[0] = (int)floor(box[0] * xScale + sft->xOffset); + box[1] = (int)floor(box[1] * yScale + sft->yOffset); + box[2] = (int)ceil(box[2] * xScale + sft->xOffset); + box[3] = (int)ceil(box[3] * yScale + sft->yOffset); return 0; } /* Returns the offset into the font that the glyph's outline is stored at. */ -static int -outline_offset(SFT_Font *font, SFT_Glyph glyph, uint_fast32_t *offset) -{ +static int outline_offset(SFT_Font *font, SFT_Glyph glyph, uint_fast32_t *offset) { uint_fast32_t loca, glyf; uint_fast32_t base, this, next; @@ -1022,9 +951,9 @@ outline_offset(SFT_Font *font, SFT_Glyph glyph, uint_fast32_t *offset) if (!is_safe_offset(font, base, 4)) return -1; - - this = 2U * (uint_fast32_t) getu16(font, base); - next = 2U * (uint_fast32_t) getu16(font, base + 2); + + this = 2U * (uint_fast32_t)getu16(font, base); + next = 2U * (uint_fast32_t)getu16(font, base + 2); } else { base = loca + 4 * glyph; @@ -1039,10 +968,10 @@ outline_offset(SFT_Font *font, SFT_Glyph glyph, uint_fast32_t *offset) return 0; } -/* For a 'simple' outline, determines each point of the outline with a set of flags. */ -static int -simple_flags(SFT_Font *font, uint_fast32_t *offset, uint_fast16_t numPts, uint8_t *flags) -{ +/* For a 'simple' outline, determines each point of the outline with a set of + * flags. */ +static int simple_flags( + SFT_Font *font, uint_fast32_t *offset, uint_fast16_t numPts, uint8_t *flags) { uint_fast32_t off = *offset; uint_fast16_t i; uint8_t value = 0, repeat = 0; @@ -1065,10 +994,10 @@ simple_flags(SFT_Font *font, uint_fast32_t *offset, uint_fast16_t numPts, uint8_ return 0; } -/* For a 'simple' outline, decodes both X and Y coordinates for each point of the outline. */ -static int -simple_points(SFT_Font *font, uint_fast32_t offset, uint_fast16_t numPts, uint8_t *flags, Point *points) -{ +/* For a 'simple' outline, decodes both X and Y coordinates for each point of + * the outline. */ +static int simple_points( + SFT_Font *font, uint_fast32_t offset, uint_fast16_t numPts, uint8_t *flags, Point *points) { long accum, value, bit; uint_fast16_t i; @@ -1077,7 +1006,7 @@ simple_points(SFT_Font *font, uint_fast32_t offset, uint_fast16_t numPts, uint8_ if (flags[i] & X_CHANGE_IS_SMALL) { if (!is_safe_offset(font, offset, 1)) return -1; - value = (long) getu8(font, offset++); + value = (long)getu8(font, offset++); bit = !!(flags[i] & X_CHANGE_IS_POSITIVE); accum -= (value ^ -bit) + bit; } else if (!(flags[i] & X_CHANGE_IS_ZERO)) { @@ -1086,7 +1015,7 @@ simple_points(SFT_Font *font, uint_fast32_t offset, uint_fast16_t numPts, uint8_ accum += geti16(font, offset); offset += 2; } - points[i].x = (double) accum; + points[i].x = (double)accum; } accum = 0L; @@ -1094,7 +1023,7 @@ simple_points(SFT_Font *font, uint_fast32_t offset, uint_fast16_t numPts, uint8_ if (flags[i] & Y_CHANGE_IS_SMALL) { if (!is_safe_offset(font, offset, 1)) return -1; - value = (long) getu8(font, offset++); + value = (long)getu8(font, offset++); bit = !!(flags[i] & Y_CHANGE_IS_POSITIVE); accum -= (value ^ -bit) + bit; } else if (!(flags[i] & Y_CHANGE_IS_ZERO)) { @@ -1103,58 +1032,62 @@ simple_points(SFT_Font *font, uint_fast32_t offset, uint_fast16_t numPts, uint8_ accum += geti16(font, offset); offset += 2; } - points[i].y = (double) accum; + points[i].y = (double)accum; } return 0; } -static int -decode_contour(uint8_t *flags, uint_fast16_t basePoint, uint_fast16_t count, Outline *outl) -{ +static int decode_contour( + uint8_t *flags, uint_fast16_t basePoint, uint_fast16_t count, Outline *outl) { uint_fast16_t i; uint_least16_t looseEnd, beg, ctrl, center, cur; unsigned int gotCtrl; - /* Skip contours with less than two points, since the following algorithm can't handle them and - * they should appear invisible either way (because they don't have any area). */ - if (count < 2) return 0; + /* Skip contours with less than two points, since the following algorithm + * can't handle them and they should appear invisible either way (because + * they don't have any area). */ + if (count < 2) + return 0; assert(basePoint <= UINT16_MAX - count); if (flags[0] & POINT_IS_ON_CURVE) { - looseEnd = (uint_least16_t) basePoint++; + looseEnd = (uint_least16_t)basePoint++; ++flags; --count; } else if (flags[count - 1] & POINT_IS_ON_CURVE) { - looseEnd = (uint_least16_t) (basePoint + --count); + looseEnd = (uint_least16_t)(basePoint + --count); } else { if (outl->numPoints >= outl->capPoints && grow_points(outl) < 0) return -1; looseEnd = outl->numPoints; - outl->points[outl->numPoints++] = midpoint( - outl->points[basePoint], - outl->points[basePoint + count - 1]); + outl->points[outl->numPoints++] = + midpoint(outl->points[basePoint], outl->points[basePoint + count - 1]); } beg = looseEnd; gotCtrl = 0; for (i = 0; i < count; ++i) { - /* cur can't overflow because we ensure that basePoint + count < 0xFFFF before calling decode_contour(). */ - cur = (uint_least16_t) (basePoint + i); - /* NOTE clang-analyzer will often flag this and another piece of code because it thinks that flags and - * outl->points + basePoint don't always get properly initialized -- even when you explicitly loop over both - * and set every element to zero (but not when you use memset). This is a known clang-analyzer bug: - * http://clang-developers.42468.n3.nabble.com/StaticAnalyzer-False-positive-with-loop-handling-td4053875.html */ + /* cur can't overflow because we ensure that basePoint + count < 0xFFFF + * before calling decode_contour(). */ + cur = (uint_least16_t)(basePoint + i); + /* NOTE clang-analyzer will often flag this and another piece of code + * because it thinks that flags and outl->points + basePoint don't + * always get properly initialized -- even when you explicitly loop over + * both and set every element to zero (but not when you use memset). + * This is a known clang-analyzer bug: + * http://clang-developers.42468.n3.nabble.com/StaticAnalyzer-False-positive-with-loop-handling-td4053875.html + */ if (flags[i] & POINT_IS_ON_CURVE) { if (gotCtrl) { if (outl->numCurves >= outl->capCurves && grow_curves(outl) < 0) return -1; - outl->curves[outl->numCurves++] = (Curve) { beg, cur, ctrl }; + outl->curves[outl->numCurves++] = (Curve){beg, cur, ctrl}; } else { if (outl->numLines >= outl->capLines && grow_lines(outl) < 0) return -1; - outl->lines[outl->numLines++] = (Line) { beg, cur }; + outl->lines[outl->numLines++] = (Line){beg, cur}; } beg = cur; gotCtrl = 0; @@ -1168,7 +1101,7 @@ decode_contour(uint8_t *flags, uint_fast16_t basePoint, uint_fast16_t count, Out if (outl->numCurves >= outl->capCurves && grow_curves(outl) < 0) return -1; - outl->curves[outl->numCurves++] = (Curve) { beg, center, ctrl }; + outl->curves[outl->numCurves++] = (Curve){beg, center, ctrl}; beg = center; } @@ -1179,19 +1112,18 @@ decode_contour(uint8_t *flags, uint_fast16_t basePoint, uint_fast16_t count, Out if (gotCtrl) { if (outl->numCurves >= outl->capCurves && grow_curves(outl) < 0) return -1; - outl->curves[outl->numCurves++] = (Curve) { beg, looseEnd, ctrl }; + outl->curves[outl->numCurves++] = (Curve){beg, looseEnd, ctrl}; } else { if (outl->numLines >= outl->capLines && grow_lines(outl) < 0) return -1; - outl->lines[outl->numLines++] = (Line) { beg, looseEnd }; + outl->lines[outl->numLines++] = (Line){beg, looseEnd}; } return 0; } -static int -simple_outline(SFT_Font *font, uint_fast32_t offset, unsigned int numContours, Outline *outl) -{ +static int simple_outline( + SFT_Font *font, uint_fast32_t offset, unsigned int numContours, Outline *outl) { uint_fast16_t *endPts = NULL; uint8_t *flags = NULL; uint_fast16_t numPts; @@ -1214,7 +1146,7 @@ simple_outline(SFT_Font *font, uint_fast32_t offset, unsigned int numContours, O if (grow_points(outl) < 0) goto failure; } - + STACK_ALLOC(endPts, uint_fast16_t, 16, numContours); if (endPts == NULL) goto failure; @@ -1227,8 +1159,9 @@ simple_outline(SFT_Font *font, uint_fast32_t offset, unsigned int numContours, O offset += 2; } /* Ensure that endPts are never falling. - * Falling endPts have no sensible interpretation and most likely only occur in malicious input. - * Therefore, we bail, should we ever encounter such input. */ + * Falling endPts have no sensible interpretation and most likely only occur + * in malicious input. Therefore, we bail, should we ever encounter such + * input. */ for (i = 0; i < numContours - 1; ++i) { if (endPts[i + 1] < endPts[i] + 1) goto failure; @@ -1239,7 +1172,7 @@ simple_outline(SFT_Font *font, uint_fast32_t offset, unsigned int numContours, O goto failure; if (simple_points(font, offset, numPts, flags, outl->points + basePoint) < 0) goto failure; - outl->numPoints = (uint_least16_t) (outl->numPoints + numPts); + outl->numPoints = (uint_least16_t)(outl->numPoints + numPts); uint_fast16_t beg = 0; for (i = 0; i < numContours; ++i) { @@ -1258,13 +1191,12 @@ simple_outline(SFT_Font *font, uint_fast32_t offset, unsigned int numContours, O return -1; } -static int -compound_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *outl) -{ +static int compound_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *outl) { double local[6]; uint_fast32_t outline; unsigned int flags, glyph, basePoint; - /* Guard against infinite recursion (compound glyphs that have themselves as component). */ + /* Guard against infinite recursion (compound glyphs that have themselves as + * component). */ if (recDepth >= 4) return -1; do { @@ -1274,7 +1206,8 @@ compound_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *ou flags = getu16(font, offset); glyph = getu16(font, offset + 2); offset += 4; - /* We don't implement point matching, and neither does stb_truetype for that matter. */ + /* We don't implement point matching, and neither does stb_truetype for + * that matter. */ if (!(flags & ACTUAL_XY_OFFSETS)) return -1; /* Read additional X and Y offsets (in FUnits) of this component. */ @@ -1315,10 +1248,11 @@ compound_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *ou local[0] = 1.0; local[3] = 1.0; } - /* At this point, Apple's spec more or less tells you to scale the matrix by its own L1 norm. - * But stb_truetype scales by the L2 norm. And FreeType2 doesn't scale at all. - * Furthermore, Microsoft's spec doesn't even mention anything like this. - * It's almost as if nobody ever uses this feature anyway. */ + /* At this point, Apple's spec more or less tells you to scale the + * matrix by its own L1 norm. But stb_truetype scales by the L2 norm. + * And FreeType2 doesn't scale at all. Furthermore, Microsoft's spec + * doesn't even mention anything like this. It's almost as if nobody + * ever uses this feature anyway. */ if (outline_offset(font, glyph, &outline) < 0) return -1; if (outline) { @@ -1332,16 +1266,14 @@ compound_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *ou return 0; } -static int -decode_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *outl) -{ +static int decode_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *outl) { int numContours; if (!is_safe_offset(font, offset, 10)) return -1; numContours = geti16(font, offset); if (numContours > 0) { /* Glyph has a 'simple' outline consisting of a number of contours. */ - return simple_outline(font, offset + 10, (unsigned int) numContours, outl); + return simple_outline(font, offset + 10, (unsigned int)numContours, outl); } else if (numContours < 0) { /* Glyph has a compound outline combined from mutiple other outlines. */ return compound_outline(font, offset + 10, recDepth, outl); @@ -1350,23 +1282,20 @@ decode_outline(SFT_Font *font, uint_fast32_t offset, int recDepth, Outline *outl } } -/* A heuristic to tell whether a given curve can be approximated closely enough by a line. */ -static int -is_flat(Outline *outl, Curve curve) -{ +/* A heuristic to tell whether a given curve can be approximated closely enough + * by a line. */ +static int is_flat(Outline *outl, Curve curve) { const double maxArea2 = 2.0; Point a = outl->points[curve.beg]; Point b = outl->points[curve.ctrl]; Point c = outl->points[curve.end]; - Point g = { b.x-a.x, b.y-a.y }; - Point h = { c.x-a.x, c.y-a.y }; - double area2 = fabs(g.x*h.y-h.x*g.y); + Point g = {b.x - a.x, b.y - a.y}; + Point h = {c.x - a.x, c.y - a.y}; + double area2 = fabs(g.x * h.y - h.x * g.y); return area2 <= maxArea2; } -static int -tesselate_curve(Curve curve, Outline *outl) -{ +static int tesselate_curve(Curve curve, Outline *outl) { /* From my tests I can conclude that this stack barely reaches a top height * of 4 elements even for the largest font sizes I'm willing to support. And * as space requirements should only grow logarithmically, I think 10 is @@ -1378,8 +1307,9 @@ tesselate_curve(Curve curve, Outline *outl) if (is_flat(outl, curve) || top >= STACK_SIZE) { if (outl->numLines >= outl->capLines && grow_lines(outl) < 0) return -1; - outl->lines[outl->numLines++] = (Line) { curve.beg, curve.end }; - if (top == 0) break; + outl->lines[outl->numLines++] = (Line){curve.beg, curve.end}; + if (top == 0) + break; curve = stack[--top]; } else { uint_least16_t ctrl0 = outl->numPoints; @@ -1400,17 +1330,15 @@ tesselate_curve(Curve curve, Outline *outl) outl->points[pivot] = midpoint(outl->points[ctrl0], outl->points[ctrl1]); ++outl->numPoints; - stack[top++] = (Curve) { curve.beg, pivot, ctrl0 }; - curve = (Curve) { pivot, curve.end, ctrl1 }; + stack[top++] = (Curve){curve.beg, pivot, ctrl0}; + curve = (Curve){pivot, curve.end, ctrl1}; } } return 0; #undef STACK_SIZE } -static int -tesselate_curves(Outline *outl) -{ +static int tesselate_curves(Outline *outl) { unsigned int i; for (i = 0; i < outl->numCurves; ++i) { if (tesselate_curve(outl->curves[i], outl) < 0) @@ -1419,18 +1347,24 @@ tesselate_curves(Outline *outl) return 0; } -/* Draws a line into the buffer. Uses a custom 2D raycasting algorithm to do so. */ -static void -draw_line(Raster buf, Point origin, Point goal) -{ +/* Draws a line into the buffer. Uses a custom 2D raycasting algorithm to do so. + */ +static void draw_line(Raster buf, Point origin, Point goal) { Point delta; Point nextCrossing; Point crossingIncr; double halfDeltaX; double prevDistance = 0.0, nextDistance; double xAverage, yDifference; - struct { int x, y; } pixel; - struct { int x, y; } dir; + + struct { + int x, y; + } pixel; + + struct { + int x, y; + } dir; + int step, numSteps = 0; Cell *restrict cptr, cell; @@ -1442,7 +1376,7 @@ draw_line(Raster buf, Point origin, Point goal) if (!dir.y) { return; } - + crossingIncr.x = dir.x ? fabs(1.0 / delta.x) : 1.0; crossingIncr.y = fabs(1.0 / delta.y); @@ -1482,7 +1416,7 @@ draw_line(Raster buf, Point origin, Point goal) cptr = &buf.cells[pixel.y * buf.width + pixel.x]; cell = *cptr; cell.cover += yDifference; - xAverage -= (double) pixel.x; + xAverage -= (double)pixel.x; cell.area += (1.0 - xAverage) * yDifference; *cptr = cell; prevDistance = nextDistance; @@ -1499,57 +1433,51 @@ draw_line(Raster buf, Point origin, Point goal) cptr = &buf.cells[pixel.y * buf.width + pixel.x]; cell = *cptr; cell.cover += yDifference; - xAverage -= (double) pixel.x; + xAverage -= (double)pixel.x; cell.area += (1.0 - xAverage) * yDifference; *cptr = cell; } -static void -draw_lines(Outline *outl, Raster buf) -{ +static void draw_lines(Outline *outl, Raster buf) { unsigned int i; for (i = 0; i < outl->numLines; ++i) { - Line line = outl->lines[i]; + Line line = outl->lines[i]; Point origin = outl->points[line.beg]; - Point goal = outl->points[line.end]; + Point goal = outl->points[line.end]; draw_line(buf, origin, goal); } } /* Integrate the values in the buffer to arrive at the final grayscale image. */ -static void -post_process(Raster buf, uint8_t *image) -{ +static void post_process(Raster buf, uint8_t *image) { Cell cell; double accum = 0.0, value; unsigned int i, num; - num = (unsigned int) buf.width * (unsigned int) buf.height; + num = (unsigned int)buf.width * (unsigned int)buf.height; for (i = 0; i < num; ++i) { - cell = buf.cells[i]; - value = fabs(accum + cell.area); - value = MIN(value, 1.0); - value = value * 255.0 + 0.5; - image[i] = (uint8_t) value; - accum += cell.cover; + cell = buf.cells[i]; + value = fabs(accum + cell.area); + value = MIN(value, 1.0); + value = value * 255.0 + 0.5; + image[i] = (uint8_t)value; + accum += cell.cover; } } -static int -render_outline(Outline *outl, double transform[6], SFT_Image image) -{ +static int render_outline(Outline *outl, double transform[6], SFT_Image image) { Cell *cells = NULL; Raster buf; unsigned int numPixels; - - numPixels = (unsigned int) image.width * (unsigned int) image.height; + + numPixels = (unsigned int)image.width * (unsigned int)image.height; STACK_ALLOC(cells, Cell, 128 * 128, numPixels); if (!cells) { return -1; } memset(cells, 0, numPixels * sizeof *cells); - buf.cells = cells; - buf.width = image.width; + buf.cells = cells; + buf.width = image.width; buf.height = image.height; transform_points(outl->numPoints, outl->points, transform); diff --git a/bmp/lib/schrift.h b/bmp/lib/schrift.h index 3757aec..c27f619 100644 --- a/bmp/lib/schrift.h +++ b/bmp/lib/schrift.h @@ -5,7 +5,7 @@ * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -26,66 +26,60 @@ extern "C" { #define SFT_DOWNWARD_Y 0x01 -typedef struct SFT SFT; -typedef struct SFT_Font SFT_Font; -typedef uint_least32_t SFT_UChar; /* Guaranteed to be compatible with char32_t. */ -typedef uint_fast32_t SFT_Glyph; +typedef struct SFT SFT; +typedef struct SFT_Font SFT_Font; +typedef uint_least32_t SFT_UChar; /* Guaranteed to be compatible with char32_t. */ +typedef uint_fast32_t SFT_Glyph; typedef struct SFT_LMetrics SFT_LMetrics; typedef struct SFT_GMetrics SFT_GMetrics; -typedef struct SFT_Kerning SFT_Kerning; -typedef struct SFT_Image SFT_Image; +typedef struct SFT_Kerning SFT_Kerning; +typedef struct SFT_Image SFT_Image; -struct SFT -{ +struct SFT { SFT_Font *font; - double xScale; - double yScale; - double xOffset; - double yOffset; - int flags; + double xScale; + double yScale; + double xOffset; + double yOffset; + int flags; }; -struct SFT_LMetrics -{ +struct SFT_LMetrics { double ascender; double descender; double lineGap; }; -struct SFT_GMetrics -{ +struct SFT_GMetrics { double advanceWidth; double leftSideBearing; - int yOffset; - int minWidth; - int minHeight; + int yOffset; + int minWidth; + int minHeight; }; -struct SFT_Kerning -{ +struct SFT_Kerning { double xShift; double yShift; }; -struct SFT_Image -{ +struct SFT_Image { void *pixels; - int width; - int height; + int width; + int height; }; const char *sft_version(void); -SFT_Font *sft_loadmem (const void *mem, size_t size); +SFT_Font *sft_loadmem(const void *mem, size_t size); SFT_Font *sft_loadfile(const char *filename); -void sft_freefont(SFT_Font *font); +void sft_freefont(SFT_Font *font); int sft_lmetrics(const SFT *sft, SFT_LMetrics *metrics); -int sft_lookup (const SFT *sft, SFT_UChar codepoint, SFT_Glyph *glyph); +int sft_lookup(const SFT *sft, SFT_UChar codepoint, SFT_Glyph *glyph); int sft_gmetrics(const SFT *sft, SFT_Glyph glyph, SFT_GMetrics *metrics); -int sft_kerning (const SFT *sft, SFT_Glyph leftGlyph, SFT_Glyph rightGlyph, - SFT_Kerning *kerning); -int sft_render (const SFT *sft, SFT_Glyph glyph, SFT_Image image); +int sft_kerning(const SFT *sft, SFT_Glyph leftGlyph, SFT_Glyph rightGlyph, SFT_Kerning *kerning); +int sft_render(const SFT *sft, SFT_Glyph glyph, SFT_Image image); #ifdef __cplusplus } diff --git a/bmp/region.c b/bmp/region.c index 20332f6..2a26308 100644 --- a/bmp/region.c +++ b/bmp/region.c @@ -1,479 +1,473 @@ #include "region.h" -//https://wx.comake.online/doc/ds82ff82j7jsd9-SSD220/customer/development/mi/en/exclude/mi_rgn.html - +// https://wx.comake.online/doc/ds82ff82j7jsd9-SSD220/customer/development/mi/en/exclude/mi_rgn.html #ifdef __SIGMASTAR__ -int PIXEL_FORMAT_DEFAULT = E_MI_RGN_PIXEL_FORMAT_I4; //0 for PIXEL_FORMAT_1555 , 4 for E_MI_RGN_PIXEL_FORMAT_I8 +int PIXEL_FORMAT_DEFAULT = E_MI_RGN_PIXEL_FORMAT_I4; // 0 for PIXEL_FORMAT_1555 , 4 for + // E_MI_RGN_PIXEL_FORMAT_I8 #else -int PIXEL_FORMAT_DEFAULT = 3; //0 for PIXEL_FORMAT_1555 , 4 for E_MI_RGN_PIXEL_FORMAT_I8 +int PIXEL_FORMAT_DEFAULT = 3; // 0 for PIXEL_FORMAT_1555 , 4 for E_MI_RGN_PIXEL_FORMAT_I8 #endif extern bool verbose; const double inv16 = 1.0 / 16.0; -int create_region(int *handle, int x, int y, int width, int height) -{ - int s32Ret = -1; +int create_region(int *handle, int x, int y, int width, int height) { + int s32Ret = -1; #if !defined(_x86) && !defined(__ROCKCHIP__) #ifdef __SIGMASTAR__ - MI_RGN_ChnPort_t stChn; + MI_RGN_ChnPort_t stChn; - MI_RGN_Attr_t stRegionCurrent; - MI_RGN_Attr_t stRegion; + MI_RGN_Attr_t stRegionCurrent; + MI_RGN_Attr_t stRegion; - MI_RGN_ChnPortParam_t stChnAttr; - MI_RGN_ChnPortParam_t stChnAttrCurrent; + MI_RGN_ChnPortParam_t stChnAttr; + MI_RGN_ChnPortParam_t stChnAttrCurrent; - stChn.eModId = E_MI_RGN_MODID_VPE; - stChn.s32DevId = 0; - stChn.s32ChnId = 0; + stChn.eModId = E_MI_RGN_MODID_VPE; + stChn.s32DevId = 0; + stChn.s32ChnId = 0; - stRegion.eType = E_MI_RGN_TYPE_OSD; - stRegion.stOsdInitParam.stSize.u32Height = height; - stRegion.stOsdInitParam.stSize.u32Width = width; -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - stRegion.stOsdInitParam.ePixelFmt = PIXEL_FORMAT_DEFAULT ;//PIXEL_FORMAT_1555;// E_MI_RGN_PIXEL_FORMAT_I4; //;PIXEL_FORMAT_1555;//E_MI_RGN_PIXEL_FORMAT_I4;//PIXEL_FORMAT_1555 + stRegion.eType = E_MI_RGN_TYPE_OSD; + stRegion.stOsdInitParam.stSize.u32Height = height; + stRegion.stOsdInitParam.stSize.u32Width = width; + //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + stRegion.stOsdInitParam.ePixelFmt = + PIXEL_FORMAT_DEFAULT; // PIXEL_FORMAT_1555;// E_MI_RGN_PIXEL_FORMAT_I4; + // //;PIXEL_FORMAT_1555;//E_MI_RGN_PIXEL_FORMAT_I4;//PIXEL_FORMAT_1555 - s32Ret = MI_RGN_GetAttr(*handle, &stRegionCurrent); + s32Ret = MI_RGN_GetAttr(*handle, &stRegionCurrent); #else - MPP_CHN_S stChn; + MPP_CHN_S stChn; - RGN_ATTR_S stRegionCurrent; - RGN_ATTR_S stRegion; + RGN_ATTR_S stRegionCurrent; + RGN_ATTR_S stRegion; - RGN_CHN_ATTR_S stChnAttr; - RGN_CHN_ATTR_S stChnAttrCurrent; + RGN_CHN_ATTR_S stChnAttr; + RGN_CHN_ATTR_S stChnAttrCurrent; - stChn.enModId = HI_ID_VENC; - stChn.s32DevId = 0; - stChn.s32ChnId = 0; + stChn.enModId = HI_ID_VENC; + stChn.s32DevId = 0; + stChn.s32ChnId = 0; - stRegion.enType = OVERLAY_RGN; - stRegion.unAttr.stOverlay.stSize.u32Height = height; - stRegion.unAttr.stOverlay.stSize.u32Width = width; - stRegion.unAttr.stOverlay.u32CanvasNum = 2; - stRegion.unAttr.stOverlay.enPixelFmt = PIXEL_FORMAT_1555; - stRegion.unAttr.stOverlay.u32BgColor = 0x7fff; + stRegion.enType = OVERLAY_RGN; + stRegion.unAttr.stOverlay.stSize.u32Height = height; + stRegion.unAttr.stOverlay.stSize.u32Width = width; + stRegion.unAttr.stOverlay.u32CanvasNum = 2; + stRegion.unAttr.stOverlay.enPixelFmt = PIXEL_FORMAT_1555; + stRegion.unAttr.stOverlay.u32BgColor = 0x7fff; - s32Ret = HI_MPI_RGN_GetAttr(*handle, &stRegionCurrent); + s32Ret = HI_MPI_RGN_GetAttr(*handle, &stRegionCurrent); #endif - if (s32Ret) - { - if (verbose) - fprintf(stderr, "[%s:%d]RGN_GetAttr failed with %#x , creating region %d...\n", __func__, __LINE__, s32Ret, *handle); + if (s32Ret) { + if (verbose) + fprintf(stderr, "[%s:%d]RGN_GetAttr failed with %#x , creating region %d...\n", + __func__, __LINE__, s32Ret, *handle); #ifdef __SIGMASTAR__ - s32Ret = MI_RGN_Create(*handle, &stRegion); + s32Ret = MI_RGN_Create(*handle, &stRegion); #else - s32Ret = HI_MPI_RGN_Create(*handle, &stRegion); + s32Ret = HI_MPI_RGN_Create(*handle, &stRegion); #endif - if (s32Ret) - { - fprintf(stderr, "[%s:%d]RGN_Create failed with %#x!\n", __func__, __LINE__, s32Ret); - return -1; - } - } - else - { + if (s32Ret) { + fprintf(stderr, "[%s:%d]RGN_Create failed with %#x!\n", __func__, __LINE__, s32Ret); + return -1; + } + } else { #ifdef __SIGMASTAR__ - if (stRegionCurrent.stOsdInitParam.stSize.u32Height != stRegion.stOsdInitParam.stSize.u32Height || stRegionCurrent.stOsdInitParam.stSize.u32Width != stRegion.stOsdInitParam.stSize.u32Width) + if (stRegionCurrent.stOsdInitParam.stSize.u32Height != + stRegion.stOsdInitParam.stSize.u32Height || + stRegionCurrent.stOsdInitParam.stSize.u32Width != + stRegion.stOsdInitParam.stSize.u32Width) #else - if (stRegionCurrent.unAttr.stOverlay.stSize.u32Height != stRegion.unAttr.stOverlay.stSize.u32Height || stRegionCurrent.unAttr.stOverlay.stSize.u32Width != stRegion.unAttr.stOverlay.stSize.u32Width) + if (stRegionCurrent.unAttr.stOverlay.stSize.u32Height != + stRegion.unAttr.stOverlay.stSize.u32Height || + stRegionCurrent.unAttr.stOverlay.stSize.u32Width != + stRegion.unAttr.stOverlay.stSize.u32Width) #endif - { - fprintf(stderr, "[%s:%d] Region parameters are different, recreating ... \n", __func__, __LINE__); + { + fprintf(stderr, "[%s:%d] Region parameters are different, recreating ... \n", __func__, + __LINE__); #ifdef __SIGMASTAR__ - stChn.s32OutputPortId = 1; - MI_RGN_DetachFromChn(*handle, &stChn); - stChn.s32OutputPortId = 0; - MI_RGN_DetachFromChn(*handle, &stChn); - MI_RGN_Destroy(*handle); - s32Ret = MI_RGN_Create(*handle, &stRegion); + stChn.s32OutputPortId = 1; + MI_RGN_DetachFromChn(*handle, &stChn); + stChn.s32OutputPortId = 0; + MI_RGN_DetachFromChn(*handle, &stChn); + MI_RGN_Destroy(*handle); + s32Ret = MI_RGN_Create(*handle, &stRegion); #else - HI_MPI_RGN_DetachFromChn(*handle, &stChn); - HI_MPI_RGN_Destroy(*handle); - s32Ret = HI_MPI_RGN_Create(*handle, &stRegion); + HI_MPI_RGN_DetachFromChn(*handle, &stChn); + HI_MPI_RGN_Destroy(*handle); + s32Ret = HI_MPI_RGN_Create(*handle, &stRegion); #endif - if (s32Ret) - { - fprintf(stderr, "[%s:%d]RGN_Create failed with %#x!\n", __func__, __LINE__, s32Ret); - return -1; - } - } - } + if (s32Ret) { + fprintf(stderr, "[%s:%d]RGN_Create failed with %#x!\n", __func__, __LINE__, s32Ret); + return -1; + } + } + } #ifdef __SIGMASTAR__ - s32Ret = MI_RGN_GetDisplayAttr(*handle, &stChn, &stChnAttrCurrent); + s32Ret = MI_RGN_GetDisplayAttr(*handle, &stChn, &stChnAttrCurrent); #else - s32Ret = HI_MPI_RGN_GetDisplayAttr(*handle, &stChn, &stChnAttrCurrent); + s32Ret = HI_MPI_RGN_GetDisplayAttr(*handle, &stChn, &stChnAttrCurrent); #endif - if (s32Ret) - if (verbose) - fprintf(stderr, "[%s:%d]RGN_GetDisplayAttr failed with %#x %d, attaching...\n", __func__, __LINE__, s32Ret, *handle); + if (s32Ret) + if (verbose) + fprintf(stderr, "[%s:%d]RGN_GetDisplayAttr failed with %#x %d, attaching...\n", + __func__, __LINE__, s32Ret, *handle); #ifdef __SIGMASTAR__ - else if (stChnAttrCurrent.stPoint.u32X != x || stChnAttrCurrent.stPoint.u32Y != y) + else if (stChnAttrCurrent.stPoint.u32X != x || stChnAttrCurrent.stPoint.u32Y != y) #else - else if (stChnAttrCurrent.unChnAttr.stOverlayChn.stPoint.s32X != x || stChnAttrCurrent.unChnAttr.stOverlayChn.stPoint.s32Y != y) + else if (stChnAttrCurrent.unChnAttr.stOverlayChn.stPoint.s32X != x || + stChnAttrCurrent.unChnAttr.stOverlayChn.stPoint.s32Y != y) #endif - { - if (verbose) - fprintf(stderr, "[%s:%d] Position has changed, detaching handle %d from channel %d...\n", __func__, __LINE__, *handle, &stChn.s32ChnId); + { + if (verbose) + fprintf(stderr, + "[%s:%d] Position has changed, detaching handle %d from " + "channel %d...\n", + __func__, __LINE__, *handle, &stChn.s32ChnId); #ifdef __SIGMASTAR__ - stChn.s32OutputPortId = 1; - MI_RGN_DetachFromChn(*handle, &stChn); - stChn.s32OutputPortId = 0; - MI_RGN_DetachFromChn(*handle, &stChn); + stChn.s32OutputPortId = 1; + MI_RGN_DetachFromChn(*handle, &stChn); + stChn.s32OutputPortId = 0; + MI_RGN_DetachFromChn(*handle, &stChn); #else - HI_MPI_RGN_DetachFromChn(*handle, &stChn); + HI_MPI_RGN_DetachFromChn(*handle, &stChn); #endif - } + } #ifdef __SIGMASTAR__ - memset(&stChnAttr, 0, sizeof(MI_RGN_ChnPortParam_t)); - stChnAttr.bShow = 1; - stChnAttr.stPoint.u32X = x; - stChnAttr.stPoint.u32Y = y; - stChnAttr.unPara.stOsdChnPort.u32Layer = 0; - - stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.eAlphaMode = E_MI_RGN_PIXEL_ALPHA; - stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.stAlphaPara.stArgb1555Alpha.u8BgAlpha = 0;//0; - stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.stAlphaPara.stArgb1555Alpha.u8FgAlpha = 255; - - /* - stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.eAlphaMode = E_MI_RGN_CONSTANT_ALPHA; - stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.stAlphaPara.stArgb1555Alpha.u8BgAlpha = 64; - stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.stAlphaPara.stArgb1555Alpha.u8FgAlpha = 127; - */ - - stChn.s32OutputPortId = 0; - s32Ret =MI_RGN_AttachToChn(*handle, &stChn, &stChnAttr); - stChn.s32OutputPortId = 1; - s32Ret = MI_RGN_AttachToChn(*handle, &stChn, &stChnAttr); + memset(&stChnAttr, 0, sizeof(MI_RGN_ChnPortParam_t)); + stChnAttr.bShow = 1; + stChnAttr.stPoint.u32X = x; + stChnAttr.stPoint.u32Y = y; + stChnAttr.unPara.stOsdChnPort.u32Layer = 0; + + stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.eAlphaMode = E_MI_RGN_PIXEL_ALPHA; + stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.stAlphaPara.stArgb1555Alpha.u8BgAlpha = 0; // 0; + stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.stAlphaPara.stArgb1555Alpha.u8FgAlpha = 255; + + /* + stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.eAlphaMode = + E_MI_RGN_CONSTANT_ALPHA; + stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.stAlphaPara.stArgb1555Alpha.u8BgAlpha + = 64; + stChnAttr.unPara.stOsdChnPort.stOsdAlphaAttr.stAlphaPara.stArgb1555Alpha.u8FgAlpha + = 127; + */ + + stChn.s32OutputPortId = 0; + s32Ret = MI_RGN_AttachToChn(*handle, &stChn, &stChnAttr); + stChn.s32OutputPortId = 1; + s32Ret = MI_RGN_AttachToChn(*handle, &stChn, &stChnAttr); #else - memset(&stChnAttr, 0, sizeof(RGN_CHN_ATTR_S)); - stChnAttr.bShow = 1; - stChnAttr.enType = OVERLAY_RGN; - stChnAttr.unChnAttr.stOverlayChn.u32BgAlpha = 0; - stChnAttr.unChnAttr.stOverlayChn.u32FgAlpha = 128; - stChnAttr.unChnAttr.stOverlayChn.stQpInfo.bQpDisable = 0; - stChnAttr.unChnAttr.stOverlayChn.stQpInfo.bAbsQp = 0; - stChnAttr.unChnAttr.stOverlayChn.stQpInfo.s32Qp = 0; + memset(&stChnAttr, 0, sizeof(RGN_CHN_ATTR_S)); + stChnAttr.bShow = 1; + stChnAttr.enType = OVERLAY_RGN; + stChnAttr.unChnAttr.stOverlayChn.u32BgAlpha = 0; + stChnAttr.unChnAttr.stOverlayChn.u32FgAlpha = 128; + stChnAttr.unChnAttr.stOverlayChn.stQpInfo.bQpDisable = 0; + stChnAttr.unChnAttr.stOverlayChn.stQpInfo.bAbsQp = 0; + stChnAttr.unChnAttr.stOverlayChn.stQpInfo.s32Qp = 0; #ifndef __16CV300__ - stChnAttr.unChnAttr.stOverlayChn.u16ColorLUT[0] = 0x3e0; - stChnAttr.unChnAttr.stOverlayChn.u16ColorLUT[1] = 0x7FFF; - stChnAttr.unChnAttr.stOverlayChn.enAttachDest = ATTACH_JPEG_MAIN; + stChnAttr.unChnAttr.stOverlayChn.u16ColorLUT[0] = 0x3e0; + stChnAttr.unChnAttr.stOverlayChn.u16ColorLUT[1] = 0x7FFF; + stChnAttr.unChnAttr.stOverlayChn.enAttachDest = ATTACH_JPEG_MAIN; #endif - stChnAttr.unChnAttr.stOverlayChn.stPoint.s32X = x; - stChnAttr.unChnAttr.stOverlayChn.stPoint.s32Y = y; - stChnAttr.unChnAttr.stOverlayChn.u32Layer = 7; + stChnAttr.unChnAttr.stOverlayChn.stPoint.s32X = x; + stChnAttr.unChnAttr.stOverlayChn.stPoint.s32Y = y; + stChnAttr.unChnAttr.stOverlayChn.u32Layer = 7; - HI_MPI_RGN_AttachToChn(*handle, &stChn, &stChnAttr); + HI_MPI_RGN_AttachToChn(*handle, &stChn, &stChnAttr); #endif #endif - return s32Ret; + return s32Ret; } -static int skipcol=1; - -int prepare_bitmap(const char *filename, BITMAP *bitmap, int bFil, unsigned int u16FilColor, int enPixelFmt) -{ - OSD_SURFACE_S Surface; - OSD_BITMAPFILEHEADER bmpFileHeader; - OSD_BITMAPINFO bmpInfo; - int s32BytesPerPix = 2; - unsigned char *pu8Data; - int R_Value; - int G_Value; - int B_Value; - int Gr_Value; - unsigned char Value_tmp; - unsigned char Value; - int s32Width; - - if (parse_bitmap(filename, &bmpFileHeader, &bmpInfo) < 0) - { - fprintf(stderr, "GetBmpInfo err!\n"); - return -1; - } - - switch (enPixelFmt) - { - case PIXEL_FORMAT_4444: - Surface.enColorFmt = OSD_COLOR_FMT_RGB4444; - break; - case PIXEL_FORMAT_1555: - case PIXEL_FORMAT_2BPP: - Surface.enColorFmt = OSD_COLOR_FMT_RGB1555; - break; - case PIXEL_FORMAT_8888: - Surface.enColorFmt = OSD_COLOR_FMT_RGB8888; - s32BytesPerPix = 4; - break; - default: - fprintf(stderr, "enPixelFormat err %d \n", enPixelFmt); - return -1; - } - - if (!(bitmap->pData = malloc(s32BytesPerPix * bmpInfo.bmiHeader.biWidth * bmpInfo.bmiHeader.biHeight))) - { - fputs("malloc osd memory err!\n", stderr); - return -1; - } - - CreateSurfaceByBitMap(filename, &Surface, (unsigned char *)(bitmap->pData)); - - bitmap->u32Width = Surface.u16Width; - bitmap->u32Height = Surface.u16Height; - bitmap->enPixelFormat = enPixelFmt; - - int i, j, k; - unsigned char *pu8Temp; - - if (skipcol>700)//test performance - skipcol=1; - skipcol++; +static int skipcol = 1; + +int prepare_bitmap( + const char *filename, BITMAP *bitmap, int bFil, unsigned int u16FilColor, int enPixelFmt) { + OSD_SURFACE_S Surface; + OSD_BITMAPFILEHEADER bmpFileHeader; + OSD_BITMAPINFO bmpInfo; + int s32BytesPerPix = 2; + unsigned char *pu8Data; + int R_Value; + int G_Value; + int B_Value; + int Gr_Value; + unsigned char Value_tmp; + unsigned char Value; + int s32Width; + + if (parse_bitmap(filename, &bmpFileHeader, &bmpInfo) < 0) { + fprintf(stderr, "GetBmpInfo err!\n"); + return -1; + } + + switch (enPixelFmt) { + case PIXEL_FORMAT_4444: + Surface.enColorFmt = OSD_COLOR_FMT_RGB4444; + break; + case PIXEL_FORMAT_1555: + case PIXEL_FORMAT_2BPP: + Surface.enColorFmt = OSD_COLOR_FMT_RGB1555; + break; + case PIXEL_FORMAT_8888: + Surface.enColorFmt = OSD_COLOR_FMT_RGB8888; + s32BytesPerPix = 4; + break; + default: + fprintf(stderr, "enPixelFormat err %d \n", enPixelFmt); + return -1; + } + + if (!(bitmap->pData = + malloc(s32BytesPerPix * bmpInfo.bmiHeader.biWidth * bmpInfo.bmiHeader.biHeight))) { + fputs("malloc osd memory err!\n", stderr); + return -1; + } + + CreateSurfaceByBitMap(filename, &Surface, (unsigned char *)(bitmap->pData)); + + bitmap->u32Width = Surface.u16Width; + bitmap->u32Height = Surface.u16Height; + bitmap->enPixelFormat = enPixelFmt; + + int i, j, k; + unsigned char *pu8Temp; + + if (skipcol > 700) // test performance + skipcol = 1; + skipcol++; #ifndef __16CV300__ - if (enPixelFmt == PIXEL_FORMAT_2BPP) - { - s32Width = DIV_UP(bmpInfo.bmiHeader.biWidth, 4); - pu8Data = malloc(s32Width * bmpInfo.bmiHeader.biHeight); - if (!pu8Data) - { - fputs("malloc osd memory err!\n", stderr); - return -1; - } - } + if (enPixelFmt == PIXEL_FORMAT_2BPP) { + s32Width = DIV_UP(bmpInfo.bmiHeader.biWidth, 4); + pu8Data = malloc(s32Width * bmpInfo.bmiHeader.biHeight); + if (!pu8Data) { + fputs("malloc osd memory err!\n", stderr); + return -1; + } + } #endif - long ccc=0; - if (enPixelFmt != PIXEL_FORMAT_2BPP) - { - unsigned short *pu16Temp; - pu16Temp = (unsigned short *)bitmap->pData; - if (bFil>0) - { - - for (i = 0; i < bitmap->u32Height; i++) - { - for (j = 0; j < bitmap->u32Width; j++) - {//64478 = 0xFBDE R:245,G:245,B:245 - if (bFil==2 && i==0 && j==0)//take transparent color from first pixel - u16FilColor = *pu16Temp; - - if (u16FilColor == *pu16Temp){ - *pu16Temp &= 0x7FFF; - } - pu16Temp++; - } - } - } - // printf("enPixelFmt:%d\n",ccc); - } - else - { - unsigned short *pu16Temp; - - pu16Temp = (unsigned short *)bitmap->pData; - pu8Temp = (unsigned char *)pu8Data; - - for (i = 0; i < bitmap->u32Height; i++) - { - for (j = 0; j < bitmap->u32Width / 4; j++) - { - Value = 0; - - for (k = j; k < j + 4; k++) - { - B_Value = *pu16Temp & 0x001F; - G_Value = *pu16Temp >> 5 & 0x001F; - R_Value = *pu16Temp >> 10 & 0x001F; - pu16Temp++; - - Gr_Value = (R_Value * 299 + G_Value * 587 + B_Value * 144 + 500) / 1000; - if (Gr_Value > 16) - Value_tmp = 0x01; - else - Value_tmp = 0x00; - Value = (Value << 2) + Value_tmp; - } - *pu8Temp = Value; - pu8Temp++; - } - } - free(bitmap->pData); - bitmap->pData = pu8Data; - } - - return 0; + long ccc = 0; + if (enPixelFmt != PIXEL_FORMAT_2BPP) { + unsigned short *pu16Temp; + pu16Temp = (unsigned short *)bitmap->pData; + if (bFil > 0) { + + for (i = 0; i < bitmap->u32Height; i++) { + for (j = 0; j < bitmap->u32Width; j++) { // 64478 = 0xFBDE R:245,G:245,B:245 + if (bFil == 2 && i == 0 && j == 0) // take transparent color from first pixel + u16FilColor = *pu16Temp; + + if (u16FilColor == *pu16Temp) { + *pu16Temp &= 0x7FFF; + } + pu16Temp++; + } + } + } + // printf("enPixelFmt:%d\n",ccc); + } else { + unsigned short *pu16Temp; + + pu16Temp = (unsigned short *)bitmap->pData; + pu8Temp = (unsigned char *)pu8Data; + + for (i = 0; i < bitmap->u32Height; i++) { + for (j = 0; j < bitmap->u32Width / 4; j++) { + Value = 0; + + for (k = j; k < j + 4; k++) { + B_Value = *pu16Temp & 0x001F; + G_Value = *pu16Temp >> 5 & 0x001F; + R_Value = *pu16Temp >> 10 & 0x001F; + pu16Temp++; + + Gr_Value = (R_Value * 299 + G_Value * 587 + B_Value * 144 + 500) / 1000; + if (Gr_Value > 16) + Value_tmp = 0x01; + else + Value_tmp = 0x00; + Value = (Value << 2) + Value_tmp; + } + *pu8Temp = Value; + pu8Temp++; + } + } + free(bitmap->pData); + bitmap->pData = pu8Data; + } + + return 0; } - -int set_bitmap(int handle, BITMAP *bitmap) -{ - int s32Ret=0; +int set_bitmap(int handle, BITMAP *bitmap) { + int s32Ret = 0; #if !defined(_x86) && !defined(__ROCKCHIP__) #ifdef __SIGMASTAR__ - s32Ret = MI_RGN_SetBitMap(handle, (MI_RGN_Bitmap_t *)(bitmap)); + s32Ret = MI_RGN_SetBitMap(handle, (MI_RGN_Bitmap_t *)(bitmap)); #elif __GOKE__ - s32Ret = HI_MPI_RGN_SetBitMap(handle, (BITMAP_S *)(bitmap)); + s32Ret = HI_MPI_RGN_SetBitMap(handle, (BITMAP_S *)(bitmap)); +#endif + if (s32Ret) { +#ifdef __SIGMASTAR__ + if (s32Ret == E_MI_ERR_ILLEGAL_PARAM) + fprintf(stderr, "RGN_SetBitMap failed E_MI_ERR_ILLEGAL_PARAM %#x!\n", s32Ret); #endif - if (s32Ret) - { -#ifdef __SIGMASTAR__ - if (s32Ret==E_MI_ERR_ILLEGAL_PARAM) - fprintf(stderr, "RGN_SetBitMap failed E_MI_ERR_ILLEGAL_PARAM %#x!\n", s32Ret); -#endif - fprintf(stderr, "RGN_SetBitMap failed with %#x %d!\n", s32Ret, (s32Ret & 0xFFF) ); - return -1; - } + fprintf(stderr, "RGN_SetBitMap failed with %#x %d!\n", s32Ret, (s32Ret & 0xFFF)); + return -1; + } #endif - return s32Ret; + return s32Ret; } -/// @brief Returns a pointer to BMP directly in the video overlay region, so no need to create a buffer and copy it later! -/// @param handle -/// @return -void* get_directBMP(int handle){ -#ifdef __SIGMASTAR__ - MI_RGN_CanvasInfo_t stCanvasInfo; - memset(&stCanvasInfo,0,sizeof(stCanvasInfo)); - int s32Ret = GetCanvas(handle, &stCanvasInfo); - //printf("OSD Handle:%d CanvasStride: %d , Canvas size : %d:%d\r\n", handle, stCanvasInfo.u32Stride, stCanvasInfo.stSize.u32Width, stCanvasInfo.stSize.u32Height); - return (void *)(stCanvasInfo.virtAddr); -#endif - return NULL; +/// @brief Returns a pointer to BMP directly in the video overlay region, so no +/// need to create a buffer and copy it later! +/// @param handle +/// @return +void *get_directBMP(int handle) { +#ifdef __SIGMASTAR__ + MI_RGN_CanvasInfo_t stCanvasInfo; + memset(&stCanvasInfo, 0, sizeof(stCanvasInfo)); + int s32Ret = GetCanvas(handle, &stCanvasInfo); + // printf("OSD Handle:%d CanvasStride: %d , Canvas size : %d:%d\r\n", + // handle, stCanvasInfo.u32Stride, stCanvasInfo.stSize.u32Width, + // stCanvasInfo.stSize.u32Height); + return (void *)(stCanvasInfo.virtAddr); +#endif + return NULL; } -unsigned long set_bitmapEx(int handle, BITMAP *bitmap, int BitsPerPixel){ - int s32Ret=0; +unsigned long set_bitmapEx(int handle, BITMAP *bitmap, int BitsPerPixel) { + int s32Ret = 0; #ifdef __SIGMASTAR__ - int byteWidth = getRowStride(bitmap->u32Width,BitsPerPixel); - MI_RGN_CanvasInfo_t stCanvasInfo; - memset(&stCanvasInfo,0,sizeof(stCanvasInfo)); - s32Ret = GetCanvas(handle, &stCanvasInfo); - printf("OSD Handle:%d GetCanvas:%d CanvasStride: %d , BMP_Stride:%d BMP_Size: %d:%d , Canvas size : %d:%d\r\n", handle,s32Ret, - stCanvasInfo.u32Stride, byteWidth, bitmap->u32Width,bitmap->u32Height, stCanvasInfo.stSize.u32Width, stCanvasInfo.stSize.u32Height); - - - for (int i = 0; i < bitmap->u32Height; i++) - memcpy((void *)(stCanvasInfo.virtAddr + i * (stCanvasInfo.u32Stride)), bitmap->pData + i * byteWidth, byteWidth); - - //memcpy((void *)(stCanvasInfo.virtAddr) , bitmap->pData , bitmap->u32Height * byteWidth); - - - s32Ret = MI_RGN_UpdateCanvas(handle); - - if (verbose) - printf("MI_RGN_UpdateCanvas completed byteWidth:%d!\n",byteWidth); - - //this will break, the pointer to memory is no longer valid! - //memset((void *)(stCanvasInfo.virtAddr), PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_I4 ? 0xFF : 0x00 , bitmap->u32Height * getRowStride(bitmap->u32Width , BitsPerPixel)); - - return stCanvasInfo.virtAddr; + int byteWidth = getRowStride(bitmap->u32Width, BitsPerPixel); + MI_RGN_CanvasInfo_t stCanvasInfo; + memset(&stCanvasInfo, 0, sizeof(stCanvasInfo)); + s32Ret = GetCanvas(handle, &stCanvasInfo); + printf("OSD Handle:%d GetCanvas:%d CanvasStride: %d , BMP_Stride:%d " + "BMP_Size: %d:%d , Canvas size : %d:%d\r\n", + handle, s32Ret, stCanvasInfo.u32Stride, byteWidth, bitmap->u32Width, bitmap->u32Height, + stCanvasInfo.stSize.u32Width, stCanvasInfo.stSize.u32Height); + + for (int i = 0; i < bitmap->u32Height; i++) + memcpy((void *)(stCanvasInfo.virtAddr + i * (stCanvasInfo.u32Stride)), + bitmap->pData + i * byteWidth, byteWidth); + + // memcpy((void *)(stCanvasInfo.virtAddr) , bitmap->pData , + // bitmap->u32Height + // * byteWidth); + + s32Ret = MI_RGN_UpdateCanvas(handle); + + if (verbose) + printf("MI_RGN_UpdateCanvas completed byteWidth:%d!\n", byteWidth); + + // this will break, the pointer to memory is no longer valid! + // memset((void *)(stCanvasInfo.virtAddr), + // PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_I4 ? 0xFF : 0x00 , bitmap->u32Height * + // getRowStride(bitmap->u32Width , BitsPerPixel)); + + return stCanvasInfo.virtAddr; #else - return s32Ret; + return s32Ret; #endif } -int unload_region(int *handle) -{ -int s32Ret =0; +int unload_region(int *handle) { + int s32Ret = 0; #ifdef __SIGMASTAR__ - MI_RGN_ChnPort_t stChn; - stChn.s32DevId = 0; - stChn.s32ChnId = 0; - - stChn.eModId = E_MI_RGN_MODID_VPE; - stChn.s32OutputPortId = 1; - MI_RGN_DetachFromChn(*handle, &stChn); - stChn.s32OutputPortId = 0; - MI_RGN_DetachFromChn(*handle, &stChn); - s32Ret = MI_RGN_Destroy(*handle); - if (s32Ret) - fprintf(stderr, "[%s:%d]RGN_Destroy failed with %#x %d!\n", __func__, __LINE__, s32Ret, *handle); + MI_RGN_ChnPort_t stChn; + stChn.s32DevId = 0; + stChn.s32ChnId = 0; + + stChn.eModId = E_MI_RGN_MODID_VPE; + stChn.s32OutputPortId = 1; + MI_RGN_DetachFromChn(*handle, &stChn); + stChn.s32OutputPortId = 0; + MI_RGN_DetachFromChn(*handle, &stChn); + s32Ret = MI_RGN_Destroy(*handle); + if (s32Ret) + fprintf(stderr, "[%s:%d]RGN_Destroy failed with %#x %d!\n", __func__, __LINE__, s32Ret, + *handle); #elif __GOKE__ - MPP_CHN_S stChn; - stChn.s32DevId = 0; - stChn.s32ChnId = 0; - - stChn.enModId = HI_ID_VENC; - HI_MPI_RGN_DetachFromChn(*handle, &stChn); - s32Ret = HI_MPI_RGN_Destroy(*handle); - if (s32Ret) - fprintf(stderr, "[%s:%d]RGN_Destroy failed with %#x %d!\n", __func__, __LINE__, s32Ret, *handle); + MPP_CHN_S stChn; + stChn.s32DevId = 0; + stChn.s32ChnId = 0; + + stChn.enModId = HI_ID_VENC; + HI_MPI_RGN_DetachFromChn(*handle, &stChn); + s32Ret = HI_MPI_RGN_Destroy(*handle); + if (s32Ret) + fprintf(stderr, "[%s:%d]RGN_Destroy failed with %#x %d!\n", __func__, __LINE__, s32Ret, + *handle); #endif - return s32Ret; - + return s32Ret; } #ifdef __SIGMASTAR__ - int GetCanvas(int handle, MI_RGN_CanvasInfo_t *stCanvasInfo){ - int s32Result = MI_RGN_GetCanvasInfo(handle, stCanvasInfo); - if (s32Result != MI_RGN_OK) - return s32Result; - - //if (verbose) - // printf("MI_RGN_GetCanvas stride:%d stSize:%d:%d ePixelFmt:%d !\n", - // stCanvasInfo->u32Stride, stCanvasInfo->stSize.u32Width , stCanvasInfo->stSize.u32Height , stCanvasInfo->ePixelFmt); - return 0; - } - - - uint32_t ST_OSD_DrawPoint(MI_U16 *pDst , MI_U32 u32Stride , uint32_t u32X, uint32_t u32Y , MI_U32 u32Color) -{ - - MI_U8 u8Value = 0; - - - // ST_DBG("pDst:%p, u32Stride:%d, point(%d,%d)\n", pDst, u32Stride, u32X, u32Y); - - if (/*g_stRgnInfo[hHandle].ePixelFmt == E_MI_RGN_PIXEL_FORMAT_I4*/ true) - { - - if (u32X % 2) - { - u8Value = (*((MI_U8 *)pDst + (u32Stride * u32Y) + u32X / 2) & 0x0F) | ((u32Color & 0x0f) << 4); - *((MI_U8 *)pDst + (u32Stride * u32Y) + u32X / 2) = u8Value; - } - else - { - u8Value = (*((MI_U8 *)pDst + (u32Stride * u32Y) + u32X / 2) & 0xF0) | (u32Color & 0x0f); - *((MI_U8 *)pDst + (u32Stride * u32Y) + u32X / 2) = u8Value; - } - } - - return MI_RGN_OK; +int GetCanvas(int handle, MI_RGN_CanvasInfo_t *stCanvasInfo) { + int s32Result = MI_RGN_GetCanvasInfo(handle, stCanvasInfo); + if (s32Result != MI_RGN_OK) + return s32Result; + + // if (verbose) + // printf("MI_RGN_GetCanvas stride:%d stSize:%d:%d ePixelFmt:%d !\n", + // stCanvasInfo->u32Stride, stCanvasInfo->stSize.u32Width , + // stCanvasInfo->stSize.u32Height , stCanvasInfo->ePixelFmt); + return 0; +} + +uint32_t ST_OSD_DrawPoint( + MI_U16 *pDst, MI_U32 u32Stride, uint32_t u32X, uint32_t u32Y, MI_U32 u32Color) { + + MI_U8 u8Value = 0; + + // ST_DBG("pDst:%p, u32Stride:%d, point(%d,%d)\n", pDst, u32Stride, u32X, + // u32Y); + + if (/*g_stRgnInfo[hHandle].ePixelFmt == E_MI_RGN_PIXEL_FORMAT_I4*/ true) { + + if (u32X % 2) { + u8Value = (*((MI_U8 *)pDst + (u32Stride * u32Y) + u32X / 2) & 0x0F) | + ((u32Color & 0x0f) << 4); + *((MI_U8 *)pDst + (u32Stride * u32Y) + u32X / 2) = u8Value; + } else { + u8Value = (*((MI_U8 *)pDst + (u32Stride * u32Y) + u32X / 2) & 0xF0) | (u32Color & 0x0f); + *((MI_U8 *)pDst + (u32Stride * u32Y) + u32X / 2) = u8Value; + } + } + + return MI_RGN_OK; } +void DrawBitmap1555ToI4(uint16_t *srcBitmap, uint32_t width, uint32_t height, uint8_t *destBitmap, + MI_RGN_PaletteTable_t *paletteTable, MI_U16 *pDst, MI_U32 u32Stride) { + + for (uint32_t y = 0; y < height; ++y) { - -void DrawBitmap1555ToI4( - uint16_t* srcBitmap, uint32_t width, uint32_t height, - uint8_t* destBitmap, MI_RGN_PaletteTable_t* paletteTable , - MI_U16 *pDst , MI_U32 u32Stride - ) -{ - - for (uint32_t y = 0; y < height; ++y) { - - for (uint32_t x = 0; x < width; ++x) { - uint32_t srcIndex = y * width + x; - uint8_t paletteIndex = findClosestPaletteIndex8(srcBitmap[srcIndex], paletteTable); - - if (paletteIndex == 0)//Sigmastar reserver - paletteIndex=8;//black - if (paletteIndex == 17)//Transparent color - paletteIndex=15; - - ST_OSD_DrawPoint(pDst , u32Stride , x, y , paletteIndex); - } - } + for (uint32_t x = 0; x < width; ++x) { + uint32_t srcIndex = y * width + x; + uint8_t paletteIndex = findClosestPaletteIndex8(srcBitmap[srcIndex], paletteTable); + + if (paletteIndex == 0) // Sigmastar reserver + paletteIndex = 8; // black + if (paletteIndex == 17) // Transparent color + paletteIndex = 15; + + ST_OSD_DrawPoint(pDst, u32Stride, x, y, paletteIndex); + } + } } - -#endif +#endif // //if (MI_RGN_UpdateCanvas(hHandle) != MI_RGN_OK) // // return s32Result; diff --git a/bmp/region.h b/bmp/region.h index 67d8556..9daa309 100644 --- a/bmp/region.h +++ b/bmp/region.h @@ -3,24 +3,25 @@ #ifdef __cplusplus #if __cplusplus -extern "C" -{ +extern "C" { #endif #endif //#define PIXEL_FORMAT_DEFAULT E_MI_RGN_PIXEL_FORMAT_I8 -#include "common.h" #include "bitmap.h" +#include "common.h" - int create_region(int *handle, int x, int y, int width, int height); - int prepare_bitmap(const char *filename, BITMAP *bitmap, int bFil, unsigned int u16FilColor, int enPixelFmt); - int set_bitmap(int handle, BITMAP *bitmap); - unsigned long set_bitmapEx(int handle, BITMAP *bitmap, int BitsPerPixel); - int unload_region(int *handle); - void *get_directBMP(int handle); -#ifdef __SIGMASTAR__ - int GetCanvas(int handle, MI_RGN_CanvasInfo_t *stCanvasInfo); - uint32_t ST_OSD_DrawPoint(MI_U16 *pDst , MI_U32 u32Stride , uint32_t u32X, uint32_t u32Y , MI_U32 u32Color); +int create_region(int *handle, int x, int y, int width, int height); +int prepare_bitmap( + const char *filename, BITMAP *bitmap, int bFil, unsigned int u16FilColor, int enPixelFmt); +int set_bitmap(int handle, BITMAP *bitmap); +unsigned long set_bitmapEx(int handle, BITMAP *bitmap, int BitsPerPixel); +int unload_region(int *handle); +void *get_directBMP(int handle); +#ifdef __SIGMASTAR__ +int GetCanvas(int handle, MI_RGN_CanvasInfo_t *stCanvasInfo); +uint32_t ST_OSD_DrawPoint( + MI_U16 *pDst, MI_U32 u32Stride, uint32_t u32X, uint32_t u32Y, MI_U32 u32Color); #endif #ifdef __cplusplus diff --git a/bmp/text.c b/bmp/text.c index 5459731..f7d436f 100644 --- a/bmp/text.c +++ b/bmp/text.c @@ -3,191 +3,180 @@ const double inv255 = 1.0 / 255.0; extern int PIXEL_FORMAT_DEFAULT; - -static void copyimage(SFT_Image *dest, const SFT_Image *source, int x0, int y0, int color) -{ - unsigned short maskr = (color & 0x7C00) >> 10; - unsigned short maskg = (color & 0x3E0) >> 5; - unsigned short maskb = color & 0x1F; - - unsigned short *d = dest->pixels; - unsigned char *s = source->pixels; - - //int rowStride=getRowStride(dest->width,16); - d += x0 + y0 * dest->width;//rowStride - - for (int y = 0; y < source->height; y++) - { - for (int x = 0; x < source->width; x++) - { - /* we do not need gray scale when we work with only 16 colors - double t = s[x] * inv255; - unsigned short r = (1.0 - t) * ((d[x] & 0x7C00) >> 10) + t * maskr; - unsigned short g = (1.0 - t) * ((d[x] & 0x3E0) >> 5) + t * maskg; - unsigned short b = (1.0 - t) * (d[x] & 0x1F) + t * maskb; - d[x] = ((t > 0.0) << 15) | (r << 10) | (g << 5) | b; - */ - unsigned char pixel = s[x]; - //If the pixel is not zero (assuming non-zero means black) - if (pixel > 64) // 128 makes them too thin... - d[x] = 0x8000; // Set pixel to opaque black (ARGB1555: 1000 0000 0000 0000) - else - d[x] = 0x0000; // Set pixel to transparent (ARGB1555: 0000 0000 0000 0000) - - } - d += dest->width; //rowStride - s += source->width; - } +static void copyimage(SFT_Image *dest, const SFT_Image *source, int x0, int y0, int color) { + unsigned short maskr = (color & 0x7C00) >> 10; + unsigned short maskg = (color & 0x3E0) >> 5; + unsigned short maskb = color & 0x1F; + + unsigned short *d = dest->pixels; + unsigned char *s = source->pixels; + + // int rowStride=getRowStride(dest->width,16); + d += x0 + y0 * dest->width; // rowStride + + for (int y = 0; y < source->height; y++) { + for (int x = 0; x < source->width; x++) { + /* we do not need gray scale when we work with only 16 colors + double t = s[x] * inv255; + unsigned short r = (1.0 - t) * ((d[x] & 0x7C00) >> 10) + t * maskr; + unsigned short g = (1.0 - t) * ((d[x] & 0x3E0) >> 5) + t * maskg; + unsigned short b = (1.0 - t) * (d[x] & 0x1F) + t * maskb; + d[x] = ((t > 0.0) << 15) | (r << 10) | (g << 5) | b; + */ + unsigned char pixel = s[x]; + // If the pixel is not zero (assuming non-zero means black) + if (pixel > 64) // 128 makes them too thin... + d[x] = 0x8000; // Set pixel to opaque black (ARGB1555: 1000 0000 + // 0000 0000) + else + d[x] = 0x0000; // Set pixel to transparent (ARGB1555: 0000 0000 + // 0000 0000) + } + d += dest->width; // rowStride + s += source->width; + } } -static void loadfont(SFT *sft, const char *path, double size, SFT_LMetrics *lmtx) -{ - SFT_Font *font = sft_loadfile(path); - if (font == NULL) - fatal("sft_loadfile failed"); - sft->font = font; - sft->xScale = size; - sft->yScale = size; - sft->xOffset = 0.0; - sft->yOffset = 0.0; - sft->flags = SFT_DOWNWARD_Y; - if (sft_lmetrics(sft, lmtx) < 0) - fatal("sft_lmetrics failed"); +static void loadfont(SFT *sft, const char *path, double size, SFT_LMetrics *lmtx) { + SFT_Font *font = sft_loadfile(path); + if (font == NULL) + fatal("sft_loadfile failed"); + sft->font = font; + sft->xScale = size; + sft->yScale = size; + sft->xOffset = 0.0; + sft->yOffset = 0.0; + sft->flags = SFT_DOWNWARD_Y; + if (sft_lmetrics(sft, lmtx) < 0) + fatal("sft_lmetrics failed"); } -static void loadglyph(const SFT *sft, SFT_UChar codepoint, SFT_Glyph *glyph, SFT_GMetrics *metrics) -{ - if (sft_lookup(sft, codepoint, glyph) < 0) - fatal("sft_lookup failed"); - if (sft_gmetrics(sft, *glyph, metrics) < 0) - fatal("sft_gmetrics failed"); +static void loadglyph( + const SFT *sft, SFT_UChar codepoint, SFT_Glyph *glyph, SFT_GMetrics *metrics) { + if (sft_lookup(sft, codepoint, glyph) < 0) + fatal("sft_lookup failed"); + if (sft_gmetrics(sft, *glyph, metrics) < 0) + fatal("sft_gmetrics failed"); } int getRowStride(int width, int BitsPerPixel); -static void newimage(SFT_Image *image, int width, int height, int color) -{ - //size_t size = (size_t)(width * height * 2); - size_t size = (size_t)( height * getRowStride(width,16) ); - void *pixels = malloc(size); - image->pixels = pixels; - image->width = width; - image->height = height; - if (color == 0) - memset(pixels, 0, size); - else for (int i = 0; i < size / 2; i++) - ((unsigned short*)pixels)[i] = color; +static void newimage(SFT_Image *image, int width, int height, int color) { + // size_t size = (size_t)(width * height * 2); + size_t size = (size_t)(height * getRowStride(width, 16)); + void *pixels = malloc(size); + image->pixels = pixels; + image->width = width; + image->height = height; + if (color == 0) + memset(pixels, 0, size); + else + for (int i = 0; i < size / 2; i++) + ((unsigned short *)pixels)[i] = color; } -static inline void calcdim(double *margin, double *height, double *width, const char* text) -{ - double lwidth = 0; - *margin = 0; - *height = lmtx.ascender - lmtx.descender + lmtx.lineGap; - *width = 0; +static inline void calcdim(double *margin, double *height, double *width, const char *text) { + double lwidth = 0; + *margin = 0; + *height = lmtx.ascender - lmtx.descender + lmtx.lineGap; + *width = 0; #ifdef SUPP_UTF32 - unsigned cps[strlen(text) + 1]; - int n = utf8_to_utf32(text, cps, strlen(text) + 1); + unsigned cps[strlen(text) + 1]; + int n = utf8_to_utf32(text, cps, strlen(text) + 1); #else - #define cps text - #define n strlen(text) +#define cps text +#define n strlen(text) #endif - for (int k = 0; k < n; k++) - { - if (cps[k] == '\\' && cps[k + 1] == 'n') - { - k++; - *width = MAX(*width, lwidth); - *height += lmtx.ascender - lmtx.descender + lmtx.lineGap; - lwidth = 0; - continue; - } - SFT_UChar cp = (SFT_UChar)cps[k]; - SFT_Glyph gid; - SFT_GMetrics mtx; - loadglyph(&sft, cp, &gid, &mtx); - if (lwidth == 0 && mtx.leftSideBearing < 0 && *margin < -mtx.leftSideBearing) - *margin -= mtx.leftSideBearing; - lwidth += MAX(mtx.advanceWidth, mtx.minWidth); - } - *height += -lmtx.descender + lmtx.lineGap + 2 * *margin; - *width = MAX(*width, lwidth) + 2 * *margin; + for (int k = 0; k < n; k++) { + if (cps[k] == '\\' && cps[k + 1] == 'n') { + k++; + *width = MAX(*width, lwidth); + *height += lmtx.ascender - lmtx.descender + lmtx.lineGap; + lwidth = 0; + continue; + } + SFT_UChar cp = (SFT_UChar)cps[k]; + SFT_Glyph gid; + SFT_GMetrics mtx; + loadglyph(&sft, cp, &gid, &mtx); + if (lwidth == 0 && mtx.leftSideBearing < 0 && *margin < -mtx.leftSideBearing) + *margin -= mtx.leftSideBearing; + lwidth += MAX(mtx.advanceWidth, mtx.minWidth); + } + *height += -lmtx.descender + lmtx.lineGap + 2 * *margin; + *width = MAX(*width, lwidth) + 2 * *margin; } -RECT measure_text(const char *font, double size, const char *text) -{ - loadfont(&sft, font, size, &lmtx); +RECT measure_text(const char *font, double size, const char *text) { + loadfont(&sft, font, size, &lmtx); - double margin, height, width; - calcdim(&margin, &height, &width, text); + double margin, height, width; + calcdim(&margin, &height, &width, text); // Some platforms operate with a coarse pixel size of 2x2 // and rounding up is required for a sufficient canvas size - RECT rect = { .height = ceil(height), .width = ceil(width) }; - rect.height += rect.height & 1; - rect.width += rect.width & 1; + RECT rect = {.height = ceil(height), .width = ceil(width)}; + rect.height += rect.height & 1; + rect.width += rect.width & 1; - sft_freefont(sft.font); - return rect; + sft_freefont(sft.font); + return rect; } -BITMAP raster_text(const char *font, double size, const char *text) -{ - loadfont(&sft, font, size, &lmtx); +BITMAP raster_text(const char *font, double size, const char *text) { + loadfont(&sft, font, size, &lmtx); + + double margin, height, width; - double margin, height, width; - - calcdim(&margin, &height, &width, text); + calcdim(&margin, &height, &width, text); - //WIDTH Needs to be multiple of 8 ?!?! - int MaxWidth = (int)(width + 7) & ~7;//multiple of 8 - //int MinWidth=(int)width & ~7; - //width = abs(MaxWidth-width)>(width - MinWidth) ? MinWidth:MaxWidth; - newimage(&canvas, MaxWidth, height, 0); + // WIDTH Needs to be multiple of 8 ?!?! + int MaxWidth = (int)(width + 7) & ~7; // multiple of 8 + // int MinWidth=(int)width & ~7; + // width = abs(MaxWidth-width)>(width - MinWidth) ? MinWidth:MaxWidth; + newimage(&canvas, MaxWidth, height, 0); #ifdef SUPP_UTF32 - unsigned cps[strlen(text) + 1]; - int n = utf8_to_utf32(text, cps, strlen(text) + 1); + unsigned cps[strlen(text) + 1]; + int n = utf8_to_utf32(text, cps, strlen(text) + 1); #else - #define cps text - #define n strlen(text) +#define cps text +#define n strlen(text) #endif - double x = margin; - double y = margin + lmtx.ascender + lmtx.lineGap; - SFT_Glyph ogid = 0; - for (int k = 0; k < n; k++) - { - if (cps[k] == '\\' && cps[k + 1] == 'n') - { - k++; - x = margin; - y += lmtx.ascender - lmtx.descender + lmtx.lineGap; - ogid = 0; - continue; - } - SFT_Image image; - SFT_UChar cp = (SFT_UChar)cps[k]; - SFT_Glyph gid; - SFT_GMetrics mtx; - SFT_Kerning kerning; - loadglyph(&sft, cp, &gid, &mtx); - newimage(&image, mtx.minWidth, mtx.minHeight, 0x7FFF); - sft_render(&sft, gid, image); - sft_kerning(&sft, ogid, gid, &kerning); - x += kerning.xShift; - copyimage(&canvas, &image, x + mtx.leftSideBearing, y + mtx.yOffset, 0xFFFF); - x += mtx.advanceWidth; - free(image.pixels); - ogid = gid; - } - - bitmap.u32Width = canvas.width; - bitmap.u32Height = canvas.height; - bitmap.pData = canvas.pixels; - bitmap.enPixelFormat = PIXEL_FORMAT_1555; - - sft_freefont(sft.font); - return bitmap; + double x = margin; + double y = margin + lmtx.ascender + lmtx.lineGap; + SFT_Glyph ogid = 0; + for (int k = 0; k < n; k++) { + if (cps[k] == '\\' && cps[k + 1] == 'n') { + k++; + x = margin; + y += lmtx.ascender - lmtx.descender + lmtx.lineGap; + ogid = 0; + continue; + } + SFT_Image image; + SFT_UChar cp = (SFT_UChar)cps[k]; + SFT_Glyph gid; + SFT_GMetrics mtx; + SFT_Kerning kerning; + loadglyph(&sft, cp, &gid, &mtx); + newimage(&image, mtx.minWidth, mtx.minHeight, 0x7FFF); + sft_render(&sft, gid, image); + sft_kerning(&sft, ogid, gid, &kerning); + x += kerning.xShift; + copyimage(&canvas, &image, x + mtx.leftSideBearing, y + mtx.yOffset, 0xFFFF); + x += mtx.advanceWidth; + free(image.pixels); + ogid = gid; + } + + bitmap.u32Width = canvas.width; + bitmap.u32Height = canvas.height; + bitmap.pData = canvas.pixels; + bitmap.enPixelFormat = PIXEL_FORMAT_1555; + + sft_freefont(sft.font); + return bitmap; } diff --git a/bmp/text.h b/bmp/text.h index 23a07f3..59bc459 100644 --- a/bmp/text.h +++ b/bmp/text.h @@ -3,8 +3,7 @@ #ifdef __cplusplus #if __cplusplus -extern "C" -{ +extern "C" { #endif #endif @@ -12,13 +11,13 @@ extern "C" #include "common.h" - static SFT sft; - static SFT_Image canvas; - static SFT_LMetrics lmtx; - static BITMAP bitmap; +static SFT sft; +static SFT_Image canvas; +static SFT_LMetrics lmtx; +static BITMAP bitmap; - RECT measure_text(const char *font, double size, const char *text); - BITMAP raster_text(const char *font, double size, const char *text); +RECT measure_text(const char *font, double size, const char *text); +BITMAP raster_text(const char *font, double size, const char *text); #ifdef __cplusplus #if __cplusplus diff --git a/build_rockchip.sh b/build_rockchip.sh index bd013f0..31a4234 100755 --- a/build_rockchip.sh +++ b/build_rockchip.sh @@ -9,7 +9,7 @@ host=https://cloud.debian.org/images/cloud/bullseye release=latest system=debian-11-generic-arm64.tar if [ ! -f disk.raw ]; then - wget -nv ${host}/${release}/${system}.xz + curl -s -k -L ${host}/${release}/${system}.xz -O tar -xf ${system}.xz rm ${system}.xz fi diff --git a/compat.c b/compat.c index 2dec32e..e31f68f 100644 --- a/compat.c +++ b/compat.c @@ -1,28 +1,14 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include #include +#include #include #include #include -#include -#include -#include -#include -#include #include #include #include @@ -37,19 +23,16 @@ int __assert; int _MI_PRINT_GetDebugLevel; void backtrace(void) {} + void backtrace_symbols(void) {} #endif #if !defined(_x86) && !defined(__ROCKCHIP__) -int __fgetc_unlocked(FILE *stream) { - return fgetc(stream); -} +int __fgetc_unlocked(FILE *stream) { return fgetc(stream); } -size_t _stdlib_mb_cur_max(void) { - return 0; -} +size_t _stdlib_mb_cur_max(void) { return 0; } -void* mmap(void *start, size_t len, int prot, int flags, int fd, uint32_t off) { - return (void *)syscall(SYS_mmap2, start, len, prot, flags, fd, off >> 12); +void *mmap(void *start, size_t len, int prot, int flags, int fd, uint32_t off) { + return (void *)syscall(SYS_mmap2, start, len, prot, flags, fd, off >> 12); } #endif diff --git a/libpng/lodepng.c b/libpng/lodepng.c index 4afbb54..51e97e1 100644 --- a/libpng/lodepng.c +++ b/libpng/lodepng.c @@ -11,48 +11,51 @@ Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. - 3. This notice may not be removed or altered from any source - distribution. + 3. This notice may not be removed or altered from any source + distribution. */ /* The manual and changelog are in the header file "lodepng.h" -Rename this file to lodepng.cpp to use it for C++, or to lodepng.c to use it for C. +Rename this file to lodepng.cpp to use it for C++, or to lodepng.c to use it for +C. */ #include "lodepng.h" #ifdef LODEPNG_COMPILE_DISK #include /* LONG_MAX */ -#include /* file handling */ -#endif /* LODEPNG_COMPILE_DISK */ +#include /* file handling */ +#endif /* LODEPNG_COMPILE_DISK */ #ifdef LODEPNG_COMPILE_ALLOCATORS #include /* allocations */ -#endif /* LODEPNG_COMPILE_ALLOCATORS */ +#endif /* LODEPNG_COMPILE_ALLOCATORS */ -#if defined(_MSC_VER) && (_MSC_VER >= 1310) /*Visual Studio: A few warning types are not desired here.*/ -#pragma warning( disable : 4244 ) /*implicit conversions: not warned by gcc -Wall -Wextra and requires too much casts*/ -#pragma warning( disable : 4996 ) /*VS does not like fopen, but fopen_s is not standard C so unusable here*/ -#endif /*_MSC_VER */ +#if defined(_MSC_VER) && \ + (_MSC_VER >= 1310) /*Visual Studio: A few warning types are not desired here.*/ +#pragma warning(disable : 4244) /*implicit conversions: not warned by gcc \ + -Wall -Wextra and requires too much casts*/ +#pragma warning(disable : 4996) /*VS does not like fopen, but fopen_s is not \ + standard C so unusable here*/ +#endif /*_MSC_VER */ -const char* LODEPNG_VERSION_STRING = "20230410"; +const char *LODEPNG_VERSION_STRING = "20230410"; /* This source file is divided into the following large parts. The code sections -with the "LODEPNG_COMPILE_" #defines divide this up further in an intermixed way. --Tools for C and common code for PNG and Zlib --C Code for Zlib (huffman, deflate, ...) --C Code for PNG (file format chunks, adam7, PNG filters, color conversions, ...) --The C++ wrapper around all of the above +with the "LODEPNG_COMPILE_" #defines divide this up further in an intermixed +way. -Tools for C and common code for PNG and Zlib -C Code for Zlib (huffman, +deflate, ...) -C Code for PNG (file format chunks, adam7, PNG filters, color +conversions, ...) -The C++ wrapper around all of the above */ /* ////////////////////////////////////////////////////////////////////////// */ @@ -71,71 +74,77 @@ lodepng source code. Don't forget to remove "static" if you copypaste them from here.*/ #ifdef LODEPNG_COMPILE_ALLOCATORS -static void* lodepng_malloc(size_t size) { +static void *lodepng_malloc(size_t size) { #ifdef LODEPNG_MAX_ALLOC - if(size > LODEPNG_MAX_ALLOC) return 0; + if (size > LODEPNG_MAX_ALLOC) + return 0; #endif - return malloc(size); + return malloc(size); } /* NOTE: when realloc returns NULL, it leaves the original memory untouched */ -static void* lodepng_realloc(void* ptr, size_t new_size) { +static void *lodepng_realloc(void *ptr, size_t new_size) { #ifdef LODEPNG_MAX_ALLOC - if(new_size > LODEPNG_MAX_ALLOC) return 0; + if (new_size > LODEPNG_MAX_ALLOC) + return 0; #endif - return realloc(ptr, new_size); + return realloc(ptr, new_size); } -static void lodepng_free(void* ptr) { - free(ptr); -} -#else /*LODEPNG_COMPILE_ALLOCATORS*/ +static void lodepng_free(void *ptr) { free(ptr); } +#else /*LODEPNG_COMPILE_ALLOCATORS*/ /* TODO: support giving additional void* payload to the custom allocators */ -void* lodepng_malloc(size_t size); -void* lodepng_realloc(void* ptr, size_t new_size); -void lodepng_free(void* ptr); +void *lodepng_malloc(size_t size); +void *lodepng_realloc(void *ptr, size_t new_size); +void lodepng_free(void *ptr); #endif /*LODEPNG_COMPILE_ALLOCATORS*/ -/* convince the compiler to inline a function, for use when this measurably improves performance */ +/* convince the compiler to inline a function, for use when this measurably + * improves performance */ /* inline is not available in C90, but use it when supported by the compiler */ -#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || (defined(__cplusplus) && (__cplusplus >= 199711L)) +#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ + (defined(__cplusplus) && (__cplusplus >= 199711L)) #define LODEPNG_INLINE inline #else #define LODEPNG_INLINE /* not available */ #endif -/* restrict is not available in C90, but use it when supported by the compiler */ -#if (defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))) ||\ - (defined(_MSC_VER) && (_MSC_VER >= 1400)) || \ - (defined(__WATCOMC__) && (__WATCOMC__ >= 1250) && !defined(__cplusplus)) +/* restrict is not available in C90, but use it when supported by the compiler + */ +#if (defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))) || \ + (defined(_MSC_VER) && (_MSC_VER >= 1400)) || \ + (defined(__WATCOMC__) && (__WATCOMC__ >= 1250) && !defined(__cplusplus)) #define LODEPNG_RESTRICT __restrict #else #define LODEPNG_RESTRICT /* not available */ #endif -/* Replacements for C library functions such as memcpy and strlen, to support platforms -where a full C library is not available. The compiler can recognize them and compile -to something as fast. */ +/* Replacements for C library functions such as memcpy and strlen, to support +platforms where a full C library is not available. The compiler can recognize +them and compile to something as fast. */ -static void lodepng_memcpy(void* LODEPNG_RESTRICT dst, - const void* LODEPNG_RESTRICT src, size_t size) { - size_t i; - for(i = 0; i < size; i++) ((char*)dst)[i] = ((const char*)src)[i]; +static void lodepng_memcpy( + void *LODEPNG_RESTRICT dst, const void *LODEPNG_RESTRICT src, size_t size) { + size_t i; + for (i = 0; i < size; i++) + ((char *)dst)[i] = ((const char *)src)[i]; } -static void lodepng_memset(void* LODEPNG_RESTRICT dst, - int value, size_t num) { - size_t i; - for(i = 0; i < num; i++) ((char*)dst)[i] = (char)value; +static void lodepng_memset(void *LODEPNG_RESTRICT dst, int value, size_t num) { + size_t i; + for (i = 0; i < num; i++) + ((char *)dst)[i] = (char)value; } /* does not check memory out of bounds, do not use on untrusted data */ -static size_t lodepng_strlen(const char* a) { - const char* orig = a; - /* avoid warning about unused function in case of disabled COMPILE... macros */ - (void)(&lodepng_strlen); - while(*a) a++; - return (size_t)(a - orig); +static size_t lodepng_strlen(const char *a) { + const char *orig = a; + /* avoid warning about unused function in case of disabled COMPILE... macros + */ + (void)(&lodepng_strlen); + while (*a) + a++; + return (size_t)(a - orig); } #define LODEPNG_MAX(a, b) (((a) > (b)) ? (a) : (b)) @@ -144,31 +153,31 @@ static size_t lodepng_strlen(const char* a) { #if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_DECODER) /* Safely check if adding two integers will overflow (no undefined behavior, compiler removing the code, etc...) and output result. */ -static int lodepng_addofl(size_t a, size_t b, size_t* result) { - *result = a + b; /* Unsigned addition is well defined and safe in C90 */ - return *result < a; +static int lodepng_addofl(size_t a, size_t b, size_t *result) { + *result = a + b; /* Unsigned addition is well defined and safe in C90 */ + return *result < a; } #endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_DECODER)*/ #ifdef LODEPNG_COMPILE_DECODER /* Safely check if multiplying two integers will overflow (no undefined behavior, compiler removing the code, etc...) and output result. */ -static int lodepng_mulofl(size_t a, size_t b, size_t* result) { - *result = a * b; /* Unsigned multiplication is well defined and safe in C90 */ - return (a != 0 && *result / a != b); +static int lodepng_mulofl(size_t a, size_t b, size_t *result) { + *result = a * b; /* Unsigned multiplication is well defined and safe in C90 */ + return (a != 0 && *result / a != b); } #ifdef LODEPNG_COMPILE_ZLIB /* Safely check if a + b > c, even if overflow could happen. */ static int lodepng_gtofl(size_t a, size_t b, size_t c) { - size_t d; - if(lodepng_addofl(a, b, &d)) return 1; - return d > c; + size_t d; + if (lodepng_addofl(a, b, &d)) + return 1; + return d > c; } #endif /*LODEPNG_COMPILE_ZLIB*/ #endif /*LODEPNG_COMPILE_DECODER*/ - /* Often in case of an error a value is assigned to a variable and then it breaks out of a loop (to go to the cleanup phase of a function). This macro does that. @@ -176,120 +185,130 @@ It makes the error handling code shorter and more readable. Example: if(!uivector_resize(&lz77_encoded, datasize)) ERROR_BREAK(83); */ -#define CERROR_BREAK(errorvar, code){\ - errorvar = code;\ - break;\ -} - -/*version of CERROR_BREAK that assumes the common case where the error variable is named "error"*/ +#define CERROR_BREAK(errorvar, code) \ + { \ + errorvar = code; \ + break; \ + } + +/*version of CERROR_BREAK that assumes the common case where the error variable + * is named "error"*/ #define ERROR_BREAK(code) CERROR_BREAK(error, code) /*Set error var to the error code, and return it.*/ -#define CERROR_RETURN_ERROR(errorvar, code){\ - errorvar = code;\ - return code;\ -} +#define CERROR_RETURN_ERROR(errorvar, code) \ + { \ + errorvar = code; \ + return code; \ + } /*Try the code, if it returns error, also return the error.*/ -#define CERROR_TRY_RETURN(call){\ - unsigned error = call;\ - if(error) return error;\ -} +#define CERROR_TRY_RETURN(call) \ + { \ + unsigned error = call; \ + if (error) \ + return error; \ + } /*Set error var to the error code, and return from the void function.*/ -#define CERROR_RETURN(errorvar, code){\ - errorvar = code;\ - return;\ -} +#define CERROR_RETURN(errorvar, code) \ + { \ + errorvar = code; \ + return; \ + } /* About uivector, ucvector and string: -All of them wrap dynamic arrays or text strings in a similar way. --LodePNG was originally written in C++. The vectors replace the std::vectors that were used in the C++ version. --The string tools are made to avoid problems with compilers that declare things like strncat as deprecated. --They're not used in the interface, only internally in this file as static functions. --As with many other structs in this file, the init and cleanup functions serve as ctor and dtor. +-LodePNG was originally written in C++. The vectors replace the std::vectors +that were used in the C++ version. -The string tools are made to avoid problems +with compilers that declare things like strncat as deprecated. -They're not used +in the interface, only internally in this file as static functions. -As with +many other structs in this file, the init and cleanup functions serve as ctor +and dtor. */ #ifdef LODEPNG_COMPILE_ZLIB #ifdef LODEPNG_COMPILE_ENCODER /*dynamic vector of unsigned ints*/ typedef struct uivector { - unsigned* data; - size_t size; /*size in number of unsigned longs*/ - size_t allocsize; /*allocated size in bytes*/ + unsigned *data; + size_t size; /*size in number of unsigned longs*/ + size_t allocsize; /*allocated size in bytes*/ } uivector; -static void uivector_cleanup(void* p) { - ((uivector*)p)->size = ((uivector*)p)->allocsize = 0; - lodepng_free(((uivector*)p)->data); - ((uivector*)p)->data = NULL; +static void uivector_cleanup(void *p) { + ((uivector *)p)->size = ((uivector *)p)->allocsize = 0; + lodepng_free(((uivector *)p)->data); + ((uivector *)p)->data = NULL; } /*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_resize(uivector* p, size_t size) { - size_t allocsize = size * sizeof(unsigned); - if(allocsize > p->allocsize) { - size_t newsize = allocsize + (p->allocsize >> 1u); - void* data = lodepng_realloc(p->data, newsize); - if(data) { - p->allocsize = newsize; - p->data = (unsigned*)data; - } - else return 0; /*error: not enough memory*/ - } - p->size = size; - return 1; /*success*/ -} - -static void uivector_init(uivector* p) { - p->data = NULL; - p->size = p->allocsize = 0; +static unsigned uivector_resize(uivector *p, size_t size) { + size_t allocsize = size * sizeof(unsigned); + if (allocsize > p->allocsize) { + size_t newsize = allocsize + (p->allocsize >> 1u); + void *data = lodepng_realloc(p->data, newsize); + if (data) { + p->allocsize = newsize; + p->data = (unsigned *)data; + } else + return 0; /*error: not enough memory*/ + } + p->size = size; + return 1; /*success*/ +} + +static void uivector_init(uivector *p) { + p->data = NULL; + p->size = p->allocsize = 0; } /*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned uivector_push_back(uivector* p, unsigned c) { - if(!uivector_resize(p, p->size + 1)) return 0; - p->data[p->size - 1] = c; - return 1; +static unsigned uivector_push_back(uivector *p, unsigned c) { + if (!uivector_resize(p, p->size + 1)) + return 0; + p->data[p->size - 1] = c; + return 1; } #endif /*LODEPNG_COMPILE_ENCODER*/ #endif /*LODEPNG_COMPILE_ZLIB*/ -/* /////////////////////////////////////////////////////////////////////////// */ +/* /////////////////////////////////////////////////////////////////////////// + */ /*dynamic vector of unsigned chars*/ typedef struct ucvector { - unsigned char* data; - size_t size; /*used size*/ - size_t allocsize; /*allocated size*/ + unsigned char *data; + size_t size; /*used size*/ + size_t allocsize; /*allocated size*/ } ucvector; /*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_reserve(ucvector* p, size_t size) { - if(size > p->allocsize) { - size_t newsize = size + (p->allocsize >> 1u); - void* data = lodepng_realloc(p->data, newsize); - if(data) { - p->allocsize = newsize; - p->data = (unsigned char*)data; - } - else return 0; /*error: not enough memory*/ - } - return 1; /*success*/ +static unsigned ucvector_reserve(ucvector *p, size_t size) { + if (size > p->allocsize) { + size_t newsize = size + (p->allocsize >> 1u); + void *data = lodepng_realloc(p->data, newsize); + if (data) { + p->allocsize = newsize; + p->data = (unsigned char *)data; + } else + return 0; /*error: not enough memory*/ + } + return 1; /*success*/ } /*returns 1 if success, 0 if failure ==> nothing done*/ -static unsigned ucvector_resize(ucvector* p, size_t size) { - p->size = size; - return ucvector_reserve(p, size); +static unsigned ucvector_resize(ucvector *p, size_t size) { + p->size = size; + return ucvector_reserve(p, size); } -static ucvector ucvector_init(unsigned char* buffer, size_t size) { - ucvector v; - v.data = buffer; - v.allocsize = v.size = size; - return v; +static ucvector ucvector_init(unsigned char *buffer, size_t size) { + ucvector v; + v.data = buffer; + v.allocsize = v.size = size; + return v; } /* ////////////////////////////////////////////////////////////////////////// */ @@ -298,44 +317,43 @@ static ucvector ucvector_init(unsigned char* buffer, size_t size) { #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS /*free string pointer and set it to NULL*/ -static void string_cleanup(char** out) { - lodepng_free(*out); - *out = NULL; +static void string_cleanup(char **out) { + lodepng_free(*out); + *out = NULL; } /*also appends null termination character*/ -static char* alloc_string_sized(const char* in, size_t insize) { - char* out = (char*)lodepng_malloc(insize + 1); - if(out) { - lodepng_memcpy(out, in, insize); - out[insize] = 0; - } - return out; -} - -/* dynamically allocates a new string with a copy of the null terminated input text */ -static char* alloc_string(const char* in) { - return alloc_string_sized(in, lodepng_strlen(in)); -} +static char *alloc_string_sized(const char *in, size_t insize) { + char *out = (char *)lodepng_malloc(insize + 1); + if (out) { + lodepng_memcpy(out, in, insize); + out[insize] = 0; + } + return out; +} + +/* dynamically allocates a new string with a copy of the null terminated input + * text */ +static char *alloc_string(const char *in) { return alloc_string_sized(in, lodepng_strlen(in)); } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ #endif /*LODEPNG_COMPILE_PNG*/ /* ////////////////////////////////////////////////////////////////////////// */ #if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_PNG) -static unsigned lodepng_read32bitInt(const unsigned char* buffer) { - return (((unsigned)buffer[0] << 24u) | ((unsigned)buffer[1] << 16u) | - ((unsigned)buffer[2] << 8u) | (unsigned)buffer[3]); +static unsigned lodepng_read32bitInt(const unsigned char *buffer) { + return (((unsigned)buffer[0] << 24u) | ((unsigned)buffer[1] << 16u) | + ((unsigned)buffer[2] << 8u) | (unsigned)buffer[3]); } #endif /*defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_PNG)*/ #if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER) /*buffer must have at least 4 allocated bytes available*/ -static void lodepng_set32bitInt(unsigned char* buffer, unsigned value) { - buffer[0] = (unsigned char)((value >> 24) & 0xff); - buffer[1] = (unsigned char)((value >> 16) & 0xff); - buffer[2] = (unsigned char)((value >> 8) & 0xff); - buffer[3] = (unsigned char)((value ) & 0xff); +static void lodepng_set32bitInt(unsigned char *buffer, unsigned value) { + buffer[0] = (unsigned char)((value >> 24) & 0xff); + buffer[1] = (unsigned char)((value >> 16) & 0xff); + buffer[2] = (unsigned char)((value >> 8) & 0xff); + buffer[3] = (unsigned char)((value)&0xff); } #endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER)*/ @@ -345,59 +363,69 @@ static void lodepng_set32bitInt(unsigned char* buffer, unsigned value) { #ifdef LODEPNG_COMPILE_DISK -/* returns negative value on error. This should be pure C compatible, so no fstat. */ -static long lodepng_filesize(const char* filename) { - FILE* file; - long size; - file = fopen(filename, "rb"); - if(!file) return -1; +/* returns negative value on error. This should be pure C compatible, so no + * fstat. */ +static long lodepng_filesize(const char *filename) { + FILE *file; + long size; + file = fopen(filename, "rb"); + if (!file) + return -1; - if(fseek(file, 0, SEEK_END) != 0) { - fclose(file); - return -1; - } + if (fseek(file, 0, SEEK_END) != 0) { + fclose(file); + return -1; + } - size = ftell(file); - /* It may give LONG_MAX as directory size, this is invalid for us. */ - if(size == LONG_MAX) size = -1; + size = ftell(file); + /* It may give LONG_MAX as directory size, this is invalid for us. */ + if (size == LONG_MAX) + size = -1; - fclose(file); - return size; + fclose(file); + return size; } -/* load file into buffer that already has the correct allocated size. Returns error code.*/ -static unsigned lodepng_buffer_file(unsigned char* out, size_t size, const char* filename) { - FILE* file; - size_t readsize; - file = fopen(filename, "rb"); - if(!file) return 78; +/* load file into buffer that already has the correct allocated size. Returns + * error code.*/ +static unsigned lodepng_buffer_file(unsigned char *out, size_t size, const char *filename) { + FILE *file; + size_t readsize; + file = fopen(filename, "rb"); + if (!file) + return 78; - readsize = fread(out, 1, size, file); - fclose(file); + readsize = fread(out, 1, size, file); + fclose(file); - if(readsize != size) return 78; - return 0; + if (readsize != size) + return 78; + return 0; } -unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* filename) { - long size = lodepng_filesize(filename); - if(size < 0) return 78; - *outsize = (size_t)size; +unsigned lodepng_load_file(unsigned char **out, size_t *outsize, const char *filename) { + long size = lodepng_filesize(filename); + if (size < 0) + return 78; + *outsize = (size_t)size; - *out = (unsigned char*)lodepng_malloc((size_t)size); - if(!(*out) && size > 0) return 83; /*the above malloc failed*/ + *out = (unsigned char *)lodepng_malloc((size_t)size); + if (!(*out) && size > 0) + return 83; /*the above malloc failed*/ - return lodepng_buffer_file(*out, (size_t)size, filename); + return lodepng_buffer_file(*out, (size_t)size, filename); } -/*write given buffer to the file, overwriting the file, it doesn't append to it.*/ -unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename) { - FILE* file; - file = fopen(filename, "wb" ); - if(!file) return 79; - fwrite(buffer, 1, buffersize, file); - fclose(file); - return 0; +/*write given buffer to the file, overwriting the file, it doesn't append to + * it.*/ +unsigned lodepng_save_file(const unsigned char *buffer, size_t buffersize, const char *filename) { + FILE *file; + file = fopen(filename, "wb"); + if (!file) + return 79; + fwrite(buffer, 1, buffersize, file); + fclose(file); + return 0; } #endif /*LODEPNG_COMPILE_DISK*/ @@ -412,72 +440,84 @@ unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const #ifdef LODEPNG_COMPILE_ENCODER typedef struct { - ucvector* data; - unsigned char bp; /*ok to overflow, indicates bit pos inside byte*/ + ucvector *data; + unsigned char bp; /*ok to overflow, indicates bit pos inside byte*/ } LodePNGBitWriter; -static void LodePNGBitWriter_init(LodePNGBitWriter* writer, ucvector* data) { - writer->data = data; - writer->bp = 0; +static void LodePNGBitWriter_init(LodePNGBitWriter *writer, ucvector *data) { + writer->data = data; + writer->bp = 0; } /*TODO: this ignores potential out of memory errors*/ -#define WRITEBIT(writer, bit){\ - /* append new byte */\ - if(((writer->bp) & 7u) == 0) {\ - if(!ucvector_resize(writer->data, writer->data->size + 1)) return;\ - writer->data->data[writer->data->size - 1] = 0;\ - }\ - (writer->data->data[writer->data->size - 1]) |= (bit << ((writer->bp) & 7u));\ - ++writer->bp;\ -} +#define WRITEBIT(writer, bit) \ + { \ + /* append new byte */ \ + if (((writer->bp) & 7u) == 0) { \ + if (!ucvector_resize(writer->data, writer->data->size + 1)) \ + return; \ + writer->data->data[writer->data->size - 1] = 0; \ + } \ + (writer->data->data[writer->data->size - 1]) |= (bit << ((writer->bp) & 7u)); \ + ++writer->bp; \ + } /* LSB of value is written first, and LSB of bytes is used first */ -static void writeBits(LodePNGBitWriter* writer, unsigned value, size_t nbits) { - if(nbits == 1) { /* compiler should statically compile this case if nbits == 1 */ - WRITEBIT(writer, value); - } else { - /* TODO: increase output size only once here rather than in each WRITEBIT */ - size_t i; - for(i = 0; i != nbits; ++i) { - WRITEBIT(writer, (unsigned char)((value >> i) & 1)); - } - } -} - -/* This one is to use for adding huffman symbol, the value bits are written MSB first */ -static void writeBitsReversed(LodePNGBitWriter* writer, unsigned value, size_t nbits) { - size_t i; - for(i = 0; i != nbits; ++i) { - /* TODO: increase output size only once here rather than in each WRITEBIT */ - WRITEBIT(writer, (unsigned char)((value >> (nbits - 1u - i)) & 1u)); - } +static void writeBits(LodePNGBitWriter *writer, unsigned value, size_t nbits) { + if (nbits == 1) { /* compiler should statically compile this case if nbits == 1 */ + WRITEBIT(writer, value); + } else { + /* TODO: increase output size only once here rather than in each + * WRITEBIT */ + size_t i; + for (i = 0; i != nbits; ++i) { + WRITEBIT(writer, (unsigned char)((value >> i) & 1)); + } + } +} + +/* This one is to use for adding huffman symbol, the value bits are written MSB + * first */ +static void writeBitsReversed(LodePNGBitWriter *writer, unsigned value, size_t nbits) { + size_t i; + for (i = 0; i != nbits; ++i) { + /* TODO: increase output size only once here rather than in each + * WRITEBIT */ + WRITEBIT(writer, (unsigned char)((value >> (nbits - 1u - i)) & 1u)); + } } #endif /*LODEPNG_COMPILE_ENCODER*/ #ifdef LODEPNG_COMPILE_DECODER typedef struct { - const unsigned char* data; - size_t size; /*size of data in bytes*/ - size_t bitsize; /*size of data in bits, end of valid bp values, should be 8*size*/ - size_t bp; - unsigned buffer; /*buffer for reading bits. NOTE: 'unsigned' must support at least 32 bits*/ + const unsigned char *data; + size_t size; /*size of data in bytes*/ + size_t bitsize; /*size of data in bits, end of valid bp values, should be + 8*size*/ + size_t bp; + unsigned buffer; /*buffer for reading bits. NOTE: 'unsigned' must support at + least 32 bits*/ } LodePNGBitReader; -/* data size argument is in bytes. Returns error if size too large causing overflow */ -static unsigned LodePNGBitReader_init(LodePNGBitReader* reader, const unsigned char* data, size_t size) { - size_t temp; - reader->data = data; - reader->size = size; - /* size in bits, return error if overflow (if size_t is 32 bit this supports up to 500MB) */ - if(lodepng_mulofl(size, 8u, &reader->bitsize)) return 105; - /*ensure incremented bp can be compared to bitsize without overflow even when it would be incremented 32 too much and - trying to ensure 32 more bits*/ - if(lodepng_addofl(reader->bitsize, 64u, &temp)) return 105; - reader->bp = 0; - reader->buffer = 0; - return 0; /*ok*/ +/* data size argument is in bytes. Returns error if size too large causing + * overflow */ +static unsigned LodePNGBitReader_init( + LodePNGBitReader *reader, const unsigned char *data, size_t size) { + size_t temp; + reader->data = data; + reader->size = size; + /* size in bits, return error if overflow (if size_t is 32 bit this supports + * up to 500MB) */ + if (lodepng_mulofl(size, 8u, &reader->bitsize)) + return 105; + /*ensure incremented bp can be compared to bitsize without overflow even + when it would be incremented 32 too much and trying to ensure 32 more bits*/ + if (lodepng_addofl(reader->bitsize, 64u, &temp)) + return 105; + reader->bp = 0; + reader->buffer = 0; + return 0; /*ok*/ } /* @@ -489,100 +529,116 @@ checking for amount of bits must be done beforehand. */ /*See ensureBits documentation above. This one ensures up to 9 bits */ -static LODEPNG_INLINE void ensureBits9(LodePNGBitReader* reader, size_t nbits) { - size_t start = reader->bp >> 3u; - size_t size = reader->size; - if(start + 1u < size) { - reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u); - reader->buffer >>= (reader->bp & 7u); - } else { - reader->buffer = 0; - if(start + 0u < size) reader->buffer = reader->data[start + 0]; - reader->buffer >>= (reader->bp & 7u); - } - (void)nbits; +static LODEPNG_INLINE void ensureBits9(LodePNGBitReader *reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if (start + 1u < size) { + reader->buffer = + (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u); + reader->buffer >>= (reader->bp & 7u); + } else { + reader->buffer = 0; + if (start + 0u < size) + reader->buffer = reader->data[start + 0]; + reader->buffer >>= (reader->bp & 7u); + } + (void)nbits; } /*See ensureBits documentation above. This one ensures up to 17 bits */ -static LODEPNG_INLINE void ensureBits17(LodePNGBitReader* reader, size_t nbits) { - size_t start = reader->bp >> 3u; - size_t size = reader->size; - if(start + 2u < size) { - reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | - ((unsigned)reader->data[start + 2] << 16u); - reader->buffer >>= (reader->bp & 7u); - } else { - reader->buffer = 0; - if(start + 0u < size) reader->buffer |= reader->data[start + 0]; - if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); - reader->buffer >>= (reader->bp & 7u); - } - (void)nbits; +static LODEPNG_INLINE void ensureBits17(LodePNGBitReader *reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if (start + 2u < size) { + reader->buffer = (unsigned)reader->data[start + 0] | + ((unsigned)reader->data[start + 1] << 8u) | + ((unsigned)reader->data[start + 2] << 16u); + reader->buffer >>= (reader->bp & 7u); + } else { + reader->buffer = 0; + if (start + 0u < size) + reader->buffer |= reader->data[start + 0]; + if (start + 1u < size) + reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); + reader->buffer >>= (reader->bp & 7u); + } + (void)nbits; } /*See ensureBits documentation above. This one ensures up to 25 bits */ -static LODEPNG_INLINE void ensureBits25(LodePNGBitReader* reader, size_t nbits) { - size_t start = reader->bp >> 3u; - size_t size = reader->size; - if(start + 3u < size) { - reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | - ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u); - reader->buffer >>= (reader->bp & 7u); - } else { - reader->buffer = 0; - if(start + 0u < size) reader->buffer |= reader->data[start + 0]; - if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); - if(start + 2u < size) reader->buffer |= ((unsigned)reader->data[start + 2] << 16u); - reader->buffer >>= (reader->bp & 7u); - } - (void)nbits; +static LODEPNG_INLINE void ensureBits25(LodePNGBitReader *reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if (start + 3u < size) { + reader->buffer = + (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | + ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u); + reader->buffer >>= (reader->bp & 7u); + } else { + reader->buffer = 0; + if (start + 0u < size) + reader->buffer |= reader->data[start + 0]; + if (start + 1u < size) + reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); + if (start + 2u < size) + reader->buffer |= ((unsigned)reader->data[start + 2] << 16u); + reader->buffer >>= (reader->bp & 7u); + } + (void)nbits; } /*See ensureBits documentation above. This one ensures up to 32 bits */ -static LODEPNG_INLINE void ensureBits32(LodePNGBitReader* reader, size_t nbits) { - size_t start = reader->bp >> 3u; - size_t size = reader->size; - if(start + 4u < size) { - reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | - ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u); - reader->buffer >>= (reader->bp & 7u); - reader->buffer |= (((unsigned)reader->data[start + 4] << 24u) << (8u - (reader->bp & 7u))); - } else { - reader->buffer = 0; - if(start + 0u < size) reader->buffer |= reader->data[start + 0]; - if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); - if(start + 2u < size) reader->buffer |= ((unsigned)reader->data[start + 2] << 16u); - if(start + 3u < size) reader->buffer |= ((unsigned)reader->data[start + 3] << 24u); - reader->buffer >>= (reader->bp & 7u); - } - (void)nbits; -} - -/* Get bits without advancing the bit pointer. Must have enough bits available with ensureBits. Max nbits is 31. */ -static LODEPNG_INLINE unsigned peekBits(LodePNGBitReader* reader, size_t nbits) { - /* The shift allows nbits to be only up to 31. */ - return reader->buffer & ((1u << nbits) - 1u); +static LODEPNG_INLINE void ensureBits32(LodePNGBitReader *reader, size_t nbits) { + size_t start = reader->bp >> 3u; + size_t size = reader->size; + if (start + 4u < size) { + reader->buffer = + (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) | + ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u); + reader->buffer >>= (reader->bp & 7u); + reader->buffer |= (((unsigned)reader->data[start + 4] << 24u) << (8u - (reader->bp & 7u))); + } else { + reader->buffer = 0; + if (start + 0u < size) + reader->buffer |= reader->data[start + 0]; + if (start + 1u < size) + reader->buffer |= ((unsigned)reader->data[start + 1] << 8u); + if (start + 2u < size) + reader->buffer |= ((unsigned)reader->data[start + 2] << 16u); + if (start + 3u < size) + reader->buffer |= ((unsigned)reader->data[start + 3] << 24u); + reader->buffer >>= (reader->bp & 7u); + } + (void)nbits; +} + +/* Get bits without advancing the bit pointer. Must have enough bits available + * with ensureBits. Max nbits is 31. */ +static LODEPNG_INLINE unsigned peekBits(LodePNGBitReader *reader, size_t nbits) { + /* The shift allows nbits to be only up to 31. */ + return reader->buffer & ((1u << nbits) - 1u); } /* Must have enough bits available with ensureBits */ -static LODEPNG_INLINE void advanceBits(LodePNGBitReader* reader, size_t nbits) { - reader->buffer >>= nbits; - reader->bp += nbits; +static LODEPNG_INLINE void advanceBits(LodePNGBitReader *reader, size_t nbits) { + reader->buffer >>= nbits; + reader->bp += nbits; } /* Must have enough bits available with ensureBits */ -static LODEPNG_INLINE unsigned readBits(LodePNGBitReader* reader, size_t nbits) { - unsigned result = peekBits(reader, nbits); - advanceBits(reader, nbits); - return result; +static LODEPNG_INLINE unsigned readBits(LodePNGBitReader *reader, size_t nbits) { + unsigned result = peekBits(reader, nbits); + advanceBits(reader, nbits); + return result; } #endif /*LODEPNG_COMPILE_DECODER*/ static unsigned reverseBits(unsigned bits, unsigned num) { - /*TODO: implement faster lookup table based version when needed*/ - unsigned i, result = 0; - for(i = 0; i < num; i++) result |= ((bits >> (num - i - 1u)) & 1u) << i; - return result; + /*TODO: implement faster lookup table based version when needed*/ + unsigned i, result = 0; + for (i = 0; i < num; i++) + result |= ((bits >> (num - i - 1u)) & 1u) << i; + return result; } /* ////////////////////////////////////////////////////////////////////////// */ @@ -595,33 +651,32 @@ static unsigned reverseBits(unsigned bits, unsigned num) { #define NUM_DEFLATE_CODE_SYMBOLS 288 /*the distance codes have their own symbols, 30 used, 2 unused*/ #define NUM_DISTANCE_SYMBOLS 32 -/*the code length codes. 0-15: code lengths, 16: copy previous 3-6 times, 17: 3-10 zeros, 18: 11-138 zeros*/ +/*the code length codes. 0-15: code lengths, 16: copy previous 3-6 times, 17: + * 3-10 zeros, 18: 11-138 zeros*/ #define NUM_CODE_LENGTH_CODES 19 /*the base lengths represented by codes 257-285*/ -static const unsigned LENGTHBASE[29] - = {3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, - 67, 83, 99, 115, 131, 163, 195, 227, 258}; +static const unsigned LENGTHBASE[29] = {3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, + 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258}; /*the extra bits used by codes 257-285 (added to base length)*/ -static const unsigned LENGTHEXTRA[29] - = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, - 4, 4, 4, 4, 5, 5, 5, 5, 0}; +static const unsigned LENGTHEXTRA[29] = { + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0}; -/*the base backwards distances (the bits of distance codes appear after length codes and use their own huffman tree)*/ -static const unsigned DISTANCEBASE[30] - = {1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, - 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577}; +/*the base backwards distances (the bits of distance codes appear after length + * codes and use their own huffman tree)*/ +static const unsigned DISTANCEBASE[30] = {1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, + 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577}; /*the extra bits of backwards distances (added to base)*/ -static const unsigned DISTANCEEXTRA[30] - = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, - 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; +static const unsigned DISTANCEEXTRA[30] = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, + 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; -/*the order in which "code length alphabet code lengths" are stored as specified by deflate, out of this the huffman -tree of the dynamic huffman tree lengths is generated*/ -static const unsigned CLCL_ORDER[NUM_CODE_LENGTH_CODES] - = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; +/*the order in which "code length alphabet code lengths" are stored as specified +by deflate, out of this the huffman tree of the dynamic huffman tree lengths is +generated*/ +static const unsigned CLCL_ORDER[NUM_CODE_LENGTH_CODES] = { + 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; /* ////////////////////////////////////////////////////////////////////////// */ @@ -629,152 +684,181 @@ static const unsigned CLCL_ORDER[NUM_CODE_LENGTH_CODES] Huffman tree struct, containing multiple representations of the tree */ typedef struct HuffmanTree { - unsigned* codes; /*the huffman codes (bit patterns representing the symbols)*/ - unsigned* lengths; /*the lengths of the huffman codes*/ - unsigned maxbitlen; /*maximum number of bits a single code can get*/ - unsigned numcodes; /*number of symbols in the alphabet = number of codes*/ - /* for reading only */ - unsigned char* table_len; /*length of symbol from lookup table, or max length if secondary lookup needed*/ - unsigned short* table_value; /*value of symbol from lookup table, or pointer to secondary table if needed*/ + unsigned *codes; /*the huffman codes (bit patterns representing the symbols)*/ + unsigned *lengths; /*the lengths of the huffman codes*/ + unsigned maxbitlen; /*maximum number of bits a single code can get*/ + unsigned numcodes; /*number of symbols in the alphabet = number of codes*/ + /* for reading only */ + unsigned char *table_len; /*length of symbol from lookup table, or max + length if secondary lookup needed*/ + unsigned short *table_value; /*value of symbol from lookup table, or pointer + to secondary table if needed*/ } HuffmanTree; -static void HuffmanTree_init(HuffmanTree* tree) { - tree->codes = 0; - tree->lengths = 0; - tree->table_len = 0; - tree->table_value = 0; +static void HuffmanTree_init(HuffmanTree *tree) { + tree->codes = 0; + tree->lengths = 0; + tree->table_len = 0; + tree->table_value = 0; } -static void HuffmanTree_cleanup(HuffmanTree* tree) { - lodepng_free(tree->codes); - lodepng_free(tree->lengths); - lodepng_free(tree->table_len); - lodepng_free(tree->table_value); +static void HuffmanTree_cleanup(HuffmanTree *tree) { + lodepng_free(tree->codes); + lodepng_free(tree->lengths); + lodepng_free(tree->table_len); + lodepng_free(tree->table_value); } -/* amount of bits for first huffman table lookup (aka root bits), see HuffmanTree_makeTable and huffmanDecodeSymbol.*/ +/* amount of bits for first huffman table lookup (aka root bits), see + * HuffmanTree_makeTable and huffmanDecodeSymbol.*/ /* values 8u and 9u work the fastest */ #define FIRSTBITS 9u -/* a symbol value too big to represent any valid symbol, to indicate reading disallowed huffman bits combination, -which is possible in case of only 0 or 1 present symbols. */ +/* a symbol value too big to represent any valid symbol, to indicate reading +disallowed huffman bits combination, which is possible in case of only 0 or 1 +present symbols. */ #define INVALIDSYMBOL 65535u /* make table for huffman decoding */ -static unsigned HuffmanTree_makeTable(HuffmanTree* tree) { - static const unsigned headsize = 1u << FIRSTBITS; /*size of the first table*/ - static const unsigned mask = (1u << FIRSTBITS) /*headsize*/ - 1u; - size_t i, numpresent, pointer, size; /*total table size*/ - unsigned* maxlens = (unsigned*)lodepng_malloc(headsize * sizeof(unsigned)); - if(!maxlens) return 83; /*alloc fail*/ - - /* compute maxlens: max total bit length of symbols sharing prefix in the first table*/ - lodepng_memset(maxlens, 0, headsize * sizeof(*maxlens)); - for(i = 0; i < tree->numcodes; i++) { - unsigned symbol = tree->codes[i]; - unsigned l = tree->lengths[i]; - unsigned index; - if(l <= FIRSTBITS) continue; /*symbols that fit in first table don't increase secondary table size*/ - /*get the FIRSTBITS MSBs, the MSBs of the symbol are encoded first. See later comment about the reversing*/ - index = reverseBits(symbol >> (l - FIRSTBITS), FIRSTBITS); - maxlens[index] = LODEPNG_MAX(maxlens[index], l); - } - /* compute total table size: size of first table plus all secondary tables for symbols longer than FIRSTBITS */ - size = headsize; - for(i = 0; i < headsize; ++i) { - unsigned l = maxlens[i]; - if(l > FIRSTBITS) size += (((size_t)1) << (l - FIRSTBITS)); - } - tree->table_len = (unsigned char*)lodepng_malloc(size * sizeof(*tree->table_len)); - tree->table_value = (unsigned short*)lodepng_malloc(size * sizeof(*tree->table_value)); - if(!tree->table_len || !tree->table_value) { - lodepng_free(maxlens); - /* freeing tree->table values is done at a higher scope */ - return 83; /*alloc fail*/ - } - /*initialize with an invalid length to indicate unused entries*/ - for(i = 0; i < size; ++i) tree->table_len[i] = 16; - - /*fill in the first table for long symbols: max prefix size and pointer to secondary tables*/ - pointer = headsize; - for(i = 0; i < headsize; ++i) { - unsigned l = maxlens[i]; - if(l <= FIRSTBITS) continue; - tree->table_len[i] = l; - tree->table_value[i] = (unsigned short)pointer; - pointer += (((size_t)1) << (l - FIRSTBITS)); - } - lodepng_free(maxlens); - - /*fill in the first table for short symbols, or secondary table for long symbols*/ - numpresent = 0; - for(i = 0; i < tree->numcodes; ++i) { - unsigned l = tree->lengths[i]; - unsigned symbol, reverse; - if(l == 0) continue; - symbol = tree->codes[i]; /*the huffman bit pattern. i itself is the value.*/ - /*reverse bits, because the huffman bits are given in MSB first order but the bit reader reads LSB first*/ - reverse = reverseBits(symbol, l); - numpresent++; - - if(l <= FIRSTBITS) { - /*short symbol, fully in first table, replicated num times if l < FIRSTBITS*/ - unsigned num = 1u << (FIRSTBITS - l); - unsigned j; - for(j = 0; j < num; ++j) { - /*bit reader will read the l bits of symbol first, the remaining FIRSTBITS - l bits go to the MSB's*/ - unsigned index = reverse | (j << l); - if(tree->table_len[index] != 16) return 55; /*invalid tree: long symbol shares prefix with short symbol*/ - tree->table_len[index] = l; - tree->table_value[index] = (unsigned short)i; - } - } else { - /*long symbol, shares prefix with other long symbols in first lookup table, needs second lookup*/ - /*the FIRSTBITS MSBs of the symbol are the first table index*/ - unsigned index = reverse & mask; - unsigned maxlen = tree->table_len[index]; - /*log2 of secondary table length, should be >= l - FIRSTBITS*/ - unsigned tablelen = maxlen - FIRSTBITS; - unsigned start = tree->table_value[index]; /*starting index in secondary table*/ - unsigned num = 1u << (tablelen - (l - FIRSTBITS)); /*amount of entries of this symbol in secondary table*/ - unsigned j; - if(maxlen < l) return 55; /*invalid tree: long symbol shares prefix with short symbol*/ - for(j = 0; j < num; ++j) { - unsigned reverse2 = reverse >> FIRSTBITS; /* l - FIRSTBITS bits */ - unsigned index2 = start + (reverse2 | (j << (l - FIRSTBITS))); - tree->table_len[index2] = l; - tree->table_value[index2] = (unsigned short)i; - } - } - } - - if(numpresent < 2) { - /* In case of exactly 1 symbol, in theory the huffman symbol needs 0 bits, - but deflate uses 1 bit instead. In case of 0 symbols, no symbols can - appear at all, but such huffman tree could still exist (e.g. if distance - codes are never used). In both cases, not all symbols of the table will be - filled in. Fill them in with an invalid symbol value so returning them from - huffmanDecodeSymbol will cause error. */ - for(i = 0; i < size; ++i) { - if(tree->table_len[i] == 16) { - /* As length, use a value smaller than FIRSTBITS for the head table, - and a value larger than FIRSTBITS for the secondary table, to ensure - valid behavior for advanceBits when reading this symbol. */ - tree->table_len[i] = (i < headsize) ? 1 : (FIRSTBITS + 1); - tree->table_value[i] = INVALIDSYMBOL; - } - } - } else { - /* A good huffman tree has N * 2 - 1 nodes, of which N - 1 are internal nodes. - If that is not the case (due to too long length codes), the table will not - have been fully used, and this is an error (not all bit combinations can be - decoded): an oversubscribed huffman tree, indicated by error 55. */ - for(i = 0; i < size; ++i) { - if(tree->table_len[i] == 16) return 55; - } - } - - return 0; +static unsigned HuffmanTree_makeTable(HuffmanTree *tree) { + static const unsigned headsize = 1u << FIRSTBITS; /*size of the first table*/ + static const unsigned mask = (1u << FIRSTBITS) /*headsize*/ - 1u; + size_t i, numpresent, pointer, size; /*total table size*/ + unsigned *maxlens = (unsigned *)lodepng_malloc(headsize * sizeof(unsigned)); + if (!maxlens) + return 83; /*alloc fail*/ + + /* compute maxlens: max total bit length of symbols sharing prefix in the + * first table*/ + lodepng_memset(maxlens, 0, headsize * sizeof(*maxlens)); + for (i = 0; i < tree->numcodes; i++) { + unsigned symbol = tree->codes[i]; + unsigned l = tree->lengths[i]; + unsigned index; + if (l <= FIRSTBITS) + continue; /*symbols that fit in first table don't increase secondary + table size*/ + /*get the FIRSTBITS MSBs, the MSBs of the symbol are encoded first. See + * later comment about the reversing*/ + index = reverseBits(symbol >> (l - FIRSTBITS), FIRSTBITS); + maxlens[index] = LODEPNG_MAX(maxlens[index], l); + } + /* compute total table size: size of first table plus all secondary tables + * for symbols longer than FIRSTBITS */ + size = headsize; + for (i = 0; i < headsize; ++i) { + unsigned l = maxlens[i]; + if (l > FIRSTBITS) + size += (((size_t)1) << (l - FIRSTBITS)); + } + tree->table_len = (unsigned char *)lodepng_malloc(size * sizeof(*tree->table_len)); + tree->table_value = (unsigned short *)lodepng_malloc(size * sizeof(*tree->table_value)); + if (!tree->table_len || !tree->table_value) { + lodepng_free(maxlens); + /* freeing tree->table values is done at a higher scope */ + return 83; /*alloc fail*/ + } + /*initialize with an invalid length to indicate unused entries*/ + for (i = 0; i < size; ++i) + tree->table_len[i] = 16; + + /*fill in the first table for long symbols: max prefix size and pointer to + * secondary tables*/ + pointer = headsize; + for (i = 0; i < headsize; ++i) { + unsigned l = maxlens[i]; + if (l <= FIRSTBITS) + continue; + tree->table_len[i] = l; + tree->table_value[i] = (unsigned short)pointer; + pointer += (((size_t)1) << (l - FIRSTBITS)); + } + lodepng_free(maxlens); + + /*fill in the first table for short symbols, or secondary table for long + * symbols*/ + numpresent = 0; + for (i = 0; i < tree->numcodes; ++i) { + unsigned l = tree->lengths[i]; + unsigned symbol, reverse; + if (l == 0) + continue; + symbol = tree->codes[i]; /*the huffman bit pattern. i itself is the value.*/ + /*reverse bits, because the huffman bits are given in MSB first order + * but the bit reader reads LSB first*/ + reverse = reverseBits(symbol, l); + numpresent++; + + if (l <= FIRSTBITS) { + /*short symbol, fully in first table, replicated num times if l < + * FIRSTBITS*/ + unsigned num = 1u << (FIRSTBITS - l); + unsigned j; + for (j = 0; j < num; ++j) { + /*bit reader will read the l bits of symbol first, the remaining + * FIRSTBITS - l bits go to the MSB's*/ + unsigned index = reverse | (j << l); + if (tree->table_len[index] != 16) + return 55; /*invalid tree: long symbol shares prefix with + short symbol*/ + tree->table_len[index] = l; + tree->table_value[index] = (unsigned short)i; + } + } else { + /*long symbol, shares prefix with other long symbols in first lookup + * table, needs second lookup*/ + /*the FIRSTBITS MSBs of the symbol are the first table index*/ + unsigned index = reverse & mask; + unsigned maxlen = tree->table_len[index]; + /*log2 of secondary table length, should be >= l - FIRSTBITS*/ + unsigned tablelen = maxlen - FIRSTBITS; + unsigned start = tree->table_value[index]; /*starting index in secondary table*/ + unsigned num = 1u << (tablelen - (l - FIRSTBITS)); /*amount of entries of this + symbol in + secondary table*/ + unsigned j; + if (maxlen < l) + return 55; /*invalid tree: long symbol shares prefix with short + symbol*/ + for (j = 0; j < num; ++j) { + unsigned reverse2 = reverse >> FIRSTBITS; /* l - FIRSTBITS bits */ + unsigned index2 = start + (reverse2 | (j << (l - FIRSTBITS))); + tree->table_len[index2] = l; + tree->table_value[index2] = (unsigned short)i; + } + } + } + + if (numpresent < 2) { + /* In case of exactly 1 symbol, in theory the huffman symbol needs 0 + bits, but deflate uses 1 bit instead. In case of 0 symbols, no symbols + can appear at all, but such huffman tree could still exist (e.g. if + distance codes are never used). In both cases, not all symbols of the + table will be filled in. Fill them in with an invalid symbol value so + returning them from huffmanDecodeSymbol will cause error. */ + for (i = 0; i < size; ++i) { + if (tree->table_len[i] == 16) { + /* As length, use a value smaller than FIRSTBITS for the head + table, and a value larger than FIRSTBITS for the secondary + table, to ensure valid behavior for advanceBits when reading + this symbol. */ + tree->table_len[i] = (i < headsize) ? 1 : (FIRSTBITS + 1); + tree->table_value[i] = INVALIDSYMBOL; + } + } + } else { + /* A good huffman tree has N * 2 - 1 nodes, of which N - 1 are internal + nodes. If that is not the case (due to too long length codes), the table + will not have been fully used, and this is an error (not all bit + combinations can be decoded): an oversubscribed huffman tree, indicated + by error 55. */ + for (i = 0; i < size; ++i) { + if (tree->table_len[i] == 16) + return 55; + } + } + + return 0; } /* @@ -782,40 +866,44 @@ Second step for the ...makeFromLengths and ...makeFromFrequencies functions. numcodes, lengths and maxbitlen must already be filled in correctly. return value is error. */ -static unsigned HuffmanTree_makeFromLengths2(HuffmanTree* tree) { - unsigned* blcount; - unsigned* nextcode; - unsigned error = 0; - unsigned bits, n; - - tree->codes = (unsigned*)lodepng_malloc(tree->numcodes * sizeof(unsigned)); - blcount = (unsigned*)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned)); - nextcode = (unsigned*)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned)); - if(!tree->codes || !blcount || !nextcode) error = 83; /*alloc fail*/ - - if(!error) { - for(n = 0; n != tree->maxbitlen + 1; n++) blcount[n] = nextcode[n] = 0; - /*step 1: count number of instances of each code length*/ - for(bits = 0; bits != tree->numcodes; ++bits) ++blcount[tree->lengths[bits]]; - /*step 2: generate the nextcode values*/ - for(bits = 1; bits <= tree->maxbitlen; ++bits) { - nextcode[bits] = (nextcode[bits - 1] + blcount[bits - 1]) << 1u; - } - /*step 3: generate all the codes*/ - for(n = 0; n != tree->numcodes; ++n) { - if(tree->lengths[n] != 0) { - tree->codes[n] = nextcode[tree->lengths[n]]++; - /*remove superfluous bits from the code*/ - tree->codes[n] &= ((1u << tree->lengths[n]) - 1u); - } - } - } - - lodepng_free(blcount); - lodepng_free(nextcode); - - if(!error) error = HuffmanTree_makeTable(tree); - return error; +static unsigned HuffmanTree_makeFromLengths2(HuffmanTree *tree) { + unsigned *blcount; + unsigned *nextcode; + unsigned error = 0; + unsigned bits, n; + + tree->codes = (unsigned *)lodepng_malloc(tree->numcodes * sizeof(unsigned)); + blcount = (unsigned *)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned)); + nextcode = (unsigned *)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned)); + if (!tree->codes || !blcount || !nextcode) + error = 83; /*alloc fail*/ + + if (!error) { + for (n = 0; n != tree->maxbitlen + 1; n++) + blcount[n] = nextcode[n] = 0; + /*step 1: count number of instances of each code length*/ + for (bits = 0; bits != tree->numcodes; ++bits) + ++blcount[tree->lengths[bits]]; + /*step 2: generate the nextcode values*/ + for (bits = 1; bits <= tree->maxbitlen; ++bits) { + nextcode[bits] = (nextcode[bits - 1] + blcount[bits - 1]) << 1u; + } + /*step 3: generate all the codes*/ + for (n = 0; n != tree->numcodes; ++n) { + if (tree->lengths[n] != 0) { + tree->codes[n] = nextcode[tree->lengths[n]]++; + /*remove superfluous bits from the code*/ + tree->codes[n] &= ((1u << tree->lengths[n]) - 1u); + } + } + } + + lodepng_free(blcount); + lodepng_free(nextcode); + + if (!error) + error = HuffmanTree_makeTable(tree); + return error; } /* @@ -823,246 +911,285 @@ given the code lengths (as stored in the PNG file), generate the tree as defined by Deflate. maxbitlen is the maximum bits that a code in the tree can have. return value is error. */ -static unsigned HuffmanTree_makeFromLengths(HuffmanTree* tree, const unsigned* bitlen, - size_t numcodes, unsigned maxbitlen) { - unsigned i; - tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned)); - if(!tree->lengths) return 83; /*alloc fail*/ - for(i = 0; i != numcodes; ++i) tree->lengths[i] = bitlen[i]; - tree->numcodes = (unsigned)numcodes; /*number of symbols*/ - tree->maxbitlen = maxbitlen; - return HuffmanTree_makeFromLengths2(tree); +static unsigned HuffmanTree_makeFromLengths( + HuffmanTree *tree, const unsigned *bitlen, size_t numcodes, unsigned maxbitlen) { + unsigned i; + tree->lengths = (unsigned *)lodepng_malloc(numcodes * sizeof(unsigned)); + if (!tree->lengths) + return 83; /*alloc fail*/ + for (i = 0; i != numcodes; ++i) + tree->lengths[i] = bitlen[i]; + tree->numcodes = (unsigned)numcodes; /*number of symbols*/ + tree->maxbitlen = maxbitlen; + return HuffmanTree_makeFromLengths2(tree); } #ifdef LODEPNG_COMPILE_ENCODER -/*BPM: Boundary Package Merge, see "A Fast and Space-Economical Algorithm for Length-Limited Coding", -Jyrki Katajainen, Alistair Moffat, Andrew Turpin, 1995.*/ +/*BPM: Boundary Package Merge, see "A Fast and Space-Economical Algorithm for +Length-Limited Coding", Jyrki Katajainen, Alistair Moffat, Andrew Turpin, +1995.*/ /*chain node for boundary package merge*/ typedef struct BPMNode { - int weight; /*the sum of all weights in this chain*/ - unsigned index; /*index of this leaf node (called "count" in the paper)*/ - struct BPMNode* tail; /*the next nodes in this chain (null if last)*/ - int in_use; + int weight; /*the sum of all weights in this chain*/ + unsigned index; /*index of this leaf node (called "count" in the paper)*/ + struct BPMNode *tail; /*the next nodes in this chain (null if last)*/ + int in_use; } BPMNode; /*lists of chains*/ typedef struct BPMLists { - /*memory pool*/ - unsigned memsize; - BPMNode* memory; - unsigned numfree; - unsigned nextfree; - BPMNode** freelist; - /*two heads of lookahead chains per list*/ - unsigned listsize; - BPMNode** chains0; - BPMNode** chains1; + /*memory pool*/ + unsigned memsize; + BPMNode *memory; + unsigned numfree; + unsigned nextfree; + BPMNode **freelist; + /*two heads of lookahead chains per list*/ + unsigned listsize; + BPMNode **chains0; + BPMNode **chains1; } BPMLists; -/*creates a new chain node with the given parameters, from the memory in the lists */ -static BPMNode* bpmnode_create(BPMLists* lists, int weight, unsigned index, BPMNode* tail) { - unsigned i; - BPMNode* result; - - /*memory full, so garbage collect*/ - if(lists->nextfree >= lists->numfree) { - /*mark only those that are in use*/ - for(i = 0; i != lists->memsize; ++i) lists->memory[i].in_use = 0; - for(i = 0; i != lists->listsize; ++i) { - BPMNode* node; - for(node = lists->chains0[i]; node != 0; node = node->tail) node->in_use = 1; - for(node = lists->chains1[i]; node != 0; node = node->tail) node->in_use = 1; - } - /*collect those that are free*/ - lists->numfree = 0; - for(i = 0; i != lists->memsize; ++i) { - if(!lists->memory[i].in_use) lists->freelist[lists->numfree++] = &lists->memory[i]; - } - lists->nextfree = 0; - } - - result = lists->freelist[lists->nextfree++]; - result->weight = weight; - result->index = index; - result->tail = tail; - return result; +/*creates a new chain node with the given parameters, from the memory in the + * lists */ +static BPMNode *bpmnode_create(BPMLists *lists, int weight, unsigned index, BPMNode *tail) { + unsigned i; + BPMNode *result; + + /*memory full, so garbage collect*/ + if (lists->nextfree >= lists->numfree) { + /*mark only those that are in use*/ + for (i = 0; i != lists->memsize; ++i) + lists->memory[i].in_use = 0; + for (i = 0; i != lists->listsize; ++i) { + BPMNode *node; + for (node = lists->chains0[i]; node != 0; node = node->tail) + node->in_use = 1; + for (node = lists->chains1[i]; node != 0; node = node->tail) + node->in_use = 1; + } + /*collect those that are free*/ + lists->numfree = 0; + for (i = 0; i != lists->memsize; ++i) { + if (!lists->memory[i].in_use) + lists->freelist[lists->numfree++] = &lists->memory[i]; + } + lists->nextfree = 0; + } + + result = lists->freelist[lists->nextfree++]; + result->weight = weight; + result->index = index; + result->tail = tail; + return result; } /*sort the leaves with stable mergesort*/ -static void bpmnode_sort(BPMNode* leaves, size_t num) { - BPMNode* mem = (BPMNode*)lodepng_malloc(sizeof(*leaves) * num); - size_t width, counter = 0; - for(width = 1; width < num; width *= 2) { - BPMNode* a = (counter & 1) ? mem : leaves; - BPMNode* b = (counter & 1) ? leaves : mem; - size_t p; - for(p = 0; p < num; p += 2 * width) { - size_t q = (p + width > num) ? num : (p + width); - size_t r = (p + 2 * width > num) ? num : (p + 2 * width); - size_t i = p, j = q, k; - for(k = p; k < r; k++) { - if(i < q && (j >= r || a[i].weight <= a[j].weight)) b[k] = a[i++]; - else b[k] = a[j++]; - } - } - counter++; - } - if(counter & 1) lodepng_memcpy(leaves, mem, sizeof(*leaves) * num); - lodepng_free(mem); -} - -/*Boundary Package Merge step, numpresent is the amount of leaves, and c is the current chain.*/ -static void boundaryPM(BPMLists* lists, BPMNode* leaves, size_t numpresent, int c, int num) { - unsigned lastindex = lists->chains1[c]->index; - - if(c == 0) { - if(lastindex >= numpresent) return; - lists->chains0[c] = lists->chains1[c]; - lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, 0); - } else { - /*sum of the weights of the head nodes of the previous lookahead chains.*/ - int sum = lists->chains0[c - 1]->weight + lists->chains1[c - 1]->weight; - lists->chains0[c] = lists->chains1[c]; - if(lastindex < numpresent && sum > leaves[lastindex].weight) { - lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, lists->chains1[c]->tail); - return; - } - lists->chains1[c] = bpmnode_create(lists, sum, lastindex, lists->chains1[c - 1]); - /*in the end we are only interested in the chain of the last list, so no - need to recurse if we're at the last one (this gives measurable speedup)*/ - if(num + 1 < (int)(2 * numpresent - 2)) { - boundaryPM(lists, leaves, numpresent, c - 1, num); - boundaryPM(lists, leaves, numpresent, c - 1, num); - } - } -} - -unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequencies, - size_t numcodes, unsigned maxbitlen) { - unsigned error = 0; - unsigned i; - size_t numpresent = 0; /*number of symbols with non-zero frequency*/ - BPMNode* leaves; /*the symbols, only those with > 0 frequency*/ - - if(numcodes == 0) return 80; /*error: a tree of 0 symbols is not supposed to be made*/ - if((1u << maxbitlen) < (unsigned)numcodes) return 80; /*error: represent all symbols*/ - - leaves = (BPMNode*)lodepng_malloc(numcodes * sizeof(*leaves)); - if(!leaves) return 83; /*alloc fail*/ - - for(i = 0; i != numcodes; ++i) { - if(frequencies[i] > 0) { - leaves[numpresent].weight = (int)frequencies[i]; - leaves[numpresent].index = i; - ++numpresent; - } - } - - lodepng_memset(lengths, 0, numcodes * sizeof(*lengths)); - - /*ensure at least two present symbols. There should be at least one symbol - according to RFC 1951 section 3.2.7. Some decoders incorrectly require two. To - make these work as well ensure there are at least two symbols. The - Package-Merge code below also doesn't work correctly if there's only one - symbol, it'd give it the theoretical 0 bits but in practice zlib wants 1 bit*/ - if(numpresent == 0) { - lengths[0] = lengths[1] = 1; /*note that for RFC 1951 section 3.2.7, only lengths[0] = 1 is needed*/ - } else if(numpresent == 1) { - lengths[leaves[0].index] = 1; - lengths[leaves[0].index == 0 ? 1 : 0] = 1; - } else { - BPMLists lists; - BPMNode* node; - - bpmnode_sort(leaves, numpresent); - - lists.listsize = maxbitlen; - lists.memsize = 2 * maxbitlen * (maxbitlen + 1); - lists.nextfree = 0; - lists.numfree = lists.memsize; - lists.memory = (BPMNode*)lodepng_malloc(lists.memsize * sizeof(*lists.memory)); - lists.freelist = (BPMNode**)lodepng_malloc(lists.memsize * sizeof(BPMNode*)); - lists.chains0 = (BPMNode**)lodepng_malloc(lists.listsize * sizeof(BPMNode*)); - lists.chains1 = (BPMNode**)lodepng_malloc(lists.listsize * sizeof(BPMNode*)); - if(!lists.memory || !lists.freelist || !lists.chains0 || !lists.chains1) error = 83; /*alloc fail*/ - - if(!error) { - for(i = 0; i != lists.memsize; ++i) lists.freelist[i] = &lists.memory[i]; - - bpmnode_create(&lists, leaves[0].weight, 1, 0); - bpmnode_create(&lists, leaves[1].weight, 2, 0); - - for(i = 0; i != lists.listsize; ++i) { - lists.chains0[i] = &lists.memory[0]; - lists.chains1[i] = &lists.memory[1]; - } - - /*each boundaryPM call adds one chain to the last list, and we need 2 * numpresent - 2 chains.*/ - for(i = 2; i != 2 * numpresent - 2; ++i) boundaryPM(&lists, leaves, numpresent, (int)maxbitlen - 1, (int)i); - - for(node = lists.chains1[maxbitlen - 1]; node; node = node->tail) { - for(i = 0; i != node->index; ++i) ++lengths[leaves[i].index]; - } - } - - lodepng_free(lists.memory); - lodepng_free(lists.freelist); - lodepng_free(lists.chains0); - lodepng_free(lists.chains1); - } - - lodepng_free(leaves); - return error; +static void bpmnode_sort(BPMNode *leaves, size_t num) { + BPMNode *mem = (BPMNode *)lodepng_malloc(sizeof(*leaves) * num); + size_t width, counter = 0; + for (width = 1; width < num; width *= 2) { + BPMNode *a = (counter & 1) ? mem : leaves; + BPMNode *b = (counter & 1) ? leaves : mem; + size_t p; + for (p = 0; p < num; p += 2 * width) { + size_t q = (p + width > num) ? num : (p + width); + size_t r = (p + 2 * width > num) ? num : (p + 2 * width); + size_t i = p, j = q, k; + for (k = p; k < r; k++) { + if (i < q && (j >= r || a[i].weight <= a[j].weight)) + b[k] = a[i++]; + else + b[k] = a[j++]; + } + } + counter++; + } + if (counter & 1) + lodepng_memcpy(leaves, mem, sizeof(*leaves) * num); + lodepng_free(mem); +} + +/*Boundary Package Merge step, numpresent is the amount of leaves, and c is the + * current chain.*/ +static void boundaryPM(BPMLists *lists, BPMNode *leaves, size_t numpresent, int c, int num) { + unsigned lastindex = lists->chains1[c]->index; + + if (c == 0) { + if (lastindex >= numpresent) + return; + lists->chains0[c] = lists->chains1[c]; + lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, 0); + } else { + /*sum of the weights of the head nodes of the previous lookahead + * chains.*/ + int sum = lists->chains0[c - 1]->weight + lists->chains1[c - 1]->weight; + lists->chains0[c] = lists->chains1[c]; + if (lastindex < numpresent && sum > leaves[lastindex].weight) { + lists->chains1[c] = bpmnode_create( + lists, leaves[lastindex].weight, lastindex + 1, lists->chains1[c]->tail); + return; + } + lists->chains1[c] = bpmnode_create(lists, sum, lastindex, lists->chains1[c - 1]); + /*in the end we are only interested in the chain of the last list, so no + need to recurse if we're at the last one (this gives measurable + speedup)*/ + if (num + 1 < (int)(2 * numpresent - 2)) { + boundaryPM(lists, leaves, numpresent, c - 1, num); + boundaryPM(lists, leaves, numpresent, c - 1, num); + } + } +} + +unsigned lodepng_huffman_code_lengths( + unsigned *lengths, const unsigned *frequencies, size_t numcodes, unsigned maxbitlen) { + unsigned error = 0; + unsigned i; + size_t numpresent = 0; /*number of symbols with non-zero frequency*/ + BPMNode *leaves; /*the symbols, only those with > 0 frequency*/ + + if (numcodes == 0) + return 80; /*error: a tree of 0 symbols is not supposed to be made*/ + if ((1u << maxbitlen) < (unsigned)numcodes) + return 80; /*error: represent all symbols*/ + + leaves = (BPMNode *)lodepng_malloc(numcodes * sizeof(*leaves)); + if (!leaves) + return 83; /*alloc fail*/ + + for (i = 0; i != numcodes; ++i) { + if (frequencies[i] > 0) { + leaves[numpresent].weight = (int)frequencies[i]; + leaves[numpresent].index = i; + ++numpresent; + } + } + + lodepng_memset(lengths, 0, numcodes * sizeof(*lengths)); + + /*ensure at least two present symbols. There should be at least one symbol + according to RFC 1951 section 3.2.7. Some decoders incorrectly require two. + To make these work as well ensure there are at least two symbols. The + Package-Merge code below also doesn't work correctly if there's only one + symbol, it'd give it the theoretical 0 bits but in practice zlib wants 1 + bit*/ + if (numpresent == 0) { + lengths[0] = lengths[1] = 1; /*note that for RFC 1951 section 3.2.7, + only lengths[0] = 1 is needed*/ + } else if (numpresent == 1) { + lengths[leaves[0].index] = 1; + lengths[leaves[0].index == 0 ? 1 : 0] = 1; + } else { + BPMLists lists; + BPMNode *node; + + bpmnode_sort(leaves, numpresent); + + lists.listsize = maxbitlen; + lists.memsize = 2 * maxbitlen * (maxbitlen + 1); + lists.nextfree = 0; + lists.numfree = lists.memsize; + lists.memory = (BPMNode *)lodepng_malloc(lists.memsize * sizeof(*lists.memory)); + lists.freelist = (BPMNode **)lodepng_malloc(lists.memsize * sizeof(BPMNode *)); + lists.chains0 = (BPMNode **)lodepng_malloc(lists.listsize * sizeof(BPMNode *)); + lists.chains1 = (BPMNode **)lodepng_malloc(lists.listsize * sizeof(BPMNode *)); + if (!lists.memory || !lists.freelist || !lists.chains0 || !lists.chains1) + error = 83; /*alloc fail*/ + + if (!error) { + for (i = 0; i != lists.memsize; ++i) + lists.freelist[i] = &lists.memory[i]; + + bpmnode_create(&lists, leaves[0].weight, 1, 0); + bpmnode_create(&lists, leaves[1].weight, 2, 0); + + for (i = 0; i != lists.listsize; ++i) { + lists.chains0[i] = &lists.memory[0]; + lists.chains1[i] = &lists.memory[1]; + } + + /*each boundaryPM call adds one chain to the last list, and we need + * 2 * numpresent - 2 chains.*/ + for (i = 2; i != 2 * numpresent - 2; ++i) + boundaryPM(&lists, leaves, numpresent, (int)maxbitlen - 1, (int)i); + + for (node = lists.chains1[maxbitlen - 1]; node; node = node->tail) { + for (i = 0; i != node->index; ++i) + ++lengths[leaves[i].index]; + } + } + + lodepng_free(lists.memory); + lodepng_free(lists.freelist); + lodepng_free(lists.chains0); + lodepng_free(lists.chains1); + } + + lodepng_free(leaves); + return error; } /*Create the Huffman tree given the symbol frequencies*/ -static unsigned HuffmanTree_makeFromFrequencies(HuffmanTree* tree, const unsigned* frequencies, - size_t mincodes, size_t numcodes, unsigned maxbitlen) { - unsigned error = 0; - while(!frequencies[numcodes - 1] && numcodes > mincodes) --numcodes; /*trim zeroes*/ - tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned)); - if(!tree->lengths) return 83; /*alloc fail*/ - tree->maxbitlen = maxbitlen; - tree->numcodes = (unsigned)numcodes; /*number of symbols*/ - - error = lodepng_huffman_code_lengths(tree->lengths, frequencies, numcodes, maxbitlen); - if(!error) error = HuffmanTree_makeFromLengths2(tree); - return error; +static unsigned HuffmanTree_makeFromFrequencies(HuffmanTree *tree, const unsigned *frequencies, + size_t mincodes, size_t numcodes, unsigned maxbitlen) { + unsigned error = 0; + while (!frequencies[numcodes - 1] && numcodes > mincodes) + --numcodes; /*trim zeroes*/ + tree->lengths = (unsigned *)lodepng_malloc(numcodes * sizeof(unsigned)); + if (!tree->lengths) + return 83; /*alloc fail*/ + tree->maxbitlen = maxbitlen; + tree->numcodes = (unsigned)numcodes; /*number of symbols*/ + + error = lodepng_huffman_code_lengths(tree->lengths, frequencies, numcodes, maxbitlen); + if (!error) + error = HuffmanTree_makeFromLengths2(tree); + return error; } #endif /*LODEPNG_COMPILE_ENCODER*/ -/*get the literal and length code tree of a deflated block with fixed tree, as per the deflate specification*/ -static unsigned generateFixedLitLenTree(HuffmanTree* tree) { - unsigned i, error = 0; - unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); - if(!bitlen) return 83; /*alloc fail*/ +/*get the literal and length code tree of a deflated block with fixed tree, as + * per the deflate specification*/ +static unsigned generateFixedLitLenTree(HuffmanTree *tree) { + unsigned i, error = 0; + unsigned *bitlen = (unsigned *)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); + if (!bitlen) + return 83; /*alloc fail*/ - /*288 possible codes: 0-255=literals, 256=endcode, 257-285=lengthcodes, 286-287=unused*/ - for(i = 0; i <= 143; ++i) bitlen[i] = 8; - for(i = 144; i <= 255; ++i) bitlen[i] = 9; - for(i = 256; i <= 279; ++i) bitlen[i] = 7; - for(i = 280; i <= 287; ++i) bitlen[i] = 8; + /*288 possible codes: 0-255=literals, 256=endcode, 257-285=lengthcodes, + * 286-287=unused*/ + for (i = 0; i <= 143; ++i) + bitlen[i] = 8; + for (i = 144; i <= 255; ++i) + bitlen[i] = 9; + for (i = 256; i <= 279; ++i) + bitlen[i] = 7; + for (i = 280; i <= 287; ++i) + bitlen[i] = 8; - error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DEFLATE_CODE_SYMBOLS, 15); + error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DEFLATE_CODE_SYMBOLS, 15); - lodepng_free(bitlen); - return error; + lodepng_free(bitlen); + return error; } -/*get the distance code tree of a deflated block with fixed tree, as specified in the deflate specification*/ -static unsigned generateFixedDistanceTree(HuffmanTree* tree) { - unsigned i, error = 0; - unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); - if(!bitlen) return 83; /*alloc fail*/ +/*get the distance code tree of a deflated block with fixed tree, as specified + * in the deflate specification*/ +static unsigned generateFixedDistanceTree(HuffmanTree *tree) { + unsigned i, error = 0; + unsigned *bitlen = (unsigned *)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); + if (!bitlen) + return 83; /*alloc fail*/ - /*there are 32 distance codes, but 30-31 are unused*/ - for(i = 0; i != NUM_DISTANCE_SYMBOLS; ++i) bitlen[i] = 5; - error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DISTANCE_SYMBOLS, 15); + /*there are 32 distance codes, but 30-31 are unused*/ + for (i = 0; i != NUM_DISTANCE_SYMBOLS; ++i) + bitlen[i] = 5; + error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DISTANCE_SYMBOLS, 15); - lodepng_free(bitlen); - return error; + lodepng_free(bitlen); + return error; } #ifdef LODEPNG_COMPILE_DECODER @@ -1070,19 +1197,19 @@ static unsigned generateFixedDistanceTree(HuffmanTree* tree) { /* returns the code. The bit reader must already have been ensured at least 15 bits */ -static unsigned huffmanDecodeSymbol(LodePNGBitReader* reader, const HuffmanTree* codetree) { - unsigned short code = peekBits(reader, FIRSTBITS); - unsigned short l = codetree->table_len[code]; - unsigned short value = codetree->table_value[code]; - if(l <= FIRSTBITS) { - advanceBits(reader, l); - return value; - } else { - advanceBits(reader, FIRSTBITS); - value += peekBits(reader, l - FIRSTBITS); - advanceBits(reader, codetree->table_len[value] - FIRSTBITS); - return codetree->table_value[value]; - } +static unsigned huffmanDecodeSymbol(LodePNGBitReader *reader, const HuffmanTree *codetree) { + unsigned short code = peekBits(reader, FIRSTBITS); + unsigned short l = codetree->table_len[code]; + unsigned short value = codetree->table_value[code]; + if (l <= FIRSTBITS) { + advanceBits(reader, l); + return value; + } else { + advanceBits(reader, FIRSTBITS); + value += peekBits(reader, l - FIRSTBITS); + advanceBits(reader, codetree->table_len[value] - FIRSTBITS); + return codetree->table_value[value]; + } } #endif /*LODEPNG_COMPILE_DECODER*/ @@ -1092,343 +1219,412 @@ static unsigned huffmanDecodeSymbol(LodePNGBitReader* reader, const HuffmanTree* /* / Inflator (Decompressor) / */ /* ////////////////////////////////////////////////////////////////////////// */ -/*get the tree of a deflated block with fixed tree, as specified in the deflate specification -Returns error code.*/ -static unsigned getTreeInflateFixed(HuffmanTree* tree_ll, HuffmanTree* tree_d) { - unsigned error = generateFixedLitLenTree(tree_ll); - if(error) return error; - return generateFixedDistanceTree(tree_d); -} - -/*get the tree of a deflated block with dynamic tree, the tree itself is also Huffman compressed with a known tree*/ -static unsigned getTreeInflateDynamic(HuffmanTree* tree_ll, HuffmanTree* tree_d, - LodePNGBitReader* reader) { - /*make sure that length values that aren't filled in will be 0, or a wrong tree will be generated*/ - unsigned error = 0; - unsigned n, HLIT, HDIST, HCLEN, i; - - /*see comments in deflateDynamic for explanation of the context and these variables, it is analogous*/ - unsigned* bitlen_ll = 0; /*lit,len code lengths*/ - unsigned* bitlen_d = 0; /*dist code lengths*/ - /*code length code lengths ("clcl"), the bit lengths of the huffman tree used to compress bitlen_ll and bitlen_d*/ - unsigned* bitlen_cl = 0; - HuffmanTree tree_cl; /*the code tree for code length codes (the huffman tree for compressed huffman trees)*/ - - if(reader->bitsize - reader->bp < 14) return 49; /*error: the bit pointer is or will go past the memory*/ - ensureBits17(reader, 14); - - /*number of literal/length codes + 257. Unlike the spec, the value 257 is added to it here already*/ - HLIT = readBits(reader, 5) + 257; - /*number of distance codes. Unlike the spec, the value 1 is added to it here already*/ - HDIST = readBits(reader, 5) + 1; - /*number of code length codes. Unlike the spec, the value 4 is added to it here already*/ - HCLEN = readBits(reader, 4) + 4; - - bitlen_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(unsigned)); - if(!bitlen_cl) return 83 /*alloc fail*/; - - HuffmanTree_init(&tree_cl); - - while(!error) { - /*read the code length codes out of 3 * (amount of code length codes) bits*/ - if(lodepng_gtofl(reader->bp, HCLEN * 3, reader->bitsize)) { - ERROR_BREAK(50); /*error: the bit pointer is or will go past the memory*/ - } - for(i = 0; i != HCLEN; ++i) { - ensureBits9(reader, 3); /*out of bounds already checked above */ - bitlen_cl[CLCL_ORDER[i]] = readBits(reader, 3); - } - for(i = HCLEN; i != NUM_CODE_LENGTH_CODES; ++i) { - bitlen_cl[CLCL_ORDER[i]] = 0; - } - - error = HuffmanTree_makeFromLengths(&tree_cl, bitlen_cl, NUM_CODE_LENGTH_CODES, 7); - if(error) break; - - /*now we can use this tree to read the lengths for the tree that this function will return*/ - bitlen_ll = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); - bitlen_d = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); - if(!bitlen_ll || !bitlen_d) ERROR_BREAK(83 /*alloc fail*/); - lodepng_memset(bitlen_ll, 0, NUM_DEFLATE_CODE_SYMBOLS * sizeof(*bitlen_ll)); - lodepng_memset(bitlen_d, 0, NUM_DISTANCE_SYMBOLS * sizeof(*bitlen_d)); - - /*i is the current symbol we're reading in the part that contains the code lengths of lit/len and dist codes*/ - i = 0; - while(i < HLIT + HDIST) { - unsigned code; - ensureBits25(reader, 22); /* up to 15 bits for huffman code, up to 7 extra bits below*/ - code = huffmanDecodeSymbol(reader, &tree_cl); - if(code <= 15) /*a length code*/ { - if(i < HLIT) bitlen_ll[i] = code; - else bitlen_d[i - HLIT] = code; - ++i; - } else if(code == 16) /*repeat previous*/ { - unsigned replength = 3; /*read in the 2 bits that indicate repeat length (3-6)*/ - unsigned value; /*set value to the previous code*/ - - if(i == 0) ERROR_BREAK(54); /*can't repeat previous if i is 0*/ - - replength += readBits(reader, 2); - - if(i < HLIT + 1) value = bitlen_ll[i - 1]; - else value = bitlen_d[i - HLIT - 1]; - /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) { - if(i >= HLIT + HDIST) ERROR_BREAK(13); /*error: i is larger than the amount of codes*/ - if(i < HLIT) bitlen_ll[i] = value; - else bitlen_d[i - HLIT] = value; - ++i; - } - } else if(code == 17) /*repeat "0" 3-10 times*/ { - unsigned replength = 3; /*read in the bits that indicate repeat length*/ - replength += readBits(reader, 3); - - /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) { - if(i >= HLIT + HDIST) ERROR_BREAK(14); /*error: i is larger than the amount of codes*/ - - if(i < HLIT) bitlen_ll[i] = 0; - else bitlen_d[i - HLIT] = 0; - ++i; - } - } else if(code == 18) /*repeat "0" 11-138 times*/ { - unsigned replength = 11; /*read in the bits that indicate repeat length*/ - replength += readBits(reader, 7); - - /*repeat this value in the next lengths*/ - for(n = 0; n < replength; ++n) { - if(i >= HLIT + HDIST) ERROR_BREAK(15); /*error: i is larger than the amount of codes*/ - - if(i < HLIT) bitlen_ll[i] = 0; - else bitlen_d[i - HLIT] = 0; - ++i; - } - } else /*if(code == INVALIDSYMBOL)*/ { - ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ - } - /*check if any of the ensureBits above went out of bounds*/ - if(reader->bp > reader->bitsize) { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - /* TODO: revise error codes 10,11,50: the above comment is no longer valid */ - ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ - } - } - if(error) break; - - if(bitlen_ll[256] == 0) ERROR_BREAK(64); /*the length of the end code 256 must be larger than 0*/ - - /*now we've finally got HLIT and HDIST, so generate the code trees, and the function is done*/ - error = HuffmanTree_makeFromLengths(tree_ll, bitlen_ll, NUM_DEFLATE_CODE_SYMBOLS, 15); - if(error) break; - error = HuffmanTree_makeFromLengths(tree_d, bitlen_d, NUM_DISTANCE_SYMBOLS, 15); - - break; /*end of error-while*/ - } - - lodepng_free(bitlen_cl); - lodepng_free(bitlen_ll); - lodepng_free(bitlen_d); - HuffmanTree_cleanup(&tree_cl); - - return error; +/*get the tree of a deflated block with fixed tree, as specified in the deflate +specification Returns error code.*/ +static unsigned getTreeInflateFixed(HuffmanTree *tree_ll, HuffmanTree *tree_d) { + unsigned error = generateFixedLitLenTree(tree_ll); + if (error) + return error; + return generateFixedDistanceTree(tree_d); +} + +/*get the tree of a deflated block with dynamic tree, the tree itself is also + * Huffman compressed with a known tree*/ +static unsigned getTreeInflateDynamic( + HuffmanTree *tree_ll, HuffmanTree *tree_d, LodePNGBitReader *reader) { + /*make sure that length values that aren't filled in will be 0, or a wrong + * tree will be generated*/ + unsigned error = 0; + unsigned n, HLIT, HDIST, HCLEN, i; + + /*see comments in deflateDynamic for explanation of the context and these + * variables, it is analogous*/ + unsigned *bitlen_ll = 0; /*lit,len code lengths*/ + unsigned *bitlen_d = 0; /*dist code lengths*/ + /*code length code lengths ("clcl"), the bit lengths of the huffman tree + * used to compress bitlen_ll and bitlen_d*/ + unsigned *bitlen_cl = 0; + HuffmanTree tree_cl; /*the code tree for code length codes (the huffman tree + for compressed huffman trees)*/ + + if (reader->bitsize - reader->bp < 14) + return 49; /*error: the bit pointer is or will go past the memory*/ + ensureBits17(reader, 14); + + /*number of literal/length codes + 257. Unlike the spec, the value 257 is + * added to it here already*/ + HLIT = readBits(reader, 5) + 257; + /*number of distance codes. Unlike the spec, the value 1 is added to it here + * already*/ + HDIST = readBits(reader, 5) + 1; + /*number of code length codes. Unlike the spec, the value 4 is added to it + * here already*/ + HCLEN = readBits(reader, 4) + 4; + + bitlen_cl = (unsigned *)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(unsigned)); + if (!bitlen_cl) + return 83 /*alloc fail*/; + + HuffmanTree_init(&tree_cl); + + while (!error) { + /*read the code length codes out of 3 * (amount of code length codes) + * bits*/ + if (lodepng_gtofl(reader->bp, HCLEN * 3, reader->bitsize)) { + ERROR_BREAK(50); /*error: the bit pointer is or will go past the memory*/ + } + for (i = 0; i != HCLEN; ++i) { + ensureBits9(reader, 3); /*out of bounds already checked above */ + bitlen_cl[CLCL_ORDER[i]] = readBits(reader, 3); + } + for (i = HCLEN; i != NUM_CODE_LENGTH_CODES; ++i) { + bitlen_cl[CLCL_ORDER[i]] = 0; + } + + error = HuffmanTree_makeFromLengths(&tree_cl, bitlen_cl, NUM_CODE_LENGTH_CODES, 7); + if (error) + break; + + /*now we can use this tree to read the lengths for the tree that this + * function will return*/ + bitlen_ll = (unsigned *)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned)); + bitlen_d = (unsigned *)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned)); + if (!bitlen_ll || !bitlen_d) + ERROR_BREAK(83 /*alloc fail*/); + lodepng_memset(bitlen_ll, 0, NUM_DEFLATE_CODE_SYMBOLS * sizeof(*bitlen_ll)); + lodepng_memset(bitlen_d, 0, NUM_DISTANCE_SYMBOLS * sizeof(*bitlen_d)); + + /*i is the current symbol we're reading in the part that contains the + * code lengths of lit/len and dist codes*/ + i = 0; + while (i < HLIT + HDIST) { + unsigned code; + ensureBits25(reader, 22); /* up to 15 bits for huffman code, up to 7 + extra bits below*/ + code = huffmanDecodeSymbol(reader, &tree_cl); + if (code <= 15) /*a length code*/ { + if (i < HLIT) + bitlen_ll[i] = code; + else + bitlen_d[i - HLIT] = code; + ++i; + } else if (code == 16) /*repeat previous*/ { + unsigned replength = 3; /*read in the 2 bits that indicate repeat length (3-6)*/ + unsigned value; /*set value to the previous code*/ + + if (i == 0) + ERROR_BREAK(54); /*can't repeat previous if i is 0*/ + + replength += readBits(reader, 2); + + if (i < HLIT + 1) + value = bitlen_ll[i - 1]; + else + value = bitlen_d[i - HLIT - 1]; + /*repeat this value in the next lengths*/ + for (n = 0; n < replength; ++n) { + if (i >= HLIT + HDIST) + ERROR_BREAK(13); /*error: i is larger than the + amount of codes*/ + if (i < HLIT) + bitlen_ll[i] = value; + else + bitlen_d[i - HLIT] = value; + ++i; + } + } else if (code == 17) /*repeat "0" 3-10 times*/ { + unsigned replength = 3; /*read in the bits that indicate repeat length*/ + replength += readBits(reader, 3); + + /*repeat this value in the next lengths*/ + for (n = 0; n < replength; ++n) { + if (i >= HLIT + HDIST) + ERROR_BREAK(14); /*error: i is larger than the + amount of codes*/ + + if (i < HLIT) + bitlen_ll[i] = 0; + else + bitlen_d[i - HLIT] = 0; + ++i; + } + } else if (code == 18) /*repeat "0" 11-138 times*/ { + unsigned replength = 11; /*read in the bits that indicate repeat length*/ + replength += readBits(reader, 7); + + /*repeat this value in the next lengths*/ + for (n = 0; n < replength; ++n) { + if (i >= HLIT + HDIST) + ERROR_BREAK(15); /*error: i is larger than the + amount of codes*/ + + if (i < HLIT) + bitlen_ll[i] = 0; + else + bitlen_d[i - HLIT] = 0; + ++i; + } + } else /*if(code == INVALIDSYMBOL)*/ { + ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ + } + /*check if any of the ensureBits above went out of bounds*/ + if (reader->bp > reader->bitsize) { + /*return error code 10 or 11 depending on the situation that + happened in huffmanDecodeSymbol (10=no endcode, 11=wrong jump + outside of tree)*/ + /* TODO: revise error codes 10,11,50: the above comment is no + * longer valid */ + ERROR_BREAK(50); /*error, bit pointer jumps past memory*/ + } + } + if (error) + break; + + if (bitlen_ll[256] == 0) + ERROR_BREAK(64); /*the length of the end code 256 must be larger than 0*/ + + /*now we've finally got HLIT and HDIST, so generate the code trees, and + * the function is done*/ + error = HuffmanTree_makeFromLengths(tree_ll, bitlen_ll, NUM_DEFLATE_CODE_SYMBOLS, 15); + if (error) + break; + error = HuffmanTree_makeFromLengths(tree_d, bitlen_d, NUM_DISTANCE_SYMBOLS, 15); + + break; /*end of error-while*/ + } + + lodepng_free(bitlen_cl); + lodepng_free(bitlen_ll); + lodepng_free(bitlen_d); + HuffmanTree_cleanup(&tree_cl); + + return error; } /*inflate a block with dynamic of fixed Huffman tree. btype must be 1 or 2.*/ -static unsigned inflateHuffmanBlock(ucvector* out, LodePNGBitReader* reader, - unsigned btype, size_t max_output_size) { - unsigned error = 0; - HuffmanTree tree_ll; /*the huffman tree for literal and length codes*/ - HuffmanTree tree_d; /*the huffman tree for distance codes*/ - const size_t reserved_size = 260; /* must be at least 258 for max length, and a few extra for adding a few extra literals */ - int done = 0; - - if(!ucvector_reserve(out, out->size + reserved_size)) return 83; /*alloc fail*/ - - HuffmanTree_init(&tree_ll); - HuffmanTree_init(&tree_d); - - if(btype == 1) error = getTreeInflateFixed(&tree_ll, &tree_d); - else /*if(btype == 2)*/ error = getTreeInflateDynamic(&tree_ll, &tree_d, reader); - - - while(!error && !done) /*decode all symbols until end reached, breaks at end code*/ { - /*code_ll is literal, length or end code*/ - unsigned code_ll; - /* ensure enough bits for 2 huffman code reads (15 bits each): if the first is a literal, a second literal is read at once. This - appears to be slightly faster, than ensuring 20 bits here for 1 huffman symbol and the potential 5 extra bits for the length symbol.*/ - ensureBits32(reader, 30); - code_ll = huffmanDecodeSymbol(reader, &tree_ll); - if(code_ll <= 255) { - /*slightly faster code path if multiple literals in a row*/ - out->data[out->size++] = (unsigned char)code_ll; - code_ll = huffmanDecodeSymbol(reader, &tree_ll); - } - if(code_ll <= 255) /*literal symbol*/ { - out->data[out->size++] = (unsigned char)code_ll; - } else if(code_ll >= FIRST_LENGTH_CODE_INDEX && code_ll <= LAST_LENGTH_CODE_INDEX) /*length code*/ { - unsigned code_d, distance; - unsigned numextrabits_l, numextrabits_d; /*extra bits for length and distance*/ - size_t start, backward, length; - - /*part 1: get length base*/ - length = LENGTHBASE[code_ll - FIRST_LENGTH_CODE_INDEX]; - - /*part 2: get extra bits and add the value of that to length*/ - numextrabits_l = LENGTHEXTRA[code_ll - FIRST_LENGTH_CODE_INDEX]; - if(numextrabits_l != 0) { - /* bits already ensured above */ - ensureBits25(reader, 5); - length += readBits(reader, numextrabits_l); - } - - /*part 3: get distance code*/ - ensureBits32(reader, 28); /* up to 15 for the huffman symbol, up to 13 for the extra bits */ - code_d = huffmanDecodeSymbol(reader, &tree_d); - if(code_d > 29) { - if(code_d <= 31) { - ERROR_BREAK(18); /*error: invalid distance code (30-31 are never used)*/ - } else /* if(code_d == INVALIDSYMBOL) */{ - ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ - } - } - distance = DISTANCEBASE[code_d]; - - /*part 4: get extra bits from distance*/ - numextrabits_d = DISTANCEEXTRA[code_d]; - if(numextrabits_d != 0) { - /* bits already ensured above */ - distance += readBits(reader, numextrabits_d); - } - - /*part 5: fill in all the out[n] values based on the length and dist*/ - start = out->size; - if(distance > start) ERROR_BREAK(52); /*too long backward distance*/ - backward = start - distance; - - out->size += length; - if(distance < length) { - size_t forward; - lodepng_memcpy(out->data + start, out->data + backward, distance); - start += distance; - for(forward = distance; forward < length; ++forward) { - out->data[start++] = out->data[backward++]; - } - } else { - lodepng_memcpy(out->data + start, out->data + backward, length); - } - } else if(code_ll == 256) { - done = 1; /*end code, finish the loop*/ - } else /*if(code_ll == INVALIDSYMBOL)*/ { - ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ - } - if(out->allocsize - out->size < reserved_size) { - if(!ucvector_reserve(out, out->size + reserved_size)) ERROR_BREAK(83); /*alloc fail*/ - } - /*check if any of the ensureBits above went out of bounds*/ - if(reader->bp > reader->bitsize) { - /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol - (10=no endcode, 11=wrong jump outside of tree)*/ - /* TODO: revise error codes 10,11,50: the above comment is no longer valid */ - ERROR_BREAK(51); /*error, bit pointer jumps past memory*/ - } - if(max_output_size && out->size > max_output_size) { - ERROR_BREAK(109); /*error, larger than max size*/ - } - } - - HuffmanTree_cleanup(&tree_ll); - HuffmanTree_cleanup(&tree_d); - - return error; -} - -static unsigned inflateNoCompression(ucvector* out, LodePNGBitReader* reader, - const LodePNGDecompressSettings* settings) { - size_t bytepos; - size_t size = reader->size; - unsigned LEN, NLEN, error = 0; - - /*go to first boundary of byte*/ - bytepos = (reader->bp + 7u) >> 3u; - - /*read LEN (2 bytes) and NLEN (2 bytes)*/ - if(bytepos + 4 >= size) return 52; /*error, bit pointer will jump past memory*/ - LEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); bytepos += 2; - NLEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); bytepos += 2; - - /*check if 16-bit NLEN is really the one's complement of LEN*/ - if(!settings->ignore_nlen && LEN + NLEN != 65535) { - return 21; /*error: NLEN is not one's complement of LEN*/ - } - - if(!ucvector_resize(out, out->size + LEN)) return 83; /*alloc fail*/ - - /*read the literal data: LEN bytes are now stored in the out buffer*/ - if(bytepos + LEN > size) return 23; /*error: reading outside of in buffer*/ - - /*out->data can be NULL (when LEN is zero), and arithmetics on NULL ptr is undefined*/ - if (LEN) { - lodepng_memcpy(out->data + out->size - LEN, reader->data + bytepos, LEN); - bytepos += LEN; - } - - reader->bp = bytepos << 3u; - - return error; -} - -static unsigned lodepng_inflatev(ucvector* out, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) { - unsigned BFINAL = 0; - LodePNGBitReader reader; - unsigned error = LodePNGBitReader_init(&reader, in, insize); - - if(error) return error; - - while(!BFINAL) { - unsigned BTYPE; - if(reader.bitsize - reader.bp < 3) return 52; /*error, bit pointer will jump past memory*/ - ensureBits9(&reader, 3); - BFINAL = readBits(&reader, 1); - BTYPE = readBits(&reader, 2); - - if(BTYPE == 3) return 20; /*error: invalid BTYPE*/ - else if(BTYPE == 0) error = inflateNoCompression(out, &reader, settings); /*no compression*/ - else error = inflateHuffmanBlock(out, &reader, BTYPE, settings->max_output_size); /*compression, BTYPE 01 or 10*/ - if(!error && settings->max_output_size && out->size > settings->max_output_size) error = 109; - if(error) break; - } - - return error; -} - -unsigned lodepng_inflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) { - ucvector v = ucvector_init(*out, *outsize); - unsigned error = lodepng_inflatev(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - return error; -} - -static unsigned inflatev(ucvector* out, const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) { - if(settings->custom_inflate) { - unsigned error = settings->custom_inflate(&out->data, &out->size, in, insize, settings); - out->allocsize = out->size; - if(error) { - /*the custom inflate is allowed to have its own error codes, however, we translate it to code 110*/ - error = 110; - /*if there's a max output size, and the custom zlib returned error, then indicate that error instead*/ - if(settings->max_output_size && out->size > settings->max_output_size) error = 109; - } - return error; - } else { - return lodepng_inflatev(out, in, insize, settings); - } +static unsigned inflateHuffmanBlock( + ucvector *out, LodePNGBitReader *reader, unsigned btype, size_t max_output_size) { + unsigned error = 0; + HuffmanTree tree_ll; /*the huffman tree for literal and length codes*/ + HuffmanTree tree_d; /*the huffman tree for distance codes*/ + const size_t reserved_size = 260; /* must be at least 258 for max length, and a few extra + for adding a few extra literals */ + int done = 0; + + if (!ucvector_reserve(out, out->size + reserved_size)) + return 83; /*alloc fail*/ + + HuffmanTree_init(&tree_ll); + HuffmanTree_init(&tree_d); + + if (btype == 1) + error = getTreeInflateFixed(&tree_ll, &tree_d); + else /*if(btype == 2)*/ + error = getTreeInflateDynamic(&tree_ll, &tree_d, reader); + + while (!error && !done) /*decode all symbols until end reached, breaks at end code*/ { + /*code_ll is literal, length or end code*/ + unsigned code_ll; + /* ensure enough bits for 2 huffman code reads (15 bits each): if the + first is a literal, a second literal is read at once. This appears to be + slightly faster, than ensuring 20 bits here for 1 huffman symbol and the + potential 5 extra bits for the length symbol.*/ + ensureBits32(reader, 30); + code_ll = huffmanDecodeSymbol(reader, &tree_ll); + if (code_ll <= 255) { + /*slightly faster code path if multiple literals in a row*/ + out->data[out->size++] = (unsigned char)code_ll; + code_ll = huffmanDecodeSymbol(reader, &tree_ll); + } + if (code_ll <= 255) /*literal symbol*/ { + out->data[out->size++] = (unsigned char)code_ll; + } else if (code_ll >= FIRST_LENGTH_CODE_INDEX && + code_ll <= LAST_LENGTH_CODE_INDEX) /*length code*/ { + unsigned code_d, distance; + unsigned numextrabits_l, numextrabits_d; /*extra bits for length and distance*/ + size_t start, backward, length; + + /*part 1: get length base*/ + length = LENGTHBASE[code_ll - FIRST_LENGTH_CODE_INDEX]; + + /*part 2: get extra bits and add the value of that to length*/ + numextrabits_l = LENGTHEXTRA[code_ll - FIRST_LENGTH_CODE_INDEX]; + if (numextrabits_l != 0) { + /* bits already ensured above */ + ensureBits25(reader, 5); + length += readBits(reader, numextrabits_l); + } + + /*part 3: get distance code*/ + ensureBits32(reader, 28); /* up to 15 for the huffman symbol, up to + 13 for the extra bits */ + code_d = huffmanDecodeSymbol(reader, &tree_d); + if (code_d > 29) { + if (code_d <= 31) { + ERROR_BREAK(18); /*error: invalid distance code (30-31 are + never used)*/ + } else /* if(code_d == INVALIDSYMBOL) */ { + ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ + } + } + distance = DISTANCEBASE[code_d]; + + /*part 4: get extra bits from distance*/ + numextrabits_d = DISTANCEEXTRA[code_d]; + if (numextrabits_d != 0) { + /* bits already ensured above */ + distance += readBits(reader, numextrabits_d); + } + + /*part 5: fill in all the out[n] values based on the length and + * dist*/ + start = out->size; + if (distance > start) + ERROR_BREAK(52); /*too long backward distance*/ + backward = start - distance; + + out->size += length; + if (distance < length) { + size_t forward; + lodepng_memcpy(out->data + start, out->data + backward, distance); + start += distance; + for (forward = distance; forward < length; ++forward) { + out->data[start++] = out->data[backward++]; + } + } else { + lodepng_memcpy(out->data + start, out->data + backward, length); + } + } else if (code_ll == 256) { + done = 1; /*end code, finish the loop*/ + } else /*if(code_ll == INVALIDSYMBOL)*/ { + ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/ + } + if (out->allocsize - out->size < reserved_size) { + if (!ucvector_reserve(out, out->size + reserved_size)) + ERROR_BREAK(83); /*alloc fail*/ + } + /*check if any of the ensureBits above went out of bounds*/ + if (reader->bp > reader->bitsize) { + /*return error code 10 or 11 depending on the situation that + happened in huffmanDecodeSymbol (10=no endcode, 11=wrong jump + outside of tree)*/ + /* TODO: revise error codes 10,11,50: the above comment is no longer + * valid + */ + ERROR_BREAK(51); /*error, bit pointer jumps past memory*/ + } + if (max_output_size && out->size > max_output_size) { + ERROR_BREAK(109); /*error, larger than max size*/ + } + } + + HuffmanTree_cleanup(&tree_ll); + HuffmanTree_cleanup(&tree_d); + + return error; +} + +static unsigned inflateNoCompression( + ucvector *out, LodePNGBitReader *reader, const LodePNGDecompressSettings *settings) { + size_t bytepos; + size_t size = reader->size; + unsigned LEN, NLEN, error = 0; + + /*go to first boundary of byte*/ + bytepos = (reader->bp + 7u) >> 3u; + + /*read LEN (2 bytes) and NLEN (2 bytes)*/ + if (bytepos + 4 >= size) + return 52; /*error, bit pointer will jump past memory*/ + LEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); + bytepos += 2; + NLEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); + bytepos += 2; + + /*check if 16-bit NLEN is really the one's complement of LEN*/ + if (!settings->ignore_nlen && LEN + NLEN != 65535) { + return 21; /*error: NLEN is not one's complement of LEN*/ + } + + if (!ucvector_resize(out, out->size + LEN)) + return 83; /*alloc fail*/ + + /*read the literal data: LEN bytes are now stored in the out buffer*/ + if (bytepos + LEN > size) + return 23; /*error: reading outside of in buffer*/ + + /*out->data can be NULL (when LEN is zero), and arithmetics on NULL ptr is + * undefined*/ + if (LEN) { + lodepng_memcpy(out->data + out->size - LEN, reader->data + bytepos, LEN); + bytepos += LEN; + } + + reader->bp = bytepos << 3u; + + return error; +} + +static unsigned lodepng_inflatev(ucvector *out, const unsigned char *in, size_t insize, + const LodePNGDecompressSettings *settings) { + unsigned BFINAL = 0; + LodePNGBitReader reader; + unsigned error = LodePNGBitReader_init(&reader, in, insize); + + if (error) + return error; + + while (!BFINAL) { + unsigned BTYPE; + if (reader.bitsize - reader.bp < 3) + return 52; /*error, bit pointer will jump past memory*/ + ensureBits9(&reader, 3); + BFINAL = readBits(&reader, 1); + BTYPE = readBits(&reader, 2); + + if (BTYPE == 3) + return 20; /*error: invalid BTYPE*/ + else if (BTYPE == 0) + error = inflateNoCompression(out, &reader, settings); /*no compression*/ + else + error = inflateHuffmanBlock( + out, &reader, BTYPE, settings->max_output_size); /*compression, BTYPE 01 or 10*/ + if (!error && settings->max_output_size && out->size > settings->max_output_size) + error = 109; + if (error) + break; + } + + return error; +} + +unsigned lodepng_inflate(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGDecompressSettings *settings) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_inflatev(&v, in, insize, settings); + *out = v.data; + *outsize = v.size; + return error; +} + +static unsigned inflatev(ucvector *out, const unsigned char *in, size_t insize, + const LodePNGDecompressSettings *settings) { + if (settings->custom_inflate) { + unsigned error = settings->custom_inflate(&out->data, &out->size, in, insize, settings); + out->allocsize = out->size; + if (error) { + /*the custom inflate is allowed to have its own error codes, + * however, we translate it to code 110*/ + error = 110; + /*if there's a max output size, and the custom zlib returned error, + * then indicate that error instead*/ + if (settings->max_output_size && out->size > settings->max_output_size) + error = 109; + } + return error; + } else { + return lodepng_inflatev(out, in, insize, settings); + } } #endif /*LODEPNG_COMPILE_DECODER*/ @@ -1441,691 +1637,787 @@ static unsigned inflatev(ucvector* out, const unsigned char* in, size_t insize, static const unsigned MAX_SUPPORTED_DEFLATE_LENGTH = 258; -/*search the index in the array, that has the largest value smaller than or equal to the given value, -given array must be sorted (if no value is smaller, it returns the size of the given array)*/ -static size_t searchCodeIndex(const unsigned* array, size_t array_size, size_t value) { - /*binary search (only small gain over linear). TODO: use CPU log2 instruction for getting symbols instead*/ - size_t left = 1; - size_t right = array_size - 1; - - while(left <= right) { - size_t mid = (left + right) >> 1; - if(array[mid] >= value) right = mid - 1; - else left = mid + 1; - } - if(left >= array_size || array[left] > value) left--; - return left; -} - -static void addLengthDistance(uivector* values, size_t length, size_t distance) { - /*values in encoded vector are those used by deflate: - 0-255: literal bytes - 256: end - 257-285: length/distance pair (length code, followed by extra length bits, distance code, extra distance bits) - 286-287: invalid*/ - - unsigned length_code = (unsigned)searchCodeIndex(LENGTHBASE, 29, length); - unsigned extra_length = (unsigned)(length - LENGTHBASE[length_code]); - unsigned dist_code = (unsigned)searchCodeIndex(DISTANCEBASE, 30, distance); - unsigned extra_distance = (unsigned)(distance - DISTANCEBASE[dist_code]); - - size_t pos = values->size; - /*TODO: return error when this fails (out of memory)*/ - unsigned ok = uivector_resize(values, values->size + 4); - if(ok) { - values->data[pos + 0] = length_code + FIRST_LENGTH_CODE_INDEX; - values->data[pos + 1] = extra_length; - values->data[pos + 2] = dist_code; - values->data[pos + 3] = extra_distance; - } +/*search the index in the array, that has the largest value smaller than or +equal to the given value, given array must be sorted (if no value is smaller, it +returns the size of the given array)*/ +static size_t searchCodeIndex(const unsigned *array, size_t array_size, size_t value) { + /*binary search (only small gain over linear). TODO: use CPU log2 + * instruction for getting symbols instead*/ + size_t left = 1; + size_t right = array_size - 1; + + while (left <= right) { + size_t mid = (left + right) >> 1; + if (array[mid] >= value) + right = mid - 1; + else + left = mid + 1; + } + if (left >= array_size || array[left] > value) + left--; + return left; +} + +static void addLengthDistance(uivector *values, size_t length, size_t distance) { + /*values in encoded vector are those used by deflate: + 0-255: literal bytes + 256: end + 257-285: length/distance pair (length code, followed by extra length bits, + distance code, extra distance bits) 286-287: invalid*/ + + unsigned length_code = (unsigned)searchCodeIndex(LENGTHBASE, 29, length); + unsigned extra_length = (unsigned)(length - LENGTHBASE[length_code]); + unsigned dist_code = (unsigned)searchCodeIndex(DISTANCEBASE, 30, distance); + unsigned extra_distance = (unsigned)(distance - DISTANCEBASE[dist_code]); + + size_t pos = values->size; + /*TODO: return error when this fails (out of memory)*/ + unsigned ok = uivector_resize(values, values->size + 4); + if (ok) { + values->data[pos + 0] = length_code + FIRST_LENGTH_CODE_INDEX; + values->data[pos + 1] = extra_length; + values->data[pos + 2] = dist_code; + values->data[pos + 3] = extra_distance; + } } /*3 bytes of data get encoded into two bytes. The hash cannot use more than 3 bytes as input because 3 is the minimum match length for deflate*/ static const unsigned HASH_NUM_VALUES = 65536; -static const unsigned HASH_BIT_MASK = 65535; /*HASH_NUM_VALUES - 1, but C90 does not like that as initializer*/ +static const unsigned HASH_BIT_MASK = + 65535; /*HASH_NUM_VALUES - 1, but C90 does not like that as initializer*/ typedef struct Hash { - int* head; /*hash value to head circular pos - can be outdated if went around window*/ - /*circular pos to prev circular pos*/ - unsigned short* chain; - int* val; /*circular pos to hash value*/ - - /*TODO: do this not only for zeros but for any repeated byte. However for PNG - it's always going to be the zeros that dominate, so not important for PNG*/ - int* headz; /*similar to head, but for chainz*/ - unsigned short* chainz; /*those with same amount of zeros*/ - unsigned short* zeros; /*length of zeros streak, used as a second hash chain*/ + int *head; /*hash value to head circular pos - can be outdated if went + around window*/ + /*circular pos to prev circular pos*/ + unsigned short *chain; + int *val; /*circular pos to hash value*/ + + /*TODO: do this not only for zeros but for any repeated byte. However for + PNG it's always going to be the zeros that dominate, so not important for + PNG*/ + int *headz; /*similar to head, but for chainz*/ + unsigned short *chainz; /*those with same amount of zeros*/ + unsigned short *zeros; /*length of zeros streak, used as a second hash chain*/ } Hash; -static unsigned hash_init(Hash* hash, unsigned windowsize) { - unsigned i; - hash->head = (int*)lodepng_malloc(sizeof(int) * HASH_NUM_VALUES); - hash->val = (int*)lodepng_malloc(sizeof(int) * windowsize); - hash->chain = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize); - - hash->zeros = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize); - hash->headz = (int*)lodepng_malloc(sizeof(int) * (MAX_SUPPORTED_DEFLATE_LENGTH + 1)); - hash->chainz = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize); - - if(!hash->head || !hash->chain || !hash->val || !hash->headz|| !hash->chainz || !hash->zeros) { - return 83; /*alloc fail*/ - } - - /*initialize hash table*/ - for(i = 0; i != HASH_NUM_VALUES; ++i) hash->head[i] = -1; - for(i = 0; i != windowsize; ++i) hash->val[i] = -1; - for(i = 0; i != windowsize; ++i) hash->chain[i] = i; /*same value as index indicates uninitialized*/ - - for(i = 0; i <= MAX_SUPPORTED_DEFLATE_LENGTH; ++i) hash->headz[i] = -1; - for(i = 0; i != windowsize; ++i) hash->chainz[i] = i; /*same value as index indicates uninitialized*/ - - return 0; -} - -static void hash_cleanup(Hash* hash) { - lodepng_free(hash->head); - lodepng_free(hash->val); - lodepng_free(hash->chain); - - lodepng_free(hash->zeros); - lodepng_free(hash->headz); - lodepng_free(hash->chainz); -} - - - -static unsigned getHash(const unsigned char* data, size_t size, size_t pos) { - unsigned result = 0; - if(pos + 2 < size) { - /*A simple shift and xor hash is used. Since the data of PNGs is dominated - by zeroes due to the filters, a better hash does not have a significant - effect on speed in traversing the chain, and causes more time spend on - calculating the hash.*/ - result ^= ((unsigned)data[pos + 0] << 0u); - result ^= ((unsigned)data[pos + 1] << 4u); - result ^= ((unsigned)data[pos + 2] << 8u); - } else { - size_t amount, i; - if(pos >= size) return 0; - amount = size - pos; - for(i = 0; i != amount; ++i) result ^= ((unsigned)data[pos + i] << (i * 8u)); - } - return result & HASH_BIT_MASK; -} - -static unsigned countZeros(const unsigned char* data, size_t size, size_t pos) { - const unsigned char* start = data + pos; - const unsigned char* end = start + MAX_SUPPORTED_DEFLATE_LENGTH; - if(end > data + size) end = data + size; - data = start; - while(data != end && *data == 0) ++data; - /*subtracting two addresses returned as 32-bit number (max value is MAX_SUPPORTED_DEFLATE_LENGTH)*/ - return (unsigned)(data - start); +static unsigned hash_init(Hash *hash, unsigned windowsize) { + unsigned i; + hash->head = (int *)lodepng_malloc(sizeof(int) * HASH_NUM_VALUES); + hash->val = (int *)lodepng_malloc(sizeof(int) * windowsize); + hash->chain = (unsigned short *)lodepng_malloc(sizeof(unsigned short) * windowsize); + + hash->zeros = (unsigned short *)lodepng_malloc(sizeof(unsigned short) * windowsize); + hash->headz = (int *)lodepng_malloc(sizeof(int) * (MAX_SUPPORTED_DEFLATE_LENGTH + 1)); + hash->chainz = (unsigned short *)lodepng_malloc(sizeof(unsigned short) * windowsize); + + if (!hash->head || !hash->chain || !hash->val || !hash->headz || !hash->chainz || + !hash->zeros) { + return 83; /*alloc fail*/ + } + + /*initialize hash table*/ + for (i = 0; i != HASH_NUM_VALUES; ++i) + hash->head[i] = -1; + for (i = 0; i != windowsize; ++i) + hash->val[i] = -1; + for (i = 0; i != windowsize; ++i) + hash->chain[i] = i; /*same value as index indicates uninitialized*/ + + for (i = 0; i <= MAX_SUPPORTED_DEFLATE_LENGTH; ++i) + hash->headz[i] = -1; + for (i = 0; i != windowsize; ++i) + hash->chainz[i] = i; /*same value as index indicates uninitialized*/ + + return 0; +} + +static void hash_cleanup(Hash *hash) { + lodepng_free(hash->head); + lodepng_free(hash->val); + lodepng_free(hash->chain); + + lodepng_free(hash->zeros); + lodepng_free(hash->headz); + lodepng_free(hash->chainz); +} + +static unsigned getHash(const unsigned char *data, size_t size, size_t pos) { + unsigned result = 0; + if (pos + 2 < size) { + /*A simple shift and xor hash is used. Since the data of PNGs is + dominated by zeroes due to the filters, a better hash does not have a + significant effect on speed in traversing the chain, and causes more + time spend on calculating the hash.*/ + result ^= ((unsigned)data[pos + 0] << 0u); + result ^= ((unsigned)data[pos + 1] << 4u); + result ^= ((unsigned)data[pos + 2] << 8u); + } else { + size_t amount, i; + if (pos >= size) + return 0; + amount = size - pos; + for (i = 0; i != amount; ++i) + result ^= ((unsigned)data[pos + i] << (i * 8u)); + } + return result & HASH_BIT_MASK; +} + +static unsigned countZeros(const unsigned char *data, size_t size, size_t pos) { + const unsigned char *start = data + pos; + const unsigned char *end = start + MAX_SUPPORTED_DEFLATE_LENGTH; + if (end > data + size) + end = data + size; + data = start; + while (data != end && *data == 0) + ++data; + /*subtracting two addresses returned as 32-bit number (max value is + * MAX_SUPPORTED_DEFLATE_LENGTH)*/ + return (unsigned)(data - start); } /*wpos = pos & (windowsize - 1)*/ -static void updateHashChain(Hash* hash, size_t wpos, unsigned hashval, unsigned short numzeros) { - hash->val[wpos] = (int)hashval; - if(hash->head[hashval] != -1) hash->chain[wpos] = hash->head[hashval]; - hash->head[hashval] = (int)wpos; +static void updateHashChain(Hash *hash, size_t wpos, unsigned hashval, unsigned short numzeros) { + hash->val[wpos] = (int)hashval; + if (hash->head[hashval] != -1) + hash->chain[wpos] = hash->head[hashval]; + hash->head[hashval] = (int)wpos; - hash->zeros[wpos] = numzeros; - if(hash->headz[numzeros] != -1) hash->chainz[wpos] = hash->headz[numzeros]; - hash->headz[numzeros] = (int)wpos; + hash->zeros[wpos] = numzeros; + if (hash->headz[numzeros] != -1) + hash->chainz[wpos] = hash->headz[numzeros]; + hash->headz[numzeros] = (int)wpos; } /* -LZ77-encode the data. Return value is error code. The input are raw bytes, the output -is in the form of unsigned integers with codes representing for example literal bytes, or -length/distance pairs. -It uses a hash table technique to let it encode faster. When doing LZ77 encoding, a -sliding window (of windowsize) is used, and all past bytes in that window can be used as -the "dictionary". A brute force search through all possible distances would be slow, and -this hash technique is one out of several ways to speed this up. +LZ77-encode the data. Return value is error code. The input are raw bytes, the +output is in the form of unsigned integers with codes representing for example +literal bytes, or length/distance pairs. It uses a hash table technique to let +it encode faster. When doing LZ77 encoding, a sliding window (of windowsize) is +used, and all past bytes in that window can be used as the "dictionary". A brute +force search through all possible distances would be slow, and this hash +technique is one out of several ways to speed this up. */ -static unsigned encodeLZ77(uivector* out, Hash* hash, - const unsigned char* in, size_t inpos, size_t insize, unsigned windowsize, - unsigned minmatch, unsigned nicematch, unsigned lazymatching) { - size_t pos; - unsigned i, error = 0; - /*for large window lengths, assume the user wants no compression loss. Otherwise, max hash chain length speedup.*/ - unsigned maxchainlength = windowsize >= 8192 ? windowsize : windowsize / 8u; - unsigned maxlazymatch = windowsize >= 8192 ? MAX_SUPPORTED_DEFLATE_LENGTH : 64; - - unsigned usezeros = 1; /*not sure if setting it to false for windowsize < 8192 is better or worse*/ - unsigned numzeros = 0; - - unsigned offset; /*the offset represents the distance in LZ77 terminology*/ - unsigned length; - unsigned lazy = 0; - unsigned lazylength = 0, lazyoffset = 0; - unsigned hashval; - unsigned current_offset, current_length; - unsigned prev_offset; - const unsigned char *lastptr, *foreptr, *backptr; - unsigned hashpos; - - if(windowsize == 0 || windowsize > 32768) return 60; /*error: windowsize smaller/larger than allowed*/ - if((windowsize & (windowsize - 1)) != 0) return 90; /*error: must be power of two*/ - - if(nicematch > MAX_SUPPORTED_DEFLATE_LENGTH) nicematch = MAX_SUPPORTED_DEFLATE_LENGTH; - - for(pos = inpos; pos < insize; ++pos) { - size_t wpos = pos & (windowsize - 1); /*position for in 'circular' hash buffers*/ - unsigned chainlength = 0; - - hashval = getHash(in, insize, pos); - - if(usezeros && hashval == 0) { - if(numzeros == 0) numzeros = countZeros(in, insize, pos); - else if(pos + numzeros > insize || in[pos + numzeros - 1] != 0) --numzeros; - } else { - numzeros = 0; - } - - updateHashChain(hash, wpos, hashval, numzeros); - - /*the length and offset found for the current position*/ - length = 0; - offset = 0; - - hashpos = hash->chain[wpos]; - - lastptr = &in[insize < pos + MAX_SUPPORTED_DEFLATE_LENGTH ? insize : pos + MAX_SUPPORTED_DEFLATE_LENGTH]; - - /*search for the longest string*/ - prev_offset = 0; - for(;;) { - if(chainlength++ >= maxchainlength) break; - current_offset = (unsigned)(hashpos <= wpos ? wpos - hashpos : wpos - hashpos + windowsize); - - if(current_offset < prev_offset) break; /*stop when went completely around the circular buffer*/ - prev_offset = current_offset; - if(current_offset > 0) { - /*test the next characters*/ - foreptr = &in[pos]; - backptr = &in[pos - current_offset]; - - /*common case in PNGs is lots of zeros. Quickly skip over them as a speedup*/ - if(numzeros >= 3) { - unsigned skip = hash->zeros[hashpos]; - if(skip > numzeros) skip = numzeros; - backptr += skip; - foreptr += skip; - } - - while(foreptr != lastptr && *backptr == *foreptr) /*maximum supported length by deflate is max length*/ { - ++backptr; - ++foreptr; - } - current_length = (unsigned)(foreptr - &in[pos]); - - if(current_length > length) { - length = current_length; /*the longest length*/ - offset = current_offset; /*the offset that is related to this longest length*/ - /*jump out once a length of max length is found (speed gain). This also jumps - out if length is MAX_SUPPORTED_DEFLATE_LENGTH*/ - if(current_length >= nicematch) break; - } - } - - if(hashpos == hash->chain[hashpos]) break; - - if(numzeros >= 3 && length > numzeros) { - hashpos = hash->chainz[hashpos]; - if(hash->zeros[hashpos] != numzeros) break; - } else { - hashpos = hash->chain[hashpos]; - /*outdated hash value, happens if particular value was not encountered in whole last window*/ - if(hash->val[hashpos] != (int)hashval) break; - } - } - - if(lazymatching) { - if(!lazy && length >= 3 && length <= maxlazymatch && length < MAX_SUPPORTED_DEFLATE_LENGTH) { - lazy = 1; - lazylength = length; - lazyoffset = offset; - continue; /*try the next byte*/ - } - if(lazy) { - lazy = 0; - if(pos == 0) ERROR_BREAK(81); - if(length > lazylength + 1) { - /*push the previous character as literal*/ - if(!uivector_push_back(out, in[pos - 1])) ERROR_BREAK(83 /*alloc fail*/); - } else { - length = lazylength; - offset = lazyoffset; - hash->head[hashval] = -1; /*the same hashchain update will be done, this ensures no wrong alteration*/ - hash->headz[numzeros] = -1; /*idem*/ - --pos; - } - } - } - if(length >= 3 && offset > windowsize) ERROR_BREAK(86 /*too big (or overflown negative) offset*/); - - /*encode it as length/distance pair or literal value*/ - if(length < 3) /*only lengths of 3 or higher are supported as length/distance pair*/ { - if(!uivector_push_back(out, in[pos])) ERROR_BREAK(83 /*alloc fail*/); - } else if(length < minmatch || (length == 3 && offset > 4096)) { - /*compensate for the fact that longer offsets have more extra bits, a - length of only 3 may be not worth it then*/ - if(!uivector_push_back(out, in[pos])) ERROR_BREAK(83 /*alloc fail*/); - } else { - addLengthDistance(out, length, offset); - for(i = 1; i < length; ++i) { - ++pos; - wpos = pos & (windowsize - 1); - hashval = getHash(in, insize, pos); - if(usezeros && hashval == 0) { - if(numzeros == 0) numzeros = countZeros(in, insize, pos); - else if(pos + numzeros > insize || in[pos + numzeros - 1] != 0) --numzeros; - } else { - numzeros = 0; - } - updateHashChain(hash, wpos, hashval, numzeros); - } - } - } /*end of the loop through each character of input*/ - - return error; -} - -/* /////////////////////////////////////////////////////////////////////////// */ - -static unsigned deflateNoCompression(ucvector* out, const unsigned char* data, size_t datasize) { - /*non compressed deflate block data: 1 bit BFINAL,2 bits BTYPE,(5 bits): it jumps to start of next byte, - 2 bytes LEN, 2 bytes NLEN, LEN bytes literal DATA*/ - - size_t i, numdeflateblocks = (datasize + 65534u) / 65535u; - unsigned datapos = 0; - for(i = 0; i != numdeflateblocks; ++i) { - unsigned BFINAL, BTYPE, LEN, NLEN; - unsigned char firstbyte; - size_t pos = out->size; - - BFINAL = (i == numdeflateblocks - 1); - BTYPE = 0; - - LEN = 65535; - if(datasize - datapos < 65535u) LEN = (unsigned)datasize - datapos; - NLEN = 65535 - LEN; - - if(!ucvector_resize(out, out->size + LEN + 5)) return 83; /*alloc fail*/ - - firstbyte = (unsigned char)(BFINAL + ((BTYPE & 1u) << 1u) + ((BTYPE & 2u) << 1u)); - out->data[pos + 0] = firstbyte; - out->data[pos + 1] = (unsigned char)(LEN & 255); - out->data[pos + 2] = (unsigned char)(LEN >> 8u); - out->data[pos + 3] = (unsigned char)(NLEN & 255); - out->data[pos + 4] = (unsigned char)(NLEN >> 8u); - lodepng_memcpy(out->data + pos + 5, data + datapos, LEN); - datapos += LEN; - } - - return 0; +static unsigned encodeLZ77(uivector *out, Hash *hash, const unsigned char *in, size_t inpos, + size_t insize, unsigned windowsize, unsigned minmatch, unsigned nicematch, + unsigned lazymatching) { + size_t pos; + unsigned i, error = 0; + /*for large window lengths, assume the user wants no compression loss. + * Otherwise, max hash chain length speedup.*/ + unsigned maxchainlength = windowsize >= 8192 ? windowsize : windowsize / 8u; + unsigned maxlazymatch = windowsize >= 8192 ? MAX_SUPPORTED_DEFLATE_LENGTH : 64; + + unsigned usezeros = 1; /*not sure if setting it to false for windowsize < + 8192 is better or worse*/ + unsigned numzeros = 0; + + unsigned offset; /*the offset represents the distance in LZ77 terminology*/ + unsigned length; + unsigned lazy = 0; + unsigned lazylength = 0, lazyoffset = 0; + unsigned hashval; + unsigned current_offset, current_length; + unsigned prev_offset; + const unsigned char *lastptr, *foreptr, *backptr; + unsigned hashpos; + + if (windowsize == 0 || windowsize > 32768) + return 60; /*error: windowsize smaller/larger than allowed*/ + if ((windowsize & (windowsize - 1)) != 0) + return 90; /*error: must be power of two*/ + + if (nicematch > MAX_SUPPORTED_DEFLATE_LENGTH) + nicematch = MAX_SUPPORTED_DEFLATE_LENGTH; + + for (pos = inpos; pos < insize; ++pos) { + size_t wpos = pos & (windowsize - 1); /*position for in 'circular' hash buffers*/ + unsigned chainlength = 0; + + hashval = getHash(in, insize, pos); + + if (usezeros && hashval == 0) { + if (numzeros == 0) + numzeros = countZeros(in, insize, pos); + else if (pos + numzeros > insize || in[pos + numzeros - 1] != 0) + --numzeros; + } else { + numzeros = 0; + } + + updateHashChain(hash, wpos, hashval, numzeros); + + /*the length and offset found for the current position*/ + length = 0; + offset = 0; + + hashpos = hash->chain[wpos]; + + lastptr = + &in[insize < pos + MAX_SUPPORTED_DEFLATE_LENGTH ? insize + : pos + MAX_SUPPORTED_DEFLATE_LENGTH]; + + /*search for the longest string*/ + prev_offset = 0; + for (;;) { + if (chainlength++ >= maxchainlength) + break; + current_offset = + (unsigned)(hashpos <= wpos ? wpos - hashpos : wpos - hashpos + windowsize); + + if (current_offset < prev_offset) + break; /*stop when went completely around the circular buffer*/ + prev_offset = current_offset; + if (current_offset > 0) { + /*test the next characters*/ + foreptr = &in[pos]; + backptr = &in[pos - current_offset]; + + /*common case in PNGs is lots of zeros. Quickly skip over them + * as a speedup*/ + if (numzeros >= 3) { + unsigned skip = hash->zeros[hashpos]; + if (skip > numzeros) + skip = numzeros; + backptr += skip; + foreptr += skip; + } + + while (foreptr != lastptr && *backptr == *foreptr) /*maximum supported length by + deflate is max length*/ + { + ++backptr; + ++foreptr; + } + current_length = (unsigned)(foreptr - &in[pos]); + + if (current_length > length) { + length = current_length; /*the longest length*/ + offset = current_offset; /*the offset that is related to + this longest length*/ + /*jump out once a length of max length is found (speed + gain). This also jumps out if length is + MAX_SUPPORTED_DEFLATE_LENGTH*/ + if (current_length >= nicematch) + break; + } + } + + if (hashpos == hash->chain[hashpos]) + break; + + if (numzeros >= 3 && length > numzeros) { + hashpos = hash->chainz[hashpos]; + if (hash->zeros[hashpos] != numzeros) + break; + } else { + hashpos = hash->chain[hashpos]; + /*outdated hash value, happens if particular value was not + * encountered in whole last window*/ + if (hash->val[hashpos] != (int)hashval) + break; + } + } + + if (lazymatching) { + if (!lazy && length >= 3 && length <= maxlazymatch && + length < MAX_SUPPORTED_DEFLATE_LENGTH) { + lazy = 1; + lazylength = length; + lazyoffset = offset; + continue; /*try the next byte*/ + } + if (lazy) { + lazy = 0; + if (pos == 0) + ERROR_BREAK(81); + if (length > lazylength + 1) { + /*push the previous character as literal*/ + if (!uivector_push_back(out, in[pos - 1])) + ERROR_BREAK(83 /*alloc fail*/); + } else { + length = lazylength; + offset = lazyoffset; + hash->head[hashval] = -1; /*the same hashchain update will be done, + this ensures no wrong alteration*/ + hash->headz[numzeros] = -1; /*idem*/ + --pos; + } + } + } + if (length >= 3 && offset > windowsize) + ERROR_BREAK(86 /*too big (or overflown negative) offset*/); + + /*encode it as length/distance pair or literal value*/ + if (length < 3) /*only lengths of 3 or higher are supported as + length/distance pair*/ + { + if (!uivector_push_back(out, in[pos])) + ERROR_BREAK(83 /*alloc fail*/); + } else if (length < minmatch || (length == 3 && offset > 4096)) { + /*compensate for the fact that longer offsets have more extra bits, + a length of only 3 may be not worth it then*/ + if (!uivector_push_back(out, in[pos])) + ERROR_BREAK(83 /*alloc fail*/); + } else { + addLengthDistance(out, length, offset); + for (i = 1; i < length; ++i) { + ++pos; + wpos = pos & (windowsize - 1); + hashval = getHash(in, insize, pos); + if (usezeros && hashval == 0) { + if (numzeros == 0) + numzeros = countZeros(in, insize, pos); + else if (pos + numzeros > insize || in[pos + numzeros - 1] != 0) + --numzeros; + } else { + numzeros = 0; + } + updateHashChain(hash, wpos, hashval, numzeros); + } + } + } /*end of the loop through each character of input*/ + + return error; +} + +/* /////////////////////////////////////////////////////////////////////////// + */ + +static unsigned deflateNoCompression(ucvector *out, const unsigned char *data, size_t datasize) { + /*non compressed deflate block data: 1 bit BFINAL,2 bits BTYPE,(5 bits): it + jumps to start of next byte, 2 bytes LEN, 2 bytes NLEN, LEN bytes literal + DATA*/ + + size_t i, numdeflateblocks = (datasize + 65534u) / 65535u; + unsigned datapos = 0; + for (i = 0; i != numdeflateblocks; ++i) { + unsigned BFINAL, BTYPE, LEN, NLEN; + unsigned char firstbyte; + size_t pos = out->size; + + BFINAL = (i == numdeflateblocks - 1); + BTYPE = 0; + + LEN = 65535; + if (datasize - datapos < 65535u) + LEN = (unsigned)datasize - datapos; + NLEN = 65535 - LEN; + + if (!ucvector_resize(out, out->size + LEN + 5)) + return 83; /*alloc fail*/ + + firstbyte = (unsigned char)(BFINAL + ((BTYPE & 1u) << 1u) + ((BTYPE & 2u) << 1u)); + out->data[pos + 0] = firstbyte; + out->data[pos + 1] = (unsigned char)(LEN & 255); + out->data[pos + 2] = (unsigned char)(LEN >> 8u); + out->data[pos + 3] = (unsigned char)(NLEN & 255); + out->data[pos + 4] = (unsigned char)(NLEN >> 8u); + lodepng_memcpy(out->data + pos + 5, data + datapos, LEN); + datapos += LEN; + } + + return 0; } /* -write the lz77-encoded data, which has lit, len and dist codes, to compressed stream using huffman trees. -tree_ll: the tree for lit and len codes. -tree_d: the tree for distance codes. +write the lz77-encoded data, which has lit, len and dist codes, to compressed +stream using huffman trees. tree_ll: the tree for lit and len codes. tree_d: the +tree for distance codes. */ -static void writeLZ77data(LodePNGBitWriter* writer, const uivector* lz77_encoded, - const HuffmanTree* tree_ll, const HuffmanTree* tree_d) { - size_t i = 0; - for(i = 0; i != lz77_encoded->size; ++i) { - unsigned val = lz77_encoded->data[i]; - writeBitsReversed(writer, tree_ll->codes[val], tree_ll->lengths[val]); - if(val > 256) /*for a length code, 3 more things have to be added*/ { - unsigned length_index = val - FIRST_LENGTH_CODE_INDEX; - unsigned n_length_extra_bits = LENGTHEXTRA[length_index]; - unsigned length_extra_bits = lz77_encoded->data[++i]; - - unsigned distance_code = lz77_encoded->data[++i]; - - unsigned distance_index = distance_code; - unsigned n_distance_extra_bits = DISTANCEEXTRA[distance_index]; - unsigned distance_extra_bits = lz77_encoded->data[++i]; - - writeBits(writer, length_extra_bits, n_length_extra_bits); - writeBitsReversed(writer, tree_d->codes[distance_code], tree_d->lengths[distance_code]); - writeBits(writer, distance_extra_bits, n_distance_extra_bits); - } - } -} - -/*Deflate for a block of type "dynamic", that is, with freely, optimally, created huffman trees*/ -static unsigned deflateDynamic(LodePNGBitWriter* writer, Hash* hash, - const unsigned char* data, size_t datapos, size_t dataend, - const LodePNGCompressSettings* settings, unsigned final) { - unsigned error = 0; - - /* - A block is compressed as follows: The PNG data is lz77 encoded, resulting in - literal bytes and length/distance pairs. This is then huffman compressed with - two huffman trees. One huffman tree is used for the lit and len values ("ll"), - another huffman tree is used for the dist values ("d"). These two trees are - stored using their code lengths, and to compress even more these code lengths - are also run-length encoded and huffman compressed. This gives a huffman tree - of code lengths "cl". The code lengths used to describe this third tree are - the code length code lengths ("clcl"). - */ - - /*The lz77 encoded data, represented with integers since there will also be length and distance codes in it*/ - uivector lz77_encoded; - HuffmanTree tree_ll; /*tree for lit,len values*/ - HuffmanTree tree_d; /*tree for distance codes*/ - HuffmanTree tree_cl; /*tree for encoding the code lengths representing tree_ll and tree_d*/ - unsigned* frequencies_ll = 0; /*frequency of lit,len codes*/ - unsigned* frequencies_d = 0; /*frequency of dist codes*/ - unsigned* frequencies_cl = 0; /*frequency of code length codes*/ - unsigned* bitlen_lld = 0; /*lit,len,dist code lengths (int bits), literally (without repeat codes).*/ - unsigned* bitlen_lld_e = 0; /*bitlen_lld encoded with repeat codes (this is a rudimentary run length compression)*/ - size_t datasize = dataend - datapos; - - /* - If we could call "bitlen_cl" the the code length code lengths ("clcl"), that is the bit lengths of codes to represent - tree_cl in CLCL_ORDER, then due to the huffman compression of huffman tree representations ("two levels"), there are - some analogies: - bitlen_lld is to tree_cl what data is to tree_ll and tree_d. - bitlen_lld_e is to bitlen_lld what lz77_encoded is to data. - bitlen_cl is to bitlen_lld_e what bitlen_lld is to lz77_encoded. - */ - - unsigned BFINAL = final; - size_t i; - size_t numcodes_ll, numcodes_d, numcodes_lld, numcodes_lld_e, numcodes_cl; - unsigned HLIT, HDIST, HCLEN; - - uivector_init(&lz77_encoded); - HuffmanTree_init(&tree_ll); - HuffmanTree_init(&tree_d); - HuffmanTree_init(&tree_cl); - /* could fit on stack, but >1KB is on the larger side so allocate instead */ - frequencies_ll = (unsigned*)lodepng_malloc(286 * sizeof(*frequencies_ll)); - frequencies_d = (unsigned*)lodepng_malloc(30 * sizeof(*frequencies_d)); - frequencies_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl)); - - if(!frequencies_ll || !frequencies_d || !frequencies_cl) error = 83; /*alloc fail*/ - - /*This while loop never loops due to a break at the end, it is here to - allow breaking out of it to the cleanup phase on error conditions.*/ - while(!error) { - lodepng_memset(frequencies_ll, 0, 286 * sizeof(*frequencies_ll)); - lodepng_memset(frequencies_d, 0, 30 * sizeof(*frequencies_d)); - lodepng_memset(frequencies_cl, 0, NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl)); - - if(settings->use_lz77) { - error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, - settings->minmatch, settings->nicematch, settings->lazymatching); - if(error) break; - } else { - if(!uivector_resize(&lz77_encoded, datasize)) ERROR_BREAK(83 /*alloc fail*/); - for(i = datapos; i < dataend; ++i) lz77_encoded.data[i - datapos] = data[i]; /*no LZ77, but still will be Huffman compressed*/ - } - - /*Count the frequencies of lit, len and dist codes*/ - for(i = 0; i != lz77_encoded.size; ++i) { - unsigned symbol = lz77_encoded.data[i]; - ++frequencies_ll[symbol]; - if(symbol > 256) { - unsigned dist = lz77_encoded.data[i + 2]; - ++frequencies_d[dist]; - i += 3; - } - } - frequencies_ll[256] = 1; /*there will be exactly 1 end code, at the end of the block*/ - - /*Make both huffman trees, one for the lit and len codes, one for the dist codes*/ - error = HuffmanTree_makeFromFrequencies(&tree_ll, frequencies_ll, 257, 286, 15); - if(error) break; - /*2, not 1, is chosen for mincodes: some buggy PNG decoders require at least 2 symbols in the dist tree*/ - error = HuffmanTree_makeFromFrequencies(&tree_d, frequencies_d, 2, 30, 15); - if(error) break; - - numcodes_ll = LODEPNG_MIN(tree_ll.numcodes, 286); - numcodes_d = LODEPNG_MIN(tree_d.numcodes, 30); - /*store the code lengths of both generated trees in bitlen_lld*/ - numcodes_lld = numcodes_ll + numcodes_d; - bitlen_lld = (unsigned*)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld)); - /*numcodes_lld_e never needs more size than bitlen_lld*/ - bitlen_lld_e = (unsigned*)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld_e)); - if(!bitlen_lld || !bitlen_lld_e) ERROR_BREAK(83); /*alloc fail*/ - numcodes_lld_e = 0; - - for(i = 0; i != numcodes_ll; ++i) bitlen_lld[i] = tree_ll.lengths[i]; - for(i = 0; i != numcodes_d; ++i) bitlen_lld[numcodes_ll + i] = tree_d.lengths[i]; - - /*run-length compress bitlen_ldd into bitlen_lld_e by using repeat codes 16 (copy length 3-6 times), - 17 (3-10 zeroes), 18 (11-138 zeroes)*/ - for(i = 0; i != numcodes_lld; ++i) { - unsigned j = 0; /*amount of repetitions*/ - while(i + j + 1 < numcodes_lld && bitlen_lld[i + j + 1] == bitlen_lld[i]) ++j; - - if(bitlen_lld[i] == 0 && j >= 2) /*repeat code for zeroes*/ { - ++j; /*include the first zero*/ - if(j <= 10) /*repeat code 17 supports max 10 zeroes*/ { - bitlen_lld_e[numcodes_lld_e++] = 17; - bitlen_lld_e[numcodes_lld_e++] = j - 3; - } else /*repeat code 18 supports max 138 zeroes*/ { - if(j > 138) j = 138; - bitlen_lld_e[numcodes_lld_e++] = 18; - bitlen_lld_e[numcodes_lld_e++] = j - 11; - } - i += (j - 1); - } else if(j >= 3) /*repeat code for value other than zero*/ { - size_t k; - unsigned num = j / 6u, rest = j % 6u; - bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i]; - for(k = 0; k < num; ++k) { - bitlen_lld_e[numcodes_lld_e++] = 16; - bitlen_lld_e[numcodes_lld_e++] = 6 - 3; - } - if(rest >= 3) { - bitlen_lld_e[numcodes_lld_e++] = 16; - bitlen_lld_e[numcodes_lld_e++] = rest - 3; - } - else j -= rest; - i += j; - } else /*too short to benefit from repeat code*/ { - bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i]; - } - } - - /*generate tree_cl, the huffmantree of huffmantrees*/ - for(i = 0; i != numcodes_lld_e; ++i) { - ++frequencies_cl[bitlen_lld_e[i]]; - /*after a repeat code come the bits that specify the number of repetitions, - those don't need to be in the frequencies_cl calculation*/ - if(bitlen_lld_e[i] >= 16) ++i; - } - - error = HuffmanTree_makeFromFrequencies(&tree_cl, frequencies_cl, - NUM_CODE_LENGTH_CODES, NUM_CODE_LENGTH_CODES, 7); - if(error) break; - - /*compute amount of code-length-code-lengths to output*/ - numcodes_cl = NUM_CODE_LENGTH_CODES; - /*trim zeros at the end (using CLCL_ORDER), but minimum size must be 4 (see HCLEN below)*/ - while(numcodes_cl > 4u && tree_cl.lengths[CLCL_ORDER[numcodes_cl - 1u]] == 0) { - numcodes_cl--; - } - - /* - Write everything into the output - - After the BFINAL and BTYPE, the dynamic block consists out of the following: - - 5 bits HLIT, 5 bits HDIST, 4 bits HCLEN - - (HCLEN+4)*3 bits code lengths of code length alphabet - - HLIT + 257 code lengths of lit/length alphabet (encoded using the code length - alphabet, + possible repetition codes 16, 17, 18) - - HDIST + 1 code lengths of distance alphabet (encoded using the code length - alphabet, + possible repetition codes 16, 17, 18) - - compressed data - - 256 (end code) - */ - - /*Write block type*/ - writeBits(writer, BFINAL, 1); - writeBits(writer, 0, 1); /*first bit of BTYPE "dynamic"*/ - writeBits(writer, 1, 1); /*second bit of BTYPE "dynamic"*/ - - /*write the HLIT, HDIST and HCLEN values*/ - /*all three sizes take trimmed ending zeroes into account, done either by HuffmanTree_makeFromFrequencies - or in the loop for numcodes_cl above, which saves space. */ - HLIT = (unsigned)(numcodes_ll - 257); - HDIST = (unsigned)(numcodes_d - 1); - HCLEN = (unsigned)(numcodes_cl - 4); - writeBits(writer, HLIT, 5); - writeBits(writer, HDIST, 5); - writeBits(writer, HCLEN, 4); - - /*write the code lengths of the code length alphabet ("bitlen_cl")*/ - for(i = 0; i != numcodes_cl; ++i) writeBits(writer, tree_cl.lengths[CLCL_ORDER[i]], 3); - - /*write the lengths of the lit/len AND the dist alphabet*/ - for(i = 0; i != numcodes_lld_e; ++i) { - writeBitsReversed(writer, tree_cl.codes[bitlen_lld_e[i]], tree_cl.lengths[bitlen_lld_e[i]]); - /*extra bits of repeat codes*/ - if(bitlen_lld_e[i] == 16) writeBits(writer, bitlen_lld_e[++i], 2); - else if(bitlen_lld_e[i] == 17) writeBits(writer, bitlen_lld_e[++i], 3); - else if(bitlen_lld_e[i] == 18) writeBits(writer, bitlen_lld_e[++i], 7); - } - - /*write the compressed data symbols*/ - writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d); - /*error: the length of the end code 256 must be larger than 0*/ - if(tree_ll.lengths[256] == 0) ERROR_BREAK(64); - - /*write the end code*/ - writeBitsReversed(writer, tree_ll.codes[256], tree_ll.lengths[256]); - - break; /*end of error-while*/ - } - - /*cleanup*/ - uivector_cleanup(&lz77_encoded); - HuffmanTree_cleanup(&tree_ll); - HuffmanTree_cleanup(&tree_d); - HuffmanTree_cleanup(&tree_cl); - lodepng_free(frequencies_ll); - lodepng_free(frequencies_d); - lodepng_free(frequencies_cl); - lodepng_free(bitlen_lld); - lodepng_free(bitlen_lld_e); - - return error; -} - -static unsigned deflateFixed(LodePNGBitWriter* writer, Hash* hash, - const unsigned char* data, - size_t datapos, size_t dataend, - const LodePNGCompressSettings* settings, unsigned final) { - HuffmanTree tree_ll; /*tree for literal values and length codes*/ - HuffmanTree tree_d; /*tree for distance codes*/ - - unsigned BFINAL = final; - unsigned error = 0; - size_t i; - - HuffmanTree_init(&tree_ll); - HuffmanTree_init(&tree_d); - - error = generateFixedLitLenTree(&tree_ll); - if(!error) error = generateFixedDistanceTree(&tree_d); - - if(!error) { - writeBits(writer, BFINAL, 1); - writeBits(writer, 1, 1); /*first bit of BTYPE*/ - writeBits(writer, 0, 1); /*second bit of BTYPE*/ - - if(settings->use_lz77) /*LZ77 encoded*/ { - uivector lz77_encoded; - uivector_init(&lz77_encoded); - error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, - settings->minmatch, settings->nicematch, settings->lazymatching); - if(!error) writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d); - uivector_cleanup(&lz77_encoded); - } else /*no LZ77, but still will be Huffman compressed*/ { - for(i = datapos; i < dataend; ++i) { - writeBitsReversed(writer, tree_ll.codes[data[i]], tree_ll.lengths[data[i]]); - } - } - /*add END code*/ - if(!error) writeBitsReversed(writer,tree_ll.codes[256], tree_ll.lengths[256]); - } - - /*cleanup*/ - HuffmanTree_cleanup(&tree_ll); - HuffmanTree_cleanup(&tree_d); - - return error; -} - -static unsigned lodepng_deflatev(ucvector* out, const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings) { - unsigned error = 0; - size_t i, blocksize, numdeflateblocks; - Hash hash; - LodePNGBitWriter writer; - - LodePNGBitWriter_init(&writer, out); - - if(settings->btype > 2) return 61; - else if(settings->btype == 0) return deflateNoCompression(out, in, insize); - else if(settings->btype == 1) blocksize = insize; - else /*if(settings->btype == 2)*/ { - /*on PNGs, deflate blocks of 65-262k seem to give most dense encoding*/ - blocksize = insize / 8u + 8; - if(blocksize < 65536) blocksize = 65536; - if(blocksize > 262144) blocksize = 262144; - } - - numdeflateblocks = (insize + blocksize - 1) / blocksize; - if(numdeflateblocks == 0) numdeflateblocks = 1; - - error = hash_init(&hash, settings->windowsize); - - if(!error) { - for(i = 0; i != numdeflateblocks && !error; ++i) { - unsigned final = (i == numdeflateblocks - 1); - size_t start = i * blocksize; - size_t end = start + blocksize; - if(end > insize) end = insize; - - if(settings->btype == 1) error = deflateFixed(&writer, &hash, in, start, end, settings, final); - else if(settings->btype == 2) error = deflateDynamic(&writer, &hash, in, start, end, settings, final); - } - } - - hash_cleanup(&hash); - - return error; -} - -unsigned lodepng_deflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings) { - ucvector v = ucvector_init(*out, *outsize); - unsigned error = lodepng_deflatev(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - return error; -} - -static unsigned deflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings) { - if(settings->custom_deflate) { - unsigned error = settings->custom_deflate(out, outsize, in, insize, settings); - /*the custom deflate is allowed to have its own error codes, however, we translate it to code 111*/ - return error ? 111 : 0; - } else { - return lodepng_deflate(out, outsize, in, insize, settings); - } +static void writeLZ77data(LodePNGBitWriter *writer, const uivector *lz77_encoded, + const HuffmanTree *tree_ll, const HuffmanTree *tree_d) { + size_t i = 0; + for (i = 0; i != lz77_encoded->size; ++i) { + unsigned val = lz77_encoded->data[i]; + writeBitsReversed(writer, tree_ll->codes[val], tree_ll->lengths[val]); + if (val > 256) /*for a length code, 3 more things have to be added*/ { + unsigned length_index = val - FIRST_LENGTH_CODE_INDEX; + unsigned n_length_extra_bits = LENGTHEXTRA[length_index]; + unsigned length_extra_bits = lz77_encoded->data[++i]; + + unsigned distance_code = lz77_encoded->data[++i]; + + unsigned distance_index = distance_code; + unsigned n_distance_extra_bits = DISTANCEEXTRA[distance_index]; + unsigned distance_extra_bits = lz77_encoded->data[++i]; + + writeBits(writer, length_extra_bits, n_length_extra_bits); + writeBitsReversed(writer, tree_d->codes[distance_code], tree_d->lengths[distance_code]); + writeBits(writer, distance_extra_bits, n_distance_extra_bits); + } + } +} + +/*Deflate for a block of type "dynamic", that is, with freely, optimally, + * created huffman trees*/ +static unsigned deflateDynamic(LodePNGBitWriter *writer, Hash *hash, const unsigned char *data, + size_t datapos, size_t dataend, const LodePNGCompressSettings *settings, unsigned final) { + unsigned error = 0; + + /* + A block is compressed as follows: The PNG data is lz77 encoded, resulting in + literal bytes and length/distance pairs. This is then huffman compressed + with two huffman trees. One huffman tree is used for the lit and len values + ("ll"), another huffman tree is used for the dist values ("d"). These two + trees are stored using their code lengths, and to compress even more these + code lengths are also run-length encoded and huffman compressed. This gives + a huffman tree of code lengths "cl". The code lengths used to describe this + third tree are the code length code lengths ("clcl"). + */ + + /*The lz77 encoded data, represented with integers since there will also be + * length and distance codes in it*/ + uivector lz77_encoded; + HuffmanTree tree_ll; /*tree for lit,len values*/ + HuffmanTree tree_d; /*tree for distance codes*/ + HuffmanTree tree_cl; /*tree for encoding the code lengths representing + tree_ll and tree_d*/ + unsigned *frequencies_ll = 0; /*frequency of lit,len codes*/ + unsigned *frequencies_d = 0; /*frequency of dist codes*/ + unsigned *frequencies_cl = 0; /*frequency of code length codes*/ + unsigned *bitlen_lld = 0; /*lit,len,dist code lengths (int bits), literally + (without repeat codes).*/ + unsigned *bitlen_lld_e = 0; /*bitlen_lld encoded with repeat codes (this is + a rudimentary run length compression)*/ + size_t datasize = dataend - datapos; + + /* + If we could call "bitlen_cl" the the code length code lengths ("clcl"), that + is the bit lengths of codes to represent tree_cl in CLCL_ORDER, then due to + the huffman compression of huffman tree representations ("two levels"), + there are some analogies: bitlen_lld is to tree_cl what data is to tree_ll + and tree_d. bitlen_lld_e is to bitlen_lld what lz77_encoded is to data. + bitlen_cl is to bitlen_lld_e what bitlen_lld is to lz77_encoded. + */ + + unsigned BFINAL = final; + size_t i; + size_t numcodes_ll, numcodes_d, numcodes_lld, numcodes_lld_e, numcodes_cl; + unsigned HLIT, HDIST, HCLEN; + + uivector_init(&lz77_encoded); + HuffmanTree_init(&tree_ll); + HuffmanTree_init(&tree_d); + HuffmanTree_init(&tree_cl); + /* could fit on stack, but >1KB is on the larger side so allocate instead */ + frequencies_ll = (unsigned *)lodepng_malloc(286 * sizeof(*frequencies_ll)); + frequencies_d = (unsigned *)lodepng_malloc(30 * sizeof(*frequencies_d)); + frequencies_cl = (unsigned *)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl)); + + if (!frequencies_ll || !frequencies_d || !frequencies_cl) + error = 83; /*alloc fail*/ + + /*This while loop never loops due to a break at the end, it is here to + allow breaking out of it to the cleanup phase on error conditions.*/ + while (!error) { + lodepng_memset(frequencies_ll, 0, 286 * sizeof(*frequencies_ll)); + lodepng_memset(frequencies_d, 0, 30 * sizeof(*frequencies_d)); + lodepng_memset(frequencies_cl, 0, NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl)); + + if (settings->use_lz77) { + error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, + settings->minmatch, settings->nicematch, settings->lazymatching); + if (error) + break; + } else { + if (!uivector_resize(&lz77_encoded, datasize)) + ERROR_BREAK(83 /*alloc fail*/); + for (i = datapos; i < dataend; ++i) + lz77_encoded.data[i - datapos] = + data[i]; /*no LZ77, but still will be Huffman compressed*/ + } + + /*Count the frequencies of lit, len and dist codes*/ + for (i = 0; i != lz77_encoded.size; ++i) { + unsigned symbol = lz77_encoded.data[i]; + ++frequencies_ll[symbol]; + if (symbol > 256) { + unsigned dist = lz77_encoded.data[i + 2]; + ++frequencies_d[dist]; + i += 3; + } + } + frequencies_ll[256] = 1; /*there will be exactly 1 end code, at the end of the block*/ + + /*Make both huffman trees, one for the lit and len codes, one for the + * dist codes*/ + error = HuffmanTree_makeFromFrequencies(&tree_ll, frequencies_ll, 257, 286, 15); + if (error) + break; + /*2, not 1, is chosen for mincodes: some buggy PNG decoders require at + * least 2 symbols in the dist tree*/ + error = HuffmanTree_makeFromFrequencies(&tree_d, frequencies_d, 2, 30, 15); + if (error) + break; + + numcodes_ll = LODEPNG_MIN(tree_ll.numcodes, 286); + numcodes_d = LODEPNG_MIN(tree_d.numcodes, 30); + /*store the code lengths of both generated trees in bitlen_lld*/ + numcodes_lld = numcodes_ll + numcodes_d; + bitlen_lld = (unsigned *)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld)); + /*numcodes_lld_e never needs more size than bitlen_lld*/ + bitlen_lld_e = (unsigned *)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld_e)); + if (!bitlen_lld || !bitlen_lld_e) + ERROR_BREAK(83); /*alloc fail*/ + numcodes_lld_e = 0; + + for (i = 0; i != numcodes_ll; ++i) + bitlen_lld[i] = tree_ll.lengths[i]; + for (i = 0; i != numcodes_d; ++i) + bitlen_lld[numcodes_ll + i] = tree_d.lengths[i]; + + /*run-length compress bitlen_ldd into bitlen_lld_e by using repeat codes + 16 (copy length 3-6 times), 17 (3-10 zeroes), 18 (11-138 zeroes)*/ + for (i = 0; i != numcodes_lld; ++i) { + unsigned j = 0; /*amount of repetitions*/ + while (i + j + 1 < numcodes_lld && bitlen_lld[i + j + 1] == bitlen_lld[i]) + ++j; + + if (bitlen_lld[i] == 0 && j >= 2) /*repeat code for zeroes*/ { + ++j; /*include the first zero*/ + if (j <= 10) /*repeat code 17 supports max 10 zeroes*/ { + bitlen_lld_e[numcodes_lld_e++] = 17; + bitlen_lld_e[numcodes_lld_e++] = j - 3; + } else /*repeat code 18 supports max 138 zeroes*/ { + if (j > 138) + j = 138; + bitlen_lld_e[numcodes_lld_e++] = 18; + bitlen_lld_e[numcodes_lld_e++] = j - 11; + } + i += (j - 1); + } else if (j >= 3) /*repeat code for value other than zero*/ { + size_t k; + unsigned num = j / 6u, rest = j % 6u; + bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i]; + for (k = 0; k < num; ++k) { + bitlen_lld_e[numcodes_lld_e++] = 16; + bitlen_lld_e[numcodes_lld_e++] = 6 - 3; + } + if (rest >= 3) { + bitlen_lld_e[numcodes_lld_e++] = 16; + bitlen_lld_e[numcodes_lld_e++] = rest - 3; + } else + j -= rest; + i += j; + } else /*too short to benefit from repeat code*/ { + bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i]; + } + } + + /*generate tree_cl, the huffmantree of huffmantrees*/ + for (i = 0; i != numcodes_lld_e; ++i) { + ++frequencies_cl[bitlen_lld_e[i]]; + /*after a repeat code come the bits that specify the number of + repetitions, those don't need to be in the frequencies_cl + calculation*/ + if (bitlen_lld_e[i] >= 16) + ++i; + } + + error = HuffmanTree_makeFromFrequencies( + &tree_cl, frequencies_cl, NUM_CODE_LENGTH_CODES, NUM_CODE_LENGTH_CODES, 7); + if (error) + break; + + /*compute amount of code-length-code-lengths to output*/ + numcodes_cl = NUM_CODE_LENGTH_CODES; + /*trim zeros at the end (using CLCL_ORDER), but minimum size must be 4 + * (see HCLEN below)*/ + while (numcodes_cl > 4u && tree_cl.lengths[CLCL_ORDER[numcodes_cl - 1u]] == 0) { + numcodes_cl--; + } + + /* + Write everything into the output + + After the BFINAL and BTYPE, the dynamic block consists out of the + following: + - 5 bits HLIT, 5 bits HDIST, 4 bits HCLEN + - (HCLEN+4)*3 bits code lengths of code length alphabet + - HLIT + 257 code lengths of lit/length alphabet (encoded using the code + length alphabet, + possible repetition codes 16, 17, 18) + - HDIST + 1 code lengths of distance alphabet (encoded using the code + length alphabet, + possible repetition codes 16, 17, 18) + - compressed data + - 256 (end code) + */ + + /*Write block type*/ + writeBits(writer, BFINAL, 1); + writeBits(writer, 0, 1); /*first bit of BTYPE "dynamic"*/ + writeBits(writer, 1, 1); /*second bit of BTYPE "dynamic"*/ + + /*write the HLIT, HDIST and HCLEN values*/ + /*all three sizes take trimmed ending zeroes into account, done either + by HuffmanTree_makeFromFrequencies or in the loop for numcodes_cl above, + which saves space. */ + HLIT = (unsigned)(numcodes_ll - 257); + HDIST = (unsigned)(numcodes_d - 1); + HCLEN = (unsigned)(numcodes_cl - 4); + writeBits(writer, HLIT, 5); + writeBits(writer, HDIST, 5); + writeBits(writer, HCLEN, 4); + + /*write the code lengths of the code length alphabet ("bitlen_cl")*/ + for (i = 0; i != numcodes_cl; ++i) + writeBits(writer, tree_cl.lengths[CLCL_ORDER[i]], 3); + + /*write the lengths of the lit/len AND the dist alphabet*/ + for (i = 0; i != numcodes_lld_e; ++i) { + writeBitsReversed( + writer, tree_cl.codes[bitlen_lld_e[i]], tree_cl.lengths[bitlen_lld_e[i]]); + /*extra bits of repeat codes*/ + if (bitlen_lld_e[i] == 16) + writeBits(writer, bitlen_lld_e[++i], 2); + else if (bitlen_lld_e[i] == 17) + writeBits(writer, bitlen_lld_e[++i], 3); + else if (bitlen_lld_e[i] == 18) + writeBits(writer, bitlen_lld_e[++i], 7); + } + + /*write the compressed data symbols*/ + writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d); + /*error: the length of the end code 256 must be larger than 0*/ + if (tree_ll.lengths[256] == 0) + ERROR_BREAK(64); + + /*write the end code*/ + writeBitsReversed(writer, tree_ll.codes[256], tree_ll.lengths[256]); + + break; /*end of error-while*/ + } + + /*cleanup*/ + uivector_cleanup(&lz77_encoded); + HuffmanTree_cleanup(&tree_ll); + HuffmanTree_cleanup(&tree_d); + HuffmanTree_cleanup(&tree_cl); + lodepng_free(frequencies_ll); + lodepng_free(frequencies_d); + lodepng_free(frequencies_cl); + lodepng_free(bitlen_lld); + lodepng_free(bitlen_lld_e); + + return error; +} + +static unsigned deflateFixed(LodePNGBitWriter *writer, Hash *hash, const unsigned char *data, + size_t datapos, size_t dataend, const LodePNGCompressSettings *settings, unsigned final) { + HuffmanTree tree_ll; /*tree for literal values and length codes*/ + HuffmanTree tree_d; /*tree for distance codes*/ + + unsigned BFINAL = final; + unsigned error = 0; + size_t i; + + HuffmanTree_init(&tree_ll); + HuffmanTree_init(&tree_d); + + error = generateFixedLitLenTree(&tree_ll); + if (!error) + error = generateFixedDistanceTree(&tree_d); + + if (!error) { + writeBits(writer, BFINAL, 1); + writeBits(writer, 1, 1); /*first bit of BTYPE*/ + writeBits(writer, 0, 1); /*second bit of BTYPE*/ + + if (settings->use_lz77) /*LZ77 encoded*/ { + uivector lz77_encoded; + uivector_init(&lz77_encoded); + error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize, + settings->minmatch, settings->nicematch, settings->lazymatching); + if (!error) + writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d); + uivector_cleanup(&lz77_encoded); + } else /*no LZ77, but still will be Huffman compressed*/ { + for (i = datapos; i < dataend; ++i) { + writeBitsReversed(writer, tree_ll.codes[data[i]], tree_ll.lengths[data[i]]); + } + } + /*add END code*/ + if (!error) + writeBitsReversed(writer, tree_ll.codes[256], tree_ll.lengths[256]); + } + + /*cleanup*/ + HuffmanTree_cleanup(&tree_ll); + HuffmanTree_cleanup(&tree_d); + + return error; +} + +static unsigned lodepng_deflatev(ucvector *out, const unsigned char *in, size_t insize, + const LodePNGCompressSettings *settings) { + unsigned error = 0; + size_t i, blocksize, numdeflateblocks; + Hash hash; + LodePNGBitWriter writer; + + LodePNGBitWriter_init(&writer, out); + + if (settings->btype > 2) + return 61; + else if (settings->btype == 0) + return deflateNoCompression(out, in, insize); + else if (settings->btype == 1) + blocksize = insize; + else /*if(settings->btype == 2)*/ { + /*on PNGs, deflate blocks of 65-262k seem to give most dense encoding*/ + blocksize = insize / 8u + 8; + if (blocksize < 65536) + blocksize = 65536; + if (blocksize > 262144) + blocksize = 262144; + } + + numdeflateblocks = (insize + blocksize - 1) / blocksize; + if (numdeflateblocks == 0) + numdeflateblocks = 1; + + error = hash_init(&hash, settings->windowsize); + + if (!error) { + for (i = 0; i != numdeflateblocks && !error; ++i) { + unsigned final = (i == numdeflateblocks - 1); + size_t start = i * blocksize; + size_t end = start + blocksize; + if (end > insize) + end = insize; + + if (settings->btype == 1) + error = deflateFixed(&writer, &hash, in, start, end, settings, final); + else if (settings->btype == 2) + error = deflateDynamic(&writer, &hash, in, start, end, settings, final); + } + } + + hash_cleanup(&hash); + + return error; +} + +unsigned lodepng_deflate(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGCompressSettings *settings) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_deflatev(&v, in, insize, settings); + *out = v.data; + *outsize = v.size; + return error; +} + +static unsigned deflate(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGCompressSettings *settings) { + if (settings->custom_deflate) { + unsigned error = settings->custom_deflate(out, outsize, in, insize, settings); + /*the custom deflate is allowed to have its own error codes, however, we + * translate it to code 111*/ + return error ? 111 : 0; + } else { + return lodepng_deflate(out, outsize, in, insize, settings); + } } #endif /*LODEPNG_COMPILE_DECODER*/ @@ -2134,29 +2426,30 @@ static unsigned deflate(unsigned char** out, size_t* outsize, /* / Adler32 / */ /* ////////////////////////////////////////////////////////////////////////// */ -static unsigned update_adler32(unsigned adler, const unsigned char* data, unsigned len) { - unsigned s1 = adler & 0xffffu; - unsigned s2 = (adler >> 16u) & 0xffffu; - - while(len != 0u) { - unsigned i; - /*at least 5552 sums can be done before the sums overflow, saving a lot of module divisions*/ - unsigned amount = len > 5552u ? 5552u : len; - len -= amount; - for(i = 0; i != amount; ++i) { - s1 += (*data++); - s2 += s1; - } - s1 %= 65521u; - s2 %= 65521u; - } +static unsigned update_adler32(unsigned adler, const unsigned char *data, unsigned len) { + unsigned s1 = adler & 0xffffu; + unsigned s2 = (adler >> 16u) & 0xffffu; - return (s2 << 16u) | s1; + while (len != 0u) { + unsigned i; + /*at least 5552 sums can be done before the sums overflow, saving a lot + * of module divisions*/ + unsigned amount = len > 5552u ? 5552u : len; + len -= amount; + for (i = 0; i != amount; ++i) { + s1 += (*data++); + s2 += s1; + } + s1 %= 65521u; + s2 %= 65521u; + } + + return (s2 << 16u) | s1; } /*Return the adler32 of the bytes data[0..len-1]*/ -static unsigned adler32(const unsigned char* data, unsigned len) { - return update_adler32(1u, data, len); +static unsigned adler32(const unsigned char *data, unsigned len) { + return update_adler32(1u, data, len); } /* ////////////////////////////////////////////////////////////////////////// */ @@ -2165,134 +2458,147 @@ static unsigned adler32(const unsigned char* data, unsigned len) { #ifdef LODEPNG_COMPILE_DECODER -static unsigned lodepng_zlib_decompressv(ucvector* out, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings) { - unsigned error = 0; - unsigned CM, CINFO, FDICT; - - if(insize < 2) return 53; /*error, size of zlib data too small*/ - /*read information from zlib header*/ - if((in[0] * 256 + in[1]) % 31 != 0) { - /*error: 256 * in[0] + in[1] must be a multiple of 31, the FCHECK value is supposed to be made that way*/ - return 24; - } - - CM = in[0] & 15; - CINFO = (in[0] >> 4) & 15; - /*FCHECK = in[1] & 31;*/ /*FCHECK is already tested above*/ - FDICT = (in[1] >> 5) & 1; - /*FLEVEL = (in[1] >> 6) & 3;*/ /*FLEVEL is not used here*/ - - if(CM != 8 || CINFO > 7) { - /*error: only compression method 8: inflate with sliding window of 32k is supported by the PNG spec*/ - return 25; - } - if(FDICT != 0) { - /*error: the specification of PNG says about the zlib stream: - "The additional flags shall not specify a preset dictionary."*/ - return 26; - } - - error = inflatev(out, in + 2, insize - 2, settings); - if(error) return error; - - if(!settings->ignore_adler32) { - unsigned ADLER32 = lodepng_read32bitInt(&in[insize - 4]); - unsigned checksum = adler32(out->data, (unsigned)(out->size)); - if(checksum != ADLER32) return 58; /*error, adler checksum not correct, data must be corrupted*/ - } - - return 0; /*no error*/ -} - - -unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGDecompressSettings* settings) { - ucvector v = ucvector_init(*out, *outsize); - unsigned error = lodepng_zlib_decompressv(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - return error; -} - -/*expected_size is expected output size, to avoid intermediate allocations. Set to 0 if not known. */ -static unsigned zlib_decompress(unsigned char** out, size_t* outsize, size_t expected_size, - const unsigned char* in, size_t insize, const LodePNGDecompressSettings* settings) { - unsigned error; - if(settings->custom_zlib) { - error = settings->custom_zlib(out, outsize, in, insize, settings); - if(error) { - /*the custom zlib is allowed to have its own error codes, however, we translate it to code 110*/ - error = 110; - /*if there's a max output size, and the custom zlib returned error, then indicate that error instead*/ - if(settings->max_output_size && *outsize > settings->max_output_size) error = 109; - } - } else { - ucvector v = ucvector_init(*out, *outsize); - if(expected_size) { - /*reserve the memory to avoid intermediate reallocations*/ - ucvector_resize(&v, *outsize + expected_size); - v.size = *outsize; - } - error = lodepng_zlib_decompressv(&v, in, insize, settings); - *out = v.data; - *outsize = v.size; - } - return error; +static unsigned lodepng_zlib_decompressv(ucvector *out, const unsigned char *in, size_t insize, + const LodePNGDecompressSettings *settings) { + unsigned error = 0; + unsigned CM, CINFO, FDICT; + + if (insize < 2) + return 53; /*error, size of zlib data too small*/ + /*read information from zlib header*/ + if ((in[0] * 256 + in[1]) % 31 != 0) { + /*error: 256 * in[0] + in[1] must be a multiple of 31, the FCHECK value + * is supposed to be made that way*/ + return 24; + } + + CM = in[0] & 15; + CINFO = (in[0] >> 4) & 15; + /*FCHECK = in[1] & 31;*/ /*FCHECK is already tested above*/ + FDICT = (in[1] >> 5) & 1; + /*FLEVEL = (in[1] >> 6) & 3;*/ /*FLEVEL is not used here*/ + + if (CM != 8 || CINFO > 7) { + /*error: only compression method 8: inflate with sliding window of 32k + * is supported by the PNG spec*/ + return 25; + } + if (FDICT != 0) { + /*error: the specification of PNG says about the zlib stream: + "The additional flags shall not specify a preset dictionary."*/ + return 26; + } + + error = inflatev(out, in + 2, insize - 2, settings); + if (error) + return error; + + if (!settings->ignore_adler32) { + unsigned ADLER32 = lodepng_read32bitInt(&in[insize - 4]); + unsigned checksum = adler32(out->data, (unsigned)(out->size)); + if (checksum != ADLER32) + return 58; /*error, adler checksum not correct, data must be + corrupted*/ + } + + return 0; /*no error*/ +} + +unsigned lodepng_zlib_decompress(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGDecompressSettings *settings) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_zlib_decompressv(&v, in, insize, settings); + *out = v.data; + *outsize = v.size; + return error; +} + +/*expected_size is expected output size, to avoid intermediate allocations. Set + * to 0 if not known. */ +static unsigned zlib_decompress(unsigned char **out, size_t *outsize, size_t expected_size, + const unsigned char *in, size_t insize, const LodePNGDecompressSettings *settings) { + unsigned error; + if (settings->custom_zlib) { + error = settings->custom_zlib(out, outsize, in, insize, settings); + if (error) { + /*the custom zlib is allowed to have its own error codes, however, + * we translate it to code 110*/ + error = 110; + /*if there's a max output size, and the custom zlib returned error, + * then indicate that error instead*/ + if (settings->max_output_size && *outsize > settings->max_output_size) + error = 109; + } + } else { + ucvector v = ucvector_init(*out, *outsize); + if (expected_size) { + /*reserve the memory to avoid intermediate reallocations*/ + ucvector_resize(&v, *outsize + expected_size); + v.size = *outsize; + } + error = lodepng_zlib_decompressv(&v, in, insize, settings); + *out = v.data; + *outsize = v.size; + } + return error; } #endif /*LODEPNG_COMPILE_DECODER*/ #ifdef LODEPNG_COMPILE_ENCODER -unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGCompressSettings* settings) { - size_t i; - unsigned error; - unsigned char* deflatedata = 0; - size_t deflatesize = 0; - - error = deflate(&deflatedata, &deflatesize, in, insize, settings); - - *out = NULL; - *outsize = 0; - if(!error) { - *outsize = deflatesize + 6; - *out = (unsigned char*)lodepng_malloc(*outsize); - if(!*out) error = 83; /*alloc fail*/ - } - - if(!error) { - unsigned ADLER32 = adler32(in, (unsigned)insize); - /*zlib data: 1 byte CMF (CM+CINFO), 1 byte FLG, deflate data, 4 byte ADLER32 checksum of the Decompressed data*/ - unsigned CMF = 120; /*0b01111000: CM 8, CINFO 7. With CINFO 7, any window size up to 32768 can be used.*/ - unsigned FLEVEL = 0; - unsigned FDICT = 0; - unsigned CMFFLG = 256 * CMF + FDICT * 32 + FLEVEL * 64; - unsigned FCHECK = 31 - CMFFLG % 31; - CMFFLG += FCHECK; - - (*out)[0] = (unsigned char)(CMFFLG >> 8); - (*out)[1] = (unsigned char)(CMFFLG & 255); - for(i = 0; i != deflatesize; ++i) (*out)[i + 2] = deflatedata[i]; - lodepng_set32bitInt(&(*out)[*outsize - 4], ADLER32); - } - - lodepng_free(deflatedata); - return error; +unsigned lodepng_zlib_compress(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGCompressSettings *settings) { + size_t i; + unsigned error; + unsigned char *deflatedata = 0; + size_t deflatesize = 0; + + error = deflate(&deflatedata, &deflatesize, in, insize, settings); + + *out = NULL; + *outsize = 0; + if (!error) { + *outsize = deflatesize + 6; + *out = (unsigned char *)lodepng_malloc(*outsize); + if (!*out) + error = 83; /*alloc fail*/ + } + + if (!error) { + unsigned ADLER32 = adler32(in, (unsigned)insize); + /*zlib data: 1 byte CMF (CM+CINFO), 1 byte FLG, deflate data, 4 byte + * ADLER32 checksum of the Decompressed data*/ + unsigned CMF = 120; /*0b01111000: CM 8, CINFO 7. With CINFO 7, any + window size up to 32768 can be used.*/ + unsigned FLEVEL = 0; + unsigned FDICT = 0; + unsigned CMFFLG = 256 * CMF + FDICT * 32 + FLEVEL * 64; + unsigned FCHECK = 31 - CMFFLG % 31; + CMFFLG += FCHECK; + + (*out)[0] = (unsigned char)(CMFFLG >> 8); + (*out)[1] = (unsigned char)(CMFFLG & 255); + for (i = 0; i != deflatesize; ++i) + (*out)[i + 2] = deflatedata[i]; + lodepng_set32bitInt(&(*out)[*outsize - 4], ADLER32); + } + + lodepng_free(deflatedata); + return error; } /* compress using the default or custom zlib function */ -static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGCompressSettings* settings) { - if(settings->custom_zlib) { - unsigned error = settings->custom_zlib(out, outsize, in, insize, settings); - /*the custom zlib is allowed to have its own error codes, however, we translate it to code 111*/ - return error ? 111 : 0; - } else { - return lodepng_zlib_compress(out, outsize, in, insize, settings); - } +static unsigned zlib_compress(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGCompressSettings *settings) { + if (settings->custom_zlib) { + unsigned error = settings->custom_zlib(out, outsize, in, insize, settings); + /*the custom zlib is allowed to have its own error codes, however, we + * translate it to code 111*/ + return error ? 111 : 0; + } else { + return lodepng_zlib_compress(out, outsize, in, insize, settings); + } } #endif /*LODEPNG_COMPILE_ENCODER*/ @@ -2300,18 +2606,20 @@ static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsign #else /*no LODEPNG_COMPILE_ZLIB*/ #ifdef LODEPNG_COMPILE_DECODER -static unsigned zlib_decompress(unsigned char** out, size_t* outsize, size_t expected_size, - const unsigned char* in, size_t insize, const LodePNGDecompressSettings* settings) { - if(!settings->custom_zlib) return 87; /*no custom zlib function provided */ - (void)expected_size; - return settings->custom_zlib(out, outsize, in, insize, settings); +static unsigned zlib_decompress(unsigned char **out, size_t *outsize, size_t expected_size, + const unsigned char *in, size_t insize, const LodePNGDecompressSettings *settings) { + if (!settings->custom_zlib) + return 87; /*no custom zlib function provided */ + (void)expected_size; + return settings->custom_zlib(out, outsize, in, insize, settings); } #endif /*LODEPNG_COMPILE_DECODER*/ #ifdef LODEPNG_COMPILE_ENCODER -static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in, - size_t insize, const LodePNGCompressSettings* settings) { - if(!settings->custom_zlib) return 87; /*no custom zlib function provided */ - return settings->custom_zlib(out, outsize, in, insize, settings); +static unsigned zlib_compress(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGCompressSettings *settings) { + if (!settings->custom_zlib) + return 87; /*no custom zlib function provided */ + return settings->custom_zlib(out, outsize, in, insize, settings); } #endif /*LODEPNG_COMPILE_ENCODER*/ @@ -2324,35 +2632,36 @@ static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsign /*this is a good tradeoff between speed and compression ratio*/ #define DEFAULT_WINDOWSIZE 2048 -void lodepng_compress_settings_init(LodePNGCompressSettings* settings) { - /*compress with dynamic huffman tree (not in the mathematical sense, just not the predefined one)*/ - settings->btype = 2; - settings->use_lz77 = 1; - settings->windowsize = DEFAULT_WINDOWSIZE; - settings->minmatch = 3; - settings->nicematch = 128; - settings->lazymatching = 1; +void lodepng_compress_settings_init(LodePNGCompressSettings *settings) { + /*compress with dynamic huffman tree (not in the mathematical sense, just + * not the predefined one)*/ + settings->btype = 2; + settings->use_lz77 = 1; + settings->windowsize = DEFAULT_WINDOWSIZE; + settings->minmatch = 3; + settings->nicematch = 128; + settings->lazymatching = 1; - settings->custom_zlib = 0; - settings->custom_deflate = 0; - settings->custom_context = 0; + settings->custom_zlib = 0; + settings->custom_deflate = 0; + settings->custom_context = 0; } -const LodePNGCompressSettings lodepng_default_compress_settings = {2, 1, DEFAULT_WINDOWSIZE, 3, 128, 1, 0, 0, 0}; - +const LodePNGCompressSettings lodepng_default_compress_settings = { + 2, 1, DEFAULT_WINDOWSIZE, 3, 128, 1, 0, 0, 0}; #endif /*LODEPNG_COMPILE_ENCODER*/ #ifdef LODEPNG_COMPILE_DECODER -void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings) { - settings->ignore_adler32 = 0; - settings->ignore_nlen = 0; - settings->max_output_size = 0; +void lodepng_decompress_settings_init(LodePNGDecompressSettings *settings) { + settings->ignore_adler32 = 0; + settings->ignore_nlen = 0; + settings->max_output_size = 0; - settings->custom_zlib = 0; - settings->custom_inflate = 0; - settings->custom_context = 0; + settings->custom_zlib = 0; + settings->custom_inflate = 0; + settings->custom_context = 0; } const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, 0, 0, 0, 0, 0}; @@ -2371,1572 +2680,1745 @@ const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, 0, 0, /* / CRC32 / */ /* ////////////////////////////////////////////////////////////////////////// */ - #ifdef LODEPNG_COMPILE_CRC -static const unsigned lodepng_crc32_table0[256] = { - 0x00000000u, 0x77073096u, 0xee0e612cu, 0x990951bau, 0x076dc419u, 0x706af48fu, 0xe963a535u, 0x9e6495a3u, - 0x0edb8832u, 0x79dcb8a4u, 0xe0d5e91eu, 0x97d2d988u, 0x09b64c2bu, 0x7eb17cbdu, 0xe7b82d07u, 0x90bf1d91u, - 0x1db71064u, 0x6ab020f2u, 0xf3b97148u, 0x84be41deu, 0x1adad47du, 0x6ddde4ebu, 0xf4d4b551u, 0x83d385c7u, - 0x136c9856u, 0x646ba8c0u, 0xfd62f97au, 0x8a65c9ecu, 0x14015c4fu, 0x63066cd9u, 0xfa0f3d63u, 0x8d080df5u, - 0x3b6e20c8u, 0x4c69105eu, 0xd56041e4u, 0xa2677172u, 0x3c03e4d1u, 0x4b04d447u, 0xd20d85fdu, 0xa50ab56bu, - 0x35b5a8fau, 0x42b2986cu, 0xdbbbc9d6u, 0xacbcf940u, 0x32d86ce3u, 0x45df5c75u, 0xdcd60dcfu, 0xabd13d59u, - 0x26d930acu, 0x51de003au, 0xc8d75180u, 0xbfd06116u, 0x21b4f4b5u, 0x56b3c423u, 0xcfba9599u, 0xb8bda50fu, - 0x2802b89eu, 0x5f058808u, 0xc60cd9b2u, 0xb10be924u, 0x2f6f7c87u, 0x58684c11u, 0xc1611dabu, 0xb6662d3du, - 0x76dc4190u, 0x01db7106u, 0x98d220bcu, 0xefd5102au, 0x71b18589u, 0x06b6b51fu, 0x9fbfe4a5u, 0xe8b8d433u, - 0x7807c9a2u, 0x0f00f934u, 0x9609a88eu, 0xe10e9818u, 0x7f6a0dbbu, 0x086d3d2du, 0x91646c97u, 0xe6635c01u, - 0x6b6b51f4u, 0x1c6c6162u, 0x856530d8u, 0xf262004eu, 0x6c0695edu, 0x1b01a57bu, 0x8208f4c1u, 0xf50fc457u, - 0x65b0d9c6u, 0x12b7e950u, 0x8bbeb8eau, 0xfcb9887cu, 0x62dd1ddfu, 0x15da2d49u, 0x8cd37cf3u, 0xfbd44c65u, - 0x4db26158u, 0x3ab551ceu, 0xa3bc0074u, 0xd4bb30e2u, 0x4adfa541u, 0x3dd895d7u, 0xa4d1c46du, 0xd3d6f4fbu, - 0x4369e96au, 0x346ed9fcu, 0xad678846u, 0xda60b8d0u, 0x44042d73u, 0x33031de5u, 0xaa0a4c5fu, 0xdd0d7cc9u, - 0x5005713cu, 0x270241aau, 0xbe0b1010u, 0xc90c2086u, 0x5768b525u, 0x206f85b3u, 0xb966d409u, 0xce61e49fu, - 0x5edef90eu, 0x29d9c998u, 0xb0d09822u, 0xc7d7a8b4u, 0x59b33d17u, 0x2eb40d81u, 0xb7bd5c3bu, 0xc0ba6cadu, - 0xedb88320u, 0x9abfb3b6u, 0x03b6e20cu, 0x74b1d29au, 0xead54739u, 0x9dd277afu, 0x04db2615u, 0x73dc1683u, - 0xe3630b12u, 0x94643b84u, 0x0d6d6a3eu, 0x7a6a5aa8u, 0xe40ecf0bu, 0x9309ff9du, 0x0a00ae27u, 0x7d079eb1u, - 0xf00f9344u, 0x8708a3d2u, 0x1e01f268u, 0x6906c2feu, 0xf762575du, 0x806567cbu, 0x196c3671u, 0x6e6b06e7u, - 0xfed41b76u, 0x89d32be0u, 0x10da7a5au, 0x67dd4accu, 0xf9b9df6fu, 0x8ebeeff9u, 0x17b7be43u, 0x60b08ed5u, - 0xd6d6a3e8u, 0xa1d1937eu, 0x38d8c2c4u, 0x4fdff252u, 0xd1bb67f1u, 0xa6bc5767u, 0x3fb506ddu, 0x48b2364bu, - 0xd80d2bdau, 0xaf0a1b4cu, 0x36034af6u, 0x41047a60u, 0xdf60efc3u, 0xa867df55u, 0x316e8eefu, 0x4669be79u, - 0xcb61b38cu, 0xbc66831au, 0x256fd2a0u, 0x5268e236u, 0xcc0c7795u, 0xbb0b4703u, 0x220216b9u, 0x5505262fu, - 0xc5ba3bbeu, 0xb2bd0b28u, 0x2bb45a92u, 0x5cb36a04u, 0xc2d7ffa7u, 0xb5d0cf31u, 0x2cd99e8bu, 0x5bdeae1du, - 0x9b64c2b0u, 0xec63f226u, 0x756aa39cu, 0x026d930au, 0x9c0906a9u, 0xeb0e363fu, 0x72076785u, 0x05005713u, - 0x95bf4a82u, 0xe2b87a14u, 0x7bb12baeu, 0x0cb61b38u, 0x92d28e9bu, 0xe5d5be0du, 0x7cdcefb7u, 0x0bdbdf21u, - 0x86d3d2d4u, 0xf1d4e242u, 0x68ddb3f8u, 0x1fda836eu, 0x81be16cdu, 0xf6b9265bu, 0x6fb077e1u, 0x18b74777u, - 0x88085ae6u, 0xff0f6a70u, 0x66063bcau, 0x11010b5cu, 0x8f659effu, 0xf862ae69u, 0x616bffd3u, 0x166ccf45u, - 0xa00ae278u, 0xd70dd2eeu, 0x4e048354u, 0x3903b3c2u, 0xa7672661u, 0xd06016f7u, 0x4969474du, 0x3e6e77dbu, - 0xaed16a4au, 0xd9d65adcu, 0x40df0b66u, 0x37d83bf0u, 0xa9bcae53u, 0xdebb9ec5u, 0x47b2cf7fu, 0x30b5ffe9u, - 0xbdbdf21cu, 0xcabac28au, 0x53b39330u, 0x24b4a3a6u, 0xbad03605u, 0xcdd70693u, 0x54de5729u, 0x23d967bfu, - 0xb3667a2eu, 0xc4614ab8u, 0x5d681b02u, 0x2a6f2b94u, 0xb40bbe37u, 0xc30c8ea1u, 0x5a05df1bu, 0x2d02ef8du -}; - -static const unsigned lodepng_crc32_table1[256] = { - 0x00000000u, 0x191b3141u, 0x32366282u, 0x2b2d53c3u, 0x646cc504u, 0x7d77f445u, 0x565aa786u, 0x4f4196c7u, - 0xc8d98a08u, 0xd1c2bb49u, 0xfaefe88au, 0xe3f4d9cbu, 0xacb54f0cu, 0xb5ae7e4du, 0x9e832d8eu, 0x87981ccfu, - 0x4ac21251u, 0x53d92310u, 0x78f470d3u, 0x61ef4192u, 0x2eaed755u, 0x37b5e614u, 0x1c98b5d7u, 0x05838496u, - 0x821b9859u, 0x9b00a918u, 0xb02dfadbu, 0xa936cb9au, 0xe6775d5du, 0xff6c6c1cu, 0xd4413fdfu, 0xcd5a0e9eu, - 0x958424a2u, 0x8c9f15e3u, 0xa7b24620u, 0xbea97761u, 0xf1e8e1a6u, 0xe8f3d0e7u, 0xc3de8324u, 0xdac5b265u, - 0x5d5daeaau, 0x44469febu, 0x6f6bcc28u, 0x7670fd69u, 0x39316baeu, 0x202a5aefu, 0x0b07092cu, 0x121c386du, - 0xdf4636f3u, 0xc65d07b2u, 0xed705471u, 0xf46b6530u, 0xbb2af3f7u, 0xa231c2b6u, 0x891c9175u, 0x9007a034u, - 0x179fbcfbu, 0x0e848dbau, 0x25a9de79u, 0x3cb2ef38u, 0x73f379ffu, 0x6ae848beu, 0x41c51b7du, 0x58de2a3cu, - 0xf0794f05u, 0xe9627e44u, 0xc24f2d87u, 0xdb541cc6u, 0x94158a01u, 0x8d0ebb40u, 0xa623e883u, 0xbf38d9c2u, - 0x38a0c50du, 0x21bbf44cu, 0x0a96a78fu, 0x138d96ceu, 0x5ccc0009u, 0x45d73148u, 0x6efa628bu, 0x77e153cau, - 0xbabb5d54u, 0xa3a06c15u, 0x888d3fd6u, 0x91960e97u, 0xded79850u, 0xc7cca911u, 0xece1fad2u, 0xf5facb93u, - 0x7262d75cu, 0x6b79e61du, 0x4054b5deu, 0x594f849fu, 0x160e1258u, 0x0f152319u, 0x243870dau, 0x3d23419bu, - 0x65fd6ba7u, 0x7ce65ae6u, 0x57cb0925u, 0x4ed03864u, 0x0191aea3u, 0x188a9fe2u, 0x33a7cc21u, 0x2abcfd60u, - 0xad24e1afu, 0xb43fd0eeu, 0x9f12832du, 0x8609b26cu, 0xc94824abu, 0xd05315eau, 0xfb7e4629u, 0xe2657768u, - 0x2f3f79f6u, 0x362448b7u, 0x1d091b74u, 0x04122a35u, 0x4b53bcf2u, 0x52488db3u, 0x7965de70u, 0x607eef31u, - 0xe7e6f3feu, 0xfefdc2bfu, 0xd5d0917cu, 0xcccba03du, 0x838a36fau, 0x9a9107bbu, 0xb1bc5478u, 0xa8a76539u, - 0x3b83984bu, 0x2298a90au, 0x09b5fac9u, 0x10aecb88u, 0x5fef5d4fu, 0x46f46c0eu, 0x6dd93fcdu, 0x74c20e8cu, - 0xf35a1243u, 0xea412302u, 0xc16c70c1u, 0xd8774180u, 0x9736d747u, 0x8e2de606u, 0xa500b5c5u, 0xbc1b8484u, - 0x71418a1au, 0x685abb5bu, 0x4377e898u, 0x5a6cd9d9u, 0x152d4f1eu, 0x0c367e5fu, 0x271b2d9cu, 0x3e001cddu, - 0xb9980012u, 0xa0833153u, 0x8bae6290u, 0x92b553d1u, 0xddf4c516u, 0xc4eff457u, 0xefc2a794u, 0xf6d996d5u, - 0xae07bce9u, 0xb71c8da8u, 0x9c31de6bu, 0x852aef2au, 0xca6b79edu, 0xd37048acu, 0xf85d1b6fu, 0xe1462a2eu, - 0x66de36e1u, 0x7fc507a0u, 0x54e85463u, 0x4df36522u, 0x02b2f3e5u, 0x1ba9c2a4u, 0x30849167u, 0x299fa026u, - 0xe4c5aeb8u, 0xfdde9ff9u, 0xd6f3cc3au, 0xcfe8fd7bu, 0x80a96bbcu, 0x99b25afdu, 0xb29f093eu, 0xab84387fu, - 0x2c1c24b0u, 0x350715f1u, 0x1e2a4632u, 0x07317773u, 0x4870e1b4u, 0x516bd0f5u, 0x7a468336u, 0x635db277u, - 0xcbfad74eu, 0xd2e1e60fu, 0xf9ccb5ccu, 0xe0d7848du, 0xaf96124au, 0xb68d230bu, 0x9da070c8u, 0x84bb4189u, - 0x03235d46u, 0x1a386c07u, 0x31153fc4u, 0x280e0e85u, 0x674f9842u, 0x7e54a903u, 0x5579fac0u, 0x4c62cb81u, - 0x8138c51fu, 0x9823f45eu, 0xb30ea79du, 0xaa1596dcu, 0xe554001bu, 0xfc4f315au, 0xd7626299u, 0xce7953d8u, - 0x49e14f17u, 0x50fa7e56u, 0x7bd72d95u, 0x62cc1cd4u, 0x2d8d8a13u, 0x3496bb52u, 0x1fbbe891u, 0x06a0d9d0u, - 0x5e7ef3ecu, 0x4765c2adu, 0x6c48916eu, 0x7553a02fu, 0x3a1236e8u, 0x230907a9u, 0x0824546au, 0x113f652bu, - 0x96a779e4u, 0x8fbc48a5u, 0xa4911b66u, 0xbd8a2a27u, 0xf2cbbce0u, 0xebd08da1u, 0xc0fdde62u, 0xd9e6ef23u, - 0x14bce1bdu, 0x0da7d0fcu, 0x268a833fu, 0x3f91b27eu, 0x70d024b9u, 0x69cb15f8u, 0x42e6463bu, 0x5bfd777au, - 0xdc656bb5u, 0xc57e5af4u, 0xee530937u, 0xf7483876u, 0xb809aeb1u, 0xa1129ff0u, 0x8a3fcc33u, 0x9324fd72u -}; - -static const unsigned lodepng_crc32_table2[256] = { - 0x00000000u, 0x01c26a37u, 0x0384d46eu, 0x0246be59u, 0x0709a8dcu, 0x06cbc2ebu, 0x048d7cb2u, 0x054f1685u, - 0x0e1351b8u, 0x0fd13b8fu, 0x0d9785d6u, 0x0c55efe1u, 0x091af964u, 0x08d89353u, 0x0a9e2d0au, 0x0b5c473du, - 0x1c26a370u, 0x1de4c947u, 0x1fa2771eu, 0x1e601d29u, 0x1b2f0bacu, 0x1aed619bu, 0x18abdfc2u, 0x1969b5f5u, - 0x1235f2c8u, 0x13f798ffu, 0x11b126a6u, 0x10734c91u, 0x153c5a14u, 0x14fe3023u, 0x16b88e7au, 0x177ae44du, - 0x384d46e0u, 0x398f2cd7u, 0x3bc9928eu, 0x3a0bf8b9u, 0x3f44ee3cu, 0x3e86840bu, 0x3cc03a52u, 0x3d025065u, - 0x365e1758u, 0x379c7d6fu, 0x35dac336u, 0x3418a901u, 0x3157bf84u, 0x3095d5b3u, 0x32d36beau, 0x331101ddu, - 0x246be590u, 0x25a98fa7u, 0x27ef31feu, 0x262d5bc9u, 0x23624d4cu, 0x22a0277bu, 0x20e69922u, 0x2124f315u, - 0x2a78b428u, 0x2bbade1fu, 0x29fc6046u, 0x283e0a71u, 0x2d711cf4u, 0x2cb376c3u, 0x2ef5c89au, 0x2f37a2adu, - 0x709a8dc0u, 0x7158e7f7u, 0x731e59aeu, 0x72dc3399u, 0x7793251cu, 0x76514f2bu, 0x7417f172u, 0x75d59b45u, - 0x7e89dc78u, 0x7f4bb64fu, 0x7d0d0816u, 0x7ccf6221u, 0x798074a4u, 0x78421e93u, 0x7a04a0cau, 0x7bc6cafdu, - 0x6cbc2eb0u, 0x6d7e4487u, 0x6f38fadeu, 0x6efa90e9u, 0x6bb5866cu, 0x6a77ec5bu, 0x68315202u, 0x69f33835u, - 0x62af7f08u, 0x636d153fu, 0x612bab66u, 0x60e9c151u, 0x65a6d7d4u, 0x6464bde3u, 0x662203bau, 0x67e0698du, - 0x48d7cb20u, 0x4915a117u, 0x4b531f4eu, 0x4a917579u, 0x4fde63fcu, 0x4e1c09cbu, 0x4c5ab792u, 0x4d98dda5u, - 0x46c49a98u, 0x4706f0afu, 0x45404ef6u, 0x448224c1u, 0x41cd3244u, 0x400f5873u, 0x4249e62au, 0x438b8c1du, - 0x54f16850u, 0x55330267u, 0x5775bc3eu, 0x56b7d609u, 0x53f8c08cu, 0x523aaabbu, 0x507c14e2u, 0x51be7ed5u, - 0x5ae239e8u, 0x5b2053dfu, 0x5966ed86u, 0x58a487b1u, 0x5deb9134u, 0x5c29fb03u, 0x5e6f455au, 0x5fad2f6du, - 0xe1351b80u, 0xe0f771b7u, 0xe2b1cfeeu, 0xe373a5d9u, 0xe63cb35cu, 0xe7fed96bu, 0xe5b86732u, 0xe47a0d05u, - 0xef264a38u, 0xeee4200fu, 0xeca29e56u, 0xed60f461u, 0xe82fe2e4u, 0xe9ed88d3u, 0xebab368au, 0xea695cbdu, - 0xfd13b8f0u, 0xfcd1d2c7u, 0xfe976c9eu, 0xff5506a9u, 0xfa1a102cu, 0xfbd87a1bu, 0xf99ec442u, 0xf85cae75u, - 0xf300e948u, 0xf2c2837fu, 0xf0843d26u, 0xf1465711u, 0xf4094194u, 0xf5cb2ba3u, 0xf78d95fau, 0xf64fffcdu, - 0xd9785d60u, 0xd8ba3757u, 0xdafc890eu, 0xdb3ee339u, 0xde71f5bcu, 0xdfb39f8bu, 0xddf521d2u, 0xdc374be5u, - 0xd76b0cd8u, 0xd6a966efu, 0xd4efd8b6u, 0xd52db281u, 0xd062a404u, 0xd1a0ce33u, 0xd3e6706au, 0xd2241a5du, - 0xc55efe10u, 0xc49c9427u, 0xc6da2a7eu, 0xc7184049u, 0xc25756ccu, 0xc3953cfbu, 0xc1d382a2u, 0xc011e895u, - 0xcb4dafa8u, 0xca8fc59fu, 0xc8c97bc6u, 0xc90b11f1u, 0xcc440774u, 0xcd866d43u, 0xcfc0d31au, 0xce02b92du, - 0x91af9640u, 0x906dfc77u, 0x922b422eu, 0x93e92819u, 0x96a63e9cu, 0x976454abu, 0x9522eaf2u, 0x94e080c5u, - 0x9fbcc7f8u, 0x9e7eadcfu, 0x9c381396u, 0x9dfa79a1u, 0x98b56f24u, 0x99770513u, 0x9b31bb4au, 0x9af3d17du, - 0x8d893530u, 0x8c4b5f07u, 0x8e0de15eu, 0x8fcf8b69u, 0x8a809decu, 0x8b42f7dbu, 0x89044982u, 0x88c623b5u, - 0x839a6488u, 0x82580ebfu, 0x801eb0e6u, 0x81dcdad1u, 0x8493cc54u, 0x8551a663u, 0x8717183au, 0x86d5720du, - 0xa9e2d0a0u, 0xa820ba97u, 0xaa6604ceu, 0xaba46ef9u, 0xaeeb787cu, 0xaf29124bu, 0xad6fac12u, 0xacadc625u, - 0xa7f18118u, 0xa633eb2fu, 0xa4755576u, 0xa5b73f41u, 0xa0f829c4u, 0xa13a43f3u, 0xa37cfdaau, 0xa2be979du, - 0xb5c473d0u, 0xb40619e7u, 0xb640a7beu, 0xb782cd89u, 0xb2cddb0cu, 0xb30fb13bu, 0xb1490f62u, 0xb08b6555u, - 0xbbd72268u, 0xba15485fu, 0xb853f606u, 0xb9919c31u, 0xbcde8ab4u, 0xbd1ce083u, 0xbf5a5edau, 0xbe9834edu -}; - -static const unsigned lodepng_crc32_table3[256] = { - 0x00000000u, 0xb8bc6765u, 0xaa09c88bu, 0x12b5afeeu, 0x8f629757u, 0x37def032u, 0x256b5fdcu, 0x9dd738b9u, - 0xc5b428efu, 0x7d084f8au, 0x6fbde064u, 0xd7018701u, 0x4ad6bfb8u, 0xf26ad8ddu, 0xe0df7733u, 0x58631056u, - 0x5019579fu, 0xe8a530fau, 0xfa109f14u, 0x42acf871u, 0xdf7bc0c8u, 0x67c7a7adu, 0x75720843u, 0xcdce6f26u, - 0x95ad7f70u, 0x2d111815u, 0x3fa4b7fbu, 0x8718d09eu, 0x1acfe827u, 0xa2738f42u, 0xb0c620acu, 0x087a47c9u, - 0xa032af3eu, 0x188ec85bu, 0x0a3b67b5u, 0xb28700d0u, 0x2f503869u, 0x97ec5f0cu, 0x8559f0e2u, 0x3de59787u, - 0x658687d1u, 0xdd3ae0b4u, 0xcf8f4f5au, 0x7733283fu, 0xeae41086u, 0x525877e3u, 0x40edd80du, 0xf851bf68u, - 0xf02bf8a1u, 0x48979fc4u, 0x5a22302au, 0xe29e574fu, 0x7f496ff6u, 0xc7f50893u, 0xd540a77du, 0x6dfcc018u, - 0x359fd04eu, 0x8d23b72bu, 0x9f9618c5u, 0x272a7fa0u, 0xbafd4719u, 0x0241207cu, 0x10f48f92u, 0xa848e8f7u, - 0x9b14583du, 0x23a83f58u, 0x311d90b6u, 0x89a1f7d3u, 0x1476cf6au, 0xaccaa80fu, 0xbe7f07e1u, 0x06c36084u, - 0x5ea070d2u, 0xe61c17b7u, 0xf4a9b859u, 0x4c15df3cu, 0xd1c2e785u, 0x697e80e0u, 0x7bcb2f0eu, 0xc377486bu, - 0xcb0d0fa2u, 0x73b168c7u, 0x6104c729u, 0xd9b8a04cu, 0x446f98f5u, 0xfcd3ff90u, 0xee66507eu, 0x56da371bu, - 0x0eb9274du, 0xb6054028u, 0xa4b0efc6u, 0x1c0c88a3u, 0x81dbb01au, 0x3967d77fu, 0x2bd27891u, 0x936e1ff4u, - 0x3b26f703u, 0x839a9066u, 0x912f3f88u, 0x299358edu, 0xb4446054u, 0x0cf80731u, 0x1e4da8dfu, 0xa6f1cfbau, - 0xfe92dfecu, 0x462eb889u, 0x549b1767u, 0xec277002u, 0x71f048bbu, 0xc94c2fdeu, 0xdbf98030u, 0x6345e755u, - 0x6b3fa09cu, 0xd383c7f9u, 0xc1366817u, 0x798a0f72u, 0xe45d37cbu, 0x5ce150aeu, 0x4e54ff40u, 0xf6e89825u, - 0xae8b8873u, 0x1637ef16u, 0x048240f8u, 0xbc3e279du, 0x21e91f24u, 0x99557841u, 0x8be0d7afu, 0x335cb0cau, - 0xed59b63bu, 0x55e5d15eu, 0x47507eb0u, 0xffec19d5u, 0x623b216cu, 0xda874609u, 0xc832e9e7u, 0x708e8e82u, - 0x28ed9ed4u, 0x9051f9b1u, 0x82e4565fu, 0x3a58313au, 0xa78f0983u, 0x1f336ee6u, 0x0d86c108u, 0xb53aa66du, - 0xbd40e1a4u, 0x05fc86c1u, 0x1749292fu, 0xaff54e4au, 0x322276f3u, 0x8a9e1196u, 0x982bbe78u, 0x2097d91du, - 0x78f4c94bu, 0xc048ae2eu, 0xd2fd01c0u, 0x6a4166a5u, 0xf7965e1cu, 0x4f2a3979u, 0x5d9f9697u, 0xe523f1f2u, - 0x4d6b1905u, 0xf5d77e60u, 0xe762d18eu, 0x5fdeb6ebu, 0xc2098e52u, 0x7ab5e937u, 0x680046d9u, 0xd0bc21bcu, - 0x88df31eau, 0x3063568fu, 0x22d6f961u, 0x9a6a9e04u, 0x07bda6bdu, 0xbf01c1d8u, 0xadb46e36u, 0x15080953u, - 0x1d724e9au, 0xa5ce29ffu, 0xb77b8611u, 0x0fc7e174u, 0x9210d9cdu, 0x2aacbea8u, 0x38191146u, 0x80a57623u, - 0xd8c66675u, 0x607a0110u, 0x72cfaefeu, 0xca73c99bu, 0x57a4f122u, 0xef189647u, 0xfdad39a9u, 0x45115eccu, - 0x764dee06u, 0xcef18963u, 0xdc44268du, 0x64f841e8u, 0xf92f7951u, 0x41931e34u, 0x5326b1dau, 0xeb9ad6bfu, - 0xb3f9c6e9u, 0x0b45a18cu, 0x19f00e62u, 0xa14c6907u, 0x3c9b51beu, 0x842736dbu, 0x96929935u, 0x2e2efe50u, - 0x2654b999u, 0x9ee8defcu, 0x8c5d7112u, 0x34e11677u, 0xa9362eceu, 0x118a49abu, 0x033fe645u, 0xbb838120u, - 0xe3e09176u, 0x5b5cf613u, 0x49e959fdu, 0xf1553e98u, 0x6c820621u, 0xd43e6144u, 0xc68bceaau, 0x7e37a9cfu, - 0xd67f4138u, 0x6ec3265du, 0x7c7689b3u, 0xc4caeed6u, 0x591dd66fu, 0xe1a1b10au, 0xf3141ee4u, 0x4ba87981u, - 0x13cb69d7u, 0xab770eb2u, 0xb9c2a15cu, 0x017ec639u, 0x9ca9fe80u, 0x241599e5u, 0x36a0360bu, 0x8e1c516eu, - 0x866616a7u, 0x3eda71c2u, 0x2c6fde2cu, 0x94d3b949u, 0x090481f0u, 0xb1b8e695u, 0xa30d497bu, 0x1bb12e1eu, - 0x43d23e48u, 0xfb6e592du, 0xe9dbf6c3u, 0x516791a6u, 0xccb0a91fu, 0x740cce7au, 0x66b96194u, 0xde0506f1u -}; - -static const unsigned lodepng_crc32_table4[256] = { - 0x00000000u, 0x3d6029b0u, 0x7ac05360u, 0x47a07ad0u, 0xf580a6c0u, 0xc8e08f70u, 0x8f40f5a0u, 0xb220dc10u, - 0x30704bc1u, 0x0d106271u, 0x4ab018a1u, 0x77d03111u, 0xc5f0ed01u, 0xf890c4b1u, 0xbf30be61u, 0x825097d1u, - 0x60e09782u, 0x5d80be32u, 0x1a20c4e2u, 0x2740ed52u, 0x95603142u, 0xa80018f2u, 0xefa06222u, 0xd2c04b92u, - 0x5090dc43u, 0x6df0f5f3u, 0x2a508f23u, 0x1730a693u, 0xa5107a83u, 0x98705333u, 0xdfd029e3u, 0xe2b00053u, - 0xc1c12f04u, 0xfca106b4u, 0xbb017c64u, 0x866155d4u, 0x344189c4u, 0x0921a074u, 0x4e81daa4u, 0x73e1f314u, - 0xf1b164c5u, 0xccd14d75u, 0x8b7137a5u, 0xb6111e15u, 0x0431c205u, 0x3951ebb5u, 0x7ef19165u, 0x4391b8d5u, - 0xa121b886u, 0x9c419136u, 0xdbe1ebe6u, 0xe681c256u, 0x54a11e46u, 0x69c137f6u, 0x2e614d26u, 0x13016496u, - 0x9151f347u, 0xac31daf7u, 0xeb91a027u, 0xd6f18997u, 0x64d15587u, 0x59b17c37u, 0x1e1106e7u, 0x23712f57u, - 0x58f35849u, 0x659371f9u, 0x22330b29u, 0x1f532299u, 0xad73fe89u, 0x9013d739u, 0xd7b3ade9u, 0xead38459u, - 0x68831388u, 0x55e33a38u, 0x124340e8u, 0x2f236958u, 0x9d03b548u, 0xa0639cf8u, 0xe7c3e628u, 0xdaa3cf98u, - 0x3813cfcbu, 0x0573e67bu, 0x42d39cabu, 0x7fb3b51bu, 0xcd93690bu, 0xf0f340bbu, 0xb7533a6bu, 0x8a3313dbu, - 0x0863840au, 0x3503adbau, 0x72a3d76au, 0x4fc3fedau, 0xfde322cau, 0xc0830b7au, 0x872371aau, 0xba43581au, - 0x9932774du, 0xa4525efdu, 0xe3f2242du, 0xde920d9du, 0x6cb2d18du, 0x51d2f83du, 0x167282edu, 0x2b12ab5du, - 0xa9423c8cu, 0x9422153cu, 0xd3826fecu, 0xeee2465cu, 0x5cc29a4cu, 0x61a2b3fcu, 0x2602c92cu, 0x1b62e09cu, - 0xf9d2e0cfu, 0xc4b2c97fu, 0x8312b3afu, 0xbe729a1fu, 0x0c52460fu, 0x31326fbfu, 0x7692156fu, 0x4bf23cdfu, - 0xc9a2ab0eu, 0xf4c282beu, 0xb362f86eu, 0x8e02d1deu, 0x3c220dceu, 0x0142247eu, 0x46e25eaeu, 0x7b82771eu, - 0xb1e6b092u, 0x8c869922u, 0xcb26e3f2u, 0xf646ca42u, 0x44661652u, 0x79063fe2u, 0x3ea64532u, 0x03c66c82u, - 0x8196fb53u, 0xbcf6d2e3u, 0xfb56a833u, 0xc6368183u, 0x74165d93u, 0x49767423u, 0x0ed60ef3u, 0x33b62743u, - 0xd1062710u, 0xec660ea0u, 0xabc67470u, 0x96a65dc0u, 0x248681d0u, 0x19e6a860u, 0x5e46d2b0u, 0x6326fb00u, - 0xe1766cd1u, 0xdc164561u, 0x9bb63fb1u, 0xa6d61601u, 0x14f6ca11u, 0x2996e3a1u, 0x6e369971u, 0x5356b0c1u, - 0x70279f96u, 0x4d47b626u, 0x0ae7ccf6u, 0x3787e546u, 0x85a73956u, 0xb8c710e6u, 0xff676a36u, 0xc2074386u, - 0x4057d457u, 0x7d37fde7u, 0x3a978737u, 0x07f7ae87u, 0xb5d77297u, 0x88b75b27u, 0xcf1721f7u, 0xf2770847u, - 0x10c70814u, 0x2da721a4u, 0x6a075b74u, 0x576772c4u, 0xe547aed4u, 0xd8278764u, 0x9f87fdb4u, 0xa2e7d404u, - 0x20b743d5u, 0x1dd76a65u, 0x5a7710b5u, 0x67173905u, 0xd537e515u, 0xe857cca5u, 0xaff7b675u, 0x92979fc5u, - 0xe915e8dbu, 0xd475c16bu, 0x93d5bbbbu, 0xaeb5920bu, 0x1c954e1bu, 0x21f567abu, 0x66551d7bu, 0x5b3534cbu, - 0xd965a31au, 0xe4058aaau, 0xa3a5f07au, 0x9ec5d9cau, 0x2ce505dau, 0x11852c6au, 0x562556bau, 0x6b457f0au, - 0x89f57f59u, 0xb49556e9u, 0xf3352c39u, 0xce550589u, 0x7c75d999u, 0x4115f029u, 0x06b58af9u, 0x3bd5a349u, - 0xb9853498u, 0x84e51d28u, 0xc34567f8u, 0xfe254e48u, 0x4c059258u, 0x7165bbe8u, 0x36c5c138u, 0x0ba5e888u, - 0x28d4c7dfu, 0x15b4ee6fu, 0x521494bfu, 0x6f74bd0fu, 0xdd54611fu, 0xe03448afu, 0xa794327fu, 0x9af41bcfu, - 0x18a48c1eu, 0x25c4a5aeu, 0x6264df7eu, 0x5f04f6ceu, 0xed242adeu, 0xd044036eu, 0x97e479beu, 0xaa84500eu, - 0x4834505du, 0x755479edu, 0x32f4033du, 0x0f942a8du, 0xbdb4f69du, 0x80d4df2du, 0xc774a5fdu, 0xfa148c4du, - 0x78441b9cu, 0x4524322cu, 0x028448fcu, 0x3fe4614cu, 0x8dc4bd5cu, 0xb0a494ecu, 0xf704ee3cu, 0xca64c78cu -}; - -static const unsigned lodepng_crc32_table5[256] = { - 0x00000000u, 0xcb5cd3a5u, 0x4dc8a10bu, 0x869472aeu, 0x9b914216u, 0x50cd91b3u, 0xd659e31du, 0x1d0530b8u, - 0xec53826du, 0x270f51c8u, 0xa19b2366u, 0x6ac7f0c3u, 0x77c2c07bu, 0xbc9e13deu, 0x3a0a6170u, 0xf156b2d5u, - 0x03d6029bu, 0xc88ad13eu, 0x4e1ea390u, 0x85427035u, 0x9847408du, 0x531b9328u, 0xd58fe186u, 0x1ed33223u, - 0xef8580f6u, 0x24d95353u, 0xa24d21fdu, 0x6911f258u, 0x7414c2e0u, 0xbf481145u, 0x39dc63ebu, 0xf280b04eu, - 0x07ac0536u, 0xccf0d693u, 0x4a64a43du, 0x81387798u, 0x9c3d4720u, 0x57619485u, 0xd1f5e62bu, 0x1aa9358eu, - 0xebff875bu, 0x20a354feu, 0xa6372650u, 0x6d6bf5f5u, 0x706ec54du, 0xbb3216e8u, 0x3da66446u, 0xf6fab7e3u, - 0x047a07adu, 0xcf26d408u, 0x49b2a6a6u, 0x82ee7503u, 0x9feb45bbu, 0x54b7961eu, 0xd223e4b0u, 0x197f3715u, - 0xe82985c0u, 0x23755665u, 0xa5e124cbu, 0x6ebdf76eu, 0x73b8c7d6u, 0xb8e41473u, 0x3e7066ddu, 0xf52cb578u, - 0x0f580a6cu, 0xc404d9c9u, 0x4290ab67u, 0x89cc78c2u, 0x94c9487au, 0x5f959bdfu, 0xd901e971u, 0x125d3ad4u, - 0xe30b8801u, 0x28575ba4u, 0xaec3290au, 0x659ffaafu, 0x789aca17u, 0xb3c619b2u, 0x35526b1cu, 0xfe0eb8b9u, - 0x0c8e08f7u, 0xc7d2db52u, 0x4146a9fcu, 0x8a1a7a59u, 0x971f4ae1u, 0x5c439944u, 0xdad7ebeau, 0x118b384fu, - 0xe0dd8a9au, 0x2b81593fu, 0xad152b91u, 0x6649f834u, 0x7b4cc88cu, 0xb0101b29u, 0x36846987u, 0xfdd8ba22u, - 0x08f40f5au, 0xc3a8dcffu, 0x453cae51u, 0x8e607df4u, 0x93654d4cu, 0x58399ee9u, 0xdeadec47u, 0x15f13fe2u, - 0xe4a78d37u, 0x2ffb5e92u, 0xa96f2c3cu, 0x6233ff99u, 0x7f36cf21u, 0xb46a1c84u, 0x32fe6e2au, 0xf9a2bd8fu, - 0x0b220dc1u, 0xc07ede64u, 0x46eaaccau, 0x8db67f6fu, 0x90b34fd7u, 0x5bef9c72u, 0xdd7beedcu, 0x16273d79u, - 0xe7718facu, 0x2c2d5c09u, 0xaab92ea7u, 0x61e5fd02u, 0x7ce0cdbau, 0xb7bc1e1fu, 0x31286cb1u, 0xfa74bf14u, - 0x1eb014d8u, 0xd5ecc77du, 0x5378b5d3u, 0x98246676u, 0x852156ceu, 0x4e7d856bu, 0xc8e9f7c5u, 0x03b52460u, - 0xf2e396b5u, 0x39bf4510u, 0xbf2b37beu, 0x7477e41bu, 0x6972d4a3u, 0xa22e0706u, 0x24ba75a8u, 0xefe6a60du, - 0x1d661643u, 0xd63ac5e6u, 0x50aeb748u, 0x9bf264edu, 0x86f75455u, 0x4dab87f0u, 0xcb3ff55eu, 0x006326fbu, - 0xf135942eu, 0x3a69478bu, 0xbcfd3525u, 0x77a1e680u, 0x6aa4d638u, 0xa1f8059du, 0x276c7733u, 0xec30a496u, - 0x191c11eeu, 0xd240c24bu, 0x54d4b0e5u, 0x9f886340u, 0x828d53f8u, 0x49d1805du, 0xcf45f2f3u, 0x04192156u, - 0xf54f9383u, 0x3e134026u, 0xb8873288u, 0x73dbe12du, 0x6eded195u, 0xa5820230u, 0x2316709eu, 0xe84aa33bu, - 0x1aca1375u, 0xd196c0d0u, 0x5702b27eu, 0x9c5e61dbu, 0x815b5163u, 0x4a0782c6u, 0xcc93f068u, 0x07cf23cdu, - 0xf6999118u, 0x3dc542bdu, 0xbb513013u, 0x700de3b6u, 0x6d08d30eu, 0xa65400abu, 0x20c07205u, 0xeb9ca1a0u, - 0x11e81eb4u, 0xdab4cd11u, 0x5c20bfbfu, 0x977c6c1au, 0x8a795ca2u, 0x41258f07u, 0xc7b1fda9u, 0x0ced2e0cu, - 0xfdbb9cd9u, 0x36e74f7cu, 0xb0733dd2u, 0x7b2fee77u, 0x662adecfu, 0xad760d6au, 0x2be27fc4u, 0xe0beac61u, - 0x123e1c2fu, 0xd962cf8au, 0x5ff6bd24u, 0x94aa6e81u, 0x89af5e39u, 0x42f38d9cu, 0xc467ff32u, 0x0f3b2c97u, - 0xfe6d9e42u, 0x35314de7u, 0xb3a53f49u, 0x78f9ececu, 0x65fcdc54u, 0xaea00ff1u, 0x28347d5fu, 0xe368aefau, - 0x16441b82u, 0xdd18c827u, 0x5b8cba89u, 0x90d0692cu, 0x8dd55994u, 0x46898a31u, 0xc01df89fu, 0x0b412b3au, - 0xfa1799efu, 0x314b4a4au, 0xb7df38e4u, 0x7c83eb41u, 0x6186dbf9u, 0xaada085cu, 0x2c4e7af2u, 0xe712a957u, - 0x15921919u, 0xdececabcu, 0x585ab812u, 0x93066bb7u, 0x8e035b0fu, 0x455f88aau, 0xc3cbfa04u, 0x089729a1u, - 0xf9c19b74u, 0x329d48d1u, 0xb4093a7fu, 0x7f55e9dau, 0x6250d962u, 0xa90c0ac7u, 0x2f987869u, 0xe4c4abccu -}; - -static const unsigned lodepng_crc32_table6[256] = { - 0x00000000u, 0xa6770bb4u, 0x979f1129u, 0x31e81a9du, 0xf44f2413u, 0x52382fa7u, 0x63d0353au, 0xc5a73e8eu, - 0x33ef4e67u, 0x959845d3u, 0xa4705f4eu, 0x020754fau, 0xc7a06a74u, 0x61d761c0u, 0x503f7b5du, 0xf64870e9u, - 0x67de9cceu, 0xc1a9977au, 0xf0418de7u, 0x56368653u, 0x9391b8ddu, 0x35e6b369u, 0x040ea9f4u, 0xa279a240u, - 0x5431d2a9u, 0xf246d91du, 0xc3aec380u, 0x65d9c834u, 0xa07ef6bau, 0x0609fd0eu, 0x37e1e793u, 0x9196ec27u, - 0xcfbd399cu, 0x69ca3228u, 0x582228b5u, 0xfe552301u, 0x3bf21d8fu, 0x9d85163bu, 0xac6d0ca6u, 0x0a1a0712u, - 0xfc5277fbu, 0x5a257c4fu, 0x6bcd66d2u, 0xcdba6d66u, 0x081d53e8u, 0xae6a585cu, 0x9f8242c1u, 0x39f54975u, - 0xa863a552u, 0x0e14aee6u, 0x3ffcb47bu, 0x998bbfcfu, 0x5c2c8141u, 0xfa5b8af5u, 0xcbb39068u, 0x6dc49bdcu, - 0x9b8ceb35u, 0x3dfbe081u, 0x0c13fa1cu, 0xaa64f1a8u, 0x6fc3cf26u, 0xc9b4c492u, 0xf85cde0fu, 0x5e2bd5bbu, - 0x440b7579u, 0xe27c7ecdu, 0xd3946450u, 0x75e36fe4u, 0xb044516au, 0x16335adeu, 0x27db4043u, 0x81ac4bf7u, - 0x77e43b1eu, 0xd19330aau, 0xe07b2a37u, 0x460c2183u, 0x83ab1f0du, 0x25dc14b9u, 0x14340e24u, 0xb2430590u, - 0x23d5e9b7u, 0x85a2e203u, 0xb44af89eu, 0x123df32au, 0xd79acda4u, 0x71edc610u, 0x4005dc8du, 0xe672d739u, - 0x103aa7d0u, 0xb64dac64u, 0x87a5b6f9u, 0x21d2bd4du, 0xe47583c3u, 0x42028877u, 0x73ea92eau, 0xd59d995eu, - 0x8bb64ce5u, 0x2dc14751u, 0x1c295dccu, 0xba5e5678u, 0x7ff968f6u, 0xd98e6342u, 0xe86679dfu, 0x4e11726bu, - 0xb8590282u, 0x1e2e0936u, 0x2fc613abu, 0x89b1181fu, 0x4c162691u, 0xea612d25u, 0xdb8937b8u, 0x7dfe3c0cu, - 0xec68d02bu, 0x4a1fdb9fu, 0x7bf7c102u, 0xdd80cab6u, 0x1827f438u, 0xbe50ff8cu, 0x8fb8e511u, 0x29cfeea5u, - 0xdf879e4cu, 0x79f095f8u, 0x48188f65u, 0xee6f84d1u, 0x2bc8ba5fu, 0x8dbfb1ebu, 0xbc57ab76u, 0x1a20a0c2u, - 0x8816eaf2u, 0x2e61e146u, 0x1f89fbdbu, 0xb9fef06fu, 0x7c59cee1u, 0xda2ec555u, 0xebc6dfc8u, 0x4db1d47cu, - 0xbbf9a495u, 0x1d8eaf21u, 0x2c66b5bcu, 0x8a11be08u, 0x4fb68086u, 0xe9c18b32u, 0xd82991afu, 0x7e5e9a1bu, - 0xefc8763cu, 0x49bf7d88u, 0x78576715u, 0xde206ca1u, 0x1b87522fu, 0xbdf0599bu, 0x8c184306u, 0x2a6f48b2u, - 0xdc27385bu, 0x7a5033efu, 0x4bb82972u, 0xedcf22c6u, 0x28681c48u, 0x8e1f17fcu, 0xbff70d61u, 0x198006d5u, - 0x47abd36eu, 0xe1dcd8dau, 0xd034c247u, 0x7643c9f3u, 0xb3e4f77du, 0x1593fcc9u, 0x247be654u, 0x820cede0u, - 0x74449d09u, 0xd23396bdu, 0xe3db8c20u, 0x45ac8794u, 0x800bb91au, 0x267cb2aeu, 0x1794a833u, 0xb1e3a387u, - 0x20754fa0u, 0x86024414u, 0xb7ea5e89u, 0x119d553du, 0xd43a6bb3u, 0x724d6007u, 0x43a57a9au, 0xe5d2712eu, - 0x139a01c7u, 0xb5ed0a73u, 0x840510eeu, 0x22721b5au, 0xe7d525d4u, 0x41a22e60u, 0x704a34fdu, 0xd63d3f49u, - 0xcc1d9f8bu, 0x6a6a943fu, 0x5b828ea2u, 0xfdf58516u, 0x3852bb98u, 0x9e25b02cu, 0xafcdaab1u, 0x09baa105u, - 0xfff2d1ecu, 0x5985da58u, 0x686dc0c5u, 0xce1acb71u, 0x0bbdf5ffu, 0xadcafe4bu, 0x9c22e4d6u, 0x3a55ef62u, - 0xabc30345u, 0x0db408f1u, 0x3c5c126cu, 0x9a2b19d8u, 0x5f8c2756u, 0xf9fb2ce2u, 0xc813367fu, 0x6e643dcbu, - 0x982c4d22u, 0x3e5b4696u, 0x0fb35c0bu, 0xa9c457bfu, 0x6c636931u, 0xca146285u, 0xfbfc7818u, 0x5d8b73acu, - 0x03a0a617u, 0xa5d7ada3u, 0x943fb73eu, 0x3248bc8au, 0xf7ef8204u, 0x519889b0u, 0x6070932du, 0xc6079899u, - 0x304fe870u, 0x9638e3c4u, 0xa7d0f959u, 0x01a7f2edu, 0xc400cc63u, 0x6277c7d7u, 0x539fdd4au, 0xf5e8d6feu, - 0x647e3ad9u, 0xc209316du, 0xf3e12bf0u, 0x55962044u, 0x90311ecau, 0x3646157eu, 0x07ae0fe3u, 0xa1d90457u, - 0x579174beu, 0xf1e67f0au, 0xc00e6597u, 0x66796e23u, 0xa3de50adu, 0x05a95b19u, 0x34414184u, 0x92364a30u -}; - -static const unsigned lodepng_crc32_table7[256] = { - 0x00000000u, 0xccaa009eu, 0x4225077du, 0x8e8f07e3u, 0x844a0efau, 0x48e00e64u, 0xc66f0987u, 0x0ac50919u, - 0xd3e51bb5u, 0x1f4f1b2bu, 0x91c01cc8u, 0x5d6a1c56u, 0x57af154fu, 0x9b0515d1u, 0x158a1232u, 0xd92012acu, - 0x7cbb312bu, 0xb01131b5u, 0x3e9e3656u, 0xf23436c8u, 0xf8f13fd1u, 0x345b3f4fu, 0xbad438acu, 0x767e3832u, - 0xaf5e2a9eu, 0x63f42a00u, 0xed7b2de3u, 0x21d12d7du, 0x2b142464u, 0xe7be24fau, 0x69312319u, 0xa59b2387u, - 0xf9766256u, 0x35dc62c8u, 0xbb53652bu, 0x77f965b5u, 0x7d3c6cacu, 0xb1966c32u, 0x3f196bd1u, 0xf3b36b4fu, - 0x2a9379e3u, 0xe639797du, 0x68b67e9eu, 0xa41c7e00u, 0xaed97719u, 0x62737787u, 0xecfc7064u, 0x205670fau, - 0x85cd537du, 0x496753e3u, 0xc7e85400u, 0x0b42549eu, 0x01875d87u, 0xcd2d5d19u, 0x43a25afau, 0x8f085a64u, - 0x562848c8u, 0x9a824856u, 0x140d4fb5u, 0xd8a74f2bu, 0xd2624632u, 0x1ec846acu, 0x9047414fu, 0x5ced41d1u, - 0x299dc2edu, 0xe537c273u, 0x6bb8c590u, 0xa712c50eu, 0xadd7cc17u, 0x617dcc89u, 0xeff2cb6au, 0x2358cbf4u, - 0xfa78d958u, 0x36d2d9c6u, 0xb85dde25u, 0x74f7debbu, 0x7e32d7a2u, 0xb298d73cu, 0x3c17d0dfu, 0xf0bdd041u, - 0x5526f3c6u, 0x998cf358u, 0x1703f4bbu, 0xdba9f425u, 0xd16cfd3cu, 0x1dc6fda2u, 0x9349fa41u, 0x5fe3fadfu, - 0x86c3e873u, 0x4a69e8edu, 0xc4e6ef0eu, 0x084cef90u, 0x0289e689u, 0xce23e617u, 0x40ace1f4u, 0x8c06e16au, - 0xd0eba0bbu, 0x1c41a025u, 0x92cea7c6u, 0x5e64a758u, 0x54a1ae41u, 0x980baedfu, 0x1684a93cu, 0xda2ea9a2u, - 0x030ebb0eu, 0xcfa4bb90u, 0x412bbc73u, 0x8d81bcedu, 0x8744b5f4u, 0x4beeb56au, 0xc561b289u, 0x09cbb217u, - 0xac509190u, 0x60fa910eu, 0xee7596edu, 0x22df9673u, 0x281a9f6au, 0xe4b09ff4u, 0x6a3f9817u, 0xa6959889u, - 0x7fb58a25u, 0xb31f8abbu, 0x3d908d58u, 0xf13a8dc6u, 0xfbff84dfu, 0x37558441u, 0xb9da83a2u, 0x7570833cu, - 0x533b85dau, 0x9f918544u, 0x111e82a7u, 0xddb48239u, 0xd7718b20u, 0x1bdb8bbeu, 0x95548c5du, 0x59fe8cc3u, - 0x80de9e6fu, 0x4c749ef1u, 0xc2fb9912u, 0x0e51998cu, 0x04949095u, 0xc83e900bu, 0x46b197e8u, 0x8a1b9776u, - 0x2f80b4f1u, 0xe32ab46fu, 0x6da5b38cu, 0xa10fb312u, 0xabcaba0bu, 0x6760ba95u, 0xe9efbd76u, 0x2545bde8u, - 0xfc65af44u, 0x30cfafdau, 0xbe40a839u, 0x72eaa8a7u, 0x782fa1beu, 0xb485a120u, 0x3a0aa6c3u, 0xf6a0a65du, - 0xaa4de78cu, 0x66e7e712u, 0xe868e0f1u, 0x24c2e06fu, 0x2e07e976u, 0xe2ade9e8u, 0x6c22ee0bu, 0xa088ee95u, - 0x79a8fc39u, 0xb502fca7u, 0x3b8dfb44u, 0xf727fbdau, 0xfde2f2c3u, 0x3148f25du, 0xbfc7f5beu, 0x736df520u, - 0xd6f6d6a7u, 0x1a5cd639u, 0x94d3d1dau, 0x5879d144u, 0x52bcd85du, 0x9e16d8c3u, 0x1099df20u, 0xdc33dfbeu, - 0x0513cd12u, 0xc9b9cd8cu, 0x4736ca6fu, 0x8b9ccaf1u, 0x8159c3e8u, 0x4df3c376u, 0xc37cc495u, 0x0fd6c40bu, - 0x7aa64737u, 0xb60c47a9u, 0x3883404au, 0xf42940d4u, 0xfeec49cdu, 0x32464953u, 0xbcc94eb0u, 0x70634e2eu, - 0xa9435c82u, 0x65e95c1cu, 0xeb665bffu, 0x27cc5b61u, 0x2d095278u, 0xe1a352e6u, 0x6f2c5505u, 0xa386559bu, - 0x061d761cu, 0xcab77682u, 0x44387161u, 0x889271ffu, 0x825778e6u, 0x4efd7878u, 0xc0727f9bu, 0x0cd87f05u, - 0xd5f86da9u, 0x19526d37u, 0x97dd6ad4u, 0x5b776a4au, 0x51b26353u, 0x9d1863cdu, 0x1397642eu, 0xdf3d64b0u, - 0x83d02561u, 0x4f7a25ffu, 0xc1f5221cu, 0x0d5f2282u, 0x079a2b9bu, 0xcb302b05u, 0x45bf2ce6u, 0x89152c78u, - 0x50353ed4u, 0x9c9f3e4au, 0x121039a9u, 0xdeba3937u, 0xd47f302eu, 0x18d530b0u, 0x965a3753u, 0x5af037cdu, - 0xff6b144au, 0x33c114d4u, 0xbd4e1337u, 0x71e413a9u, 0x7b211ab0u, 0xb78b1a2eu, 0x39041dcdu, 0xf5ae1d53u, - 0x2c8e0fffu, 0xe0240f61u, 0x6eab0882u, 0xa201081cu, 0xa8c40105u, 0x646e019bu, 0xeae10678u, 0x264b06e6u -}; +static const unsigned lodepng_crc32_table0[256] = {0x00000000u, 0x77073096u, 0xee0e612cu, + 0x990951bau, 0x076dc419u, 0x706af48fu, 0xe963a535u, 0x9e6495a3u, 0x0edb8832u, 0x79dcb8a4u, + 0xe0d5e91eu, 0x97d2d988u, 0x09b64c2bu, 0x7eb17cbdu, 0xe7b82d07u, 0x90bf1d91u, 0x1db71064u, + 0x6ab020f2u, 0xf3b97148u, 0x84be41deu, 0x1adad47du, 0x6ddde4ebu, 0xf4d4b551u, 0x83d385c7u, + 0x136c9856u, 0x646ba8c0u, 0xfd62f97au, 0x8a65c9ecu, 0x14015c4fu, 0x63066cd9u, 0xfa0f3d63u, + 0x8d080df5u, 0x3b6e20c8u, 0x4c69105eu, 0xd56041e4u, 0xa2677172u, 0x3c03e4d1u, 0x4b04d447u, + 0xd20d85fdu, 0xa50ab56bu, 0x35b5a8fau, 0x42b2986cu, 0xdbbbc9d6u, 0xacbcf940u, 0x32d86ce3u, + 0x45df5c75u, 0xdcd60dcfu, 0xabd13d59u, 0x26d930acu, 0x51de003au, 0xc8d75180u, 0xbfd06116u, + 0x21b4f4b5u, 0x56b3c423u, 0xcfba9599u, 0xb8bda50fu, 0x2802b89eu, 0x5f058808u, 0xc60cd9b2u, + 0xb10be924u, 0x2f6f7c87u, 0x58684c11u, 0xc1611dabu, 0xb6662d3du, 0x76dc4190u, 0x01db7106u, + 0x98d220bcu, 0xefd5102au, 0x71b18589u, 0x06b6b51fu, 0x9fbfe4a5u, 0xe8b8d433u, 0x7807c9a2u, + 0x0f00f934u, 0x9609a88eu, 0xe10e9818u, 0x7f6a0dbbu, 0x086d3d2du, 0x91646c97u, 0xe6635c01u, + 0x6b6b51f4u, 0x1c6c6162u, 0x856530d8u, 0xf262004eu, 0x6c0695edu, 0x1b01a57bu, 0x8208f4c1u, + 0xf50fc457u, 0x65b0d9c6u, 0x12b7e950u, 0x8bbeb8eau, 0xfcb9887cu, 0x62dd1ddfu, 0x15da2d49u, + 0x8cd37cf3u, 0xfbd44c65u, 0x4db26158u, 0x3ab551ceu, 0xa3bc0074u, 0xd4bb30e2u, 0x4adfa541u, + 0x3dd895d7u, 0xa4d1c46du, 0xd3d6f4fbu, 0x4369e96au, 0x346ed9fcu, 0xad678846u, 0xda60b8d0u, + 0x44042d73u, 0x33031de5u, 0xaa0a4c5fu, 0xdd0d7cc9u, 0x5005713cu, 0x270241aau, 0xbe0b1010u, + 0xc90c2086u, 0x5768b525u, 0x206f85b3u, 0xb966d409u, 0xce61e49fu, 0x5edef90eu, 0x29d9c998u, + 0xb0d09822u, 0xc7d7a8b4u, 0x59b33d17u, 0x2eb40d81u, 0xb7bd5c3bu, 0xc0ba6cadu, 0xedb88320u, + 0x9abfb3b6u, 0x03b6e20cu, 0x74b1d29au, 0xead54739u, 0x9dd277afu, 0x04db2615u, 0x73dc1683u, + 0xe3630b12u, 0x94643b84u, 0x0d6d6a3eu, 0x7a6a5aa8u, 0xe40ecf0bu, 0x9309ff9du, 0x0a00ae27u, + 0x7d079eb1u, 0xf00f9344u, 0x8708a3d2u, 0x1e01f268u, 0x6906c2feu, 0xf762575du, 0x806567cbu, + 0x196c3671u, 0x6e6b06e7u, 0xfed41b76u, 0x89d32be0u, 0x10da7a5au, 0x67dd4accu, 0xf9b9df6fu, + 0x8ebeeff9u, 0x17b7be43u, 0x60b08ed5u, 0xd6d6a3e8u, 0xa1d1937eu, 0x38d8c2c4u, 0x4fdff252u, + 0xd1bb67f1u, 0xa6bc5767u, 0x3fb506ddu, 0x48b2364bu, 0xd80d2bdau, 0xaf0a1b4cu, 0x36034af6u, + 0x41047a60u, 0xdf60efc3u, 0xa867df55u, 0x316e8eefu, 0x4669be79u, 0xcb61b38cu, 0xbc66831au, + 0x256fd2a0u, 0x5268e236u, 0xcc0c7795u, 0xbb0b4703u, 0x220216b9u, 0x5505262fu, 0xc5ba3bbeu, + 0xb2bd0b28u, 0x2bb45a92u, 0x5cb36a04u, 0xc2d7ffa7u, 0xb5d0cf31u, 0x2cd99e8bu, 0x5bdeae1du, + 0x9b64c2b0u, 0xec63f226u, 0x756aa39cu, 0x026d930au, 0x9c0906a9u, 0xeb0e363fu, 0x72076785u, + 0x05005713u, 0x95bf4a82u, 0xe2b87a14u, 0x7bb12baeu, 0x0cb61b38u, 0x92d28e9bu, 0xe5d5be0du, + 0x7cdcefb7u, 0x0bdbdf21u, 0x86d3d2d4u, 0xf1d4e242u, 0x68ddb3f8u, 0x1fda836eu, 0x81be16cdu, + 0xf6b9265bu, 0x6fb077e1u, 0x18b74777u, 0x88085ae6u, 0xff0f6a70u, 0x66063bcau, 0x11010b5cu, + 0x8f659effu, 0xf862ae69u, 0x616bffd3u, 0x166ccf45u, 0xa00ae278u, 0xd70dd2eeu, 0x4e048354u, + 0x3903b3c2u, 0xa7672661u, 0xd06016f7u, 0x4969474du, 0x3e6e77dbu, 0xaed16a4au, 0xd9d65adcu, + 0x40df0b66u, 0x37d83bf0u, 0xa9bcae53u, 0xdebb9ec5u, 0x47b2cf7fu, 0x30b5ffe9u, 0xbdbdf21cu, + 0xcabac28au, 0x53b39330u, 0x24b4a3a6u, 0xbad03605u, 0xcdd70693u, 0x54de5729u, 0x23d967bfu, + 0xb3667a2eu, 0xc4614ab8u, 0x5d681b02u, 0x2a6f2b94u, 0xb40bbe37u, 0xc30c8ea1u, 0x5a05df1bu, + 0x2d02ef8du}; + +static const unsigned lodepng_crc32_table1[256] = {0x00000000u, 0x191b3141u, 0x32366282u, + 0x2b2d53c3u, 0x646cc504u, 0x7d77f445u, 0x565aa786u, 0x4f4196c7u, 0xc8d98a08u, 0xd1c2bb49u, + 0xfaefe88au, 0xe3f4d9cbu, 0xacb54f0cu, 0xb5ae7e4du, 0x9e832d8eu, 0x87981ccfu, 0x4ac21251u, + 0x53d92310u, 0x78f470d3u, 0x61ef4192u, 0x2eaed755u, 0x37b5e614u, 0x1c98b5d7u, 0x05838496u, + 0x821b9859u, 0x9b00a918u, 0xb02dfadbu, 0xa936cb9au, 0xe6775d5du, 0xff6c6c1cu, 0xd4413fdfu, + 0xcd5a0e9eu, 0x958424a2u, 0x8c9f15e3u, 0xa7b24620u, 0xbea97761u, 0xf1e8e1a6u, 0xe8f3d0e7u, + 0xc3de8324u, 0xdac5b265u, 0x5d5daeaau, 0x44469febu, 0x6f6bcc28u, 0x7670fd69u, 0x39316baeu, + 0x202a5aefu, 0x0b07092cu, 0x121c386du, 0xdf4636f3u, 0xc65d07b2u, 0xed705471u, 0xf46b6530u, + 0xbb2af3f7u, 0xa231c2b6u, 0x891c9175u, 0x9007a034u, 0x179fbcfbu, 0x0e848dbau, 0x25a9de79u, + 0x3cb2ef38u, 0x73f379ffu, 0x6ae848beu, 0x41c51b7du, 0x58de2a3cu, 0xf0794f05u, 0xe9627e44u, + 0xc24f2d87u, 0xdb541cc6u, 0x94158a01u, 0x8d0ebb40u, 0xa623e883u, 0xbf38d9c2u, 0x38a0c50du, + 0x21bbf44cu, 0x0a96a78fu, 0x138d96ceu, 0x5ccc0009u, 0x45d73148u, 0x6efa628bu, 0x77e153cau, + 0xbabb5d54u, 0xa3a06c15u, 0x888d3fd6u, 0x91960e97u, 0xded79850u, 0xc7cca911u, 0xece1fad2u, + 0xf5facb93u, 0x7262d75cu, 0x6b79e61du, 0x4054b5deu, 0x594f849fu, 0x160e1258u, 0x0f152319u, + 0x243870dau, 0x3d23419bu, 0x65fd6ba7u, 0x7ce65ae6u, 0x57cb0925u, 0x4ed03864u, 0x0191aea3u, + 0x188a9fe2u, 0x33a7cc21u, 0x2abcfd60u, 0xad24e1afu, 0xb43fd0eeu, 0x9f12832du, 0x8609b26cu, + 0xc94824abu, 0xd05315eau, 0xfb7e4629u, 0xe2657768u, 0x2f3f79f6u, 0x362448b7u, 0x1d091b74u, + 0x04122a35u, 0x4b53bcf2u, 0x52488db3u, 0x7965de70u, 0x607eef31u, 0xe7e6f3feu, 0xfefdc2bfu, + 0xd5d0917cu, 0xcccba03du, 0x838a36fau, 0x9a9107bbu, 0xb1bc5478u, 0xa8a76539u, 0x3b83984bu, + 0x2298a90au, 0x09b5fac9u, 0x10aecb88u, 0x5fef5d4fu, 0x46f46c0eu, 0x6dd93fcdu, 0x74c20e8cu, + 0xf35a1243u, 0xea412302u, 0xc16c70c1u, 0xd8774180u, 0x9736d747u, 0x8e2de606u, 0xa500b5c5u, + 0xbc1b8484u, 0x71418a1au, 0x685abb5bu, 0x4377e898u, 0x5a6cd9d9u, 0x152d4f1eu, 0x0c367e5fu, + 0x271b2d9cu, 0x3e001cddu, 0xb9980012u, 0xa0833153u, 0x8bae6290u, 0x92b553d1u, 0xddf4c516u, + 0xc4eff457u, 0xefc2a794u, 0xf6d996d5u, 0xae07bce9u, 0xb71c8da8u, 0x9c31de6bu, 0x852aef2au, + 0xca6b79edu, 0xd37048acu, 0xf85d1b6fu, 0xe1462a2eu, 0x66de36e1u, 0x7fc507a0u, 0x54e85463u, + 0x4df36522u, 0x02b2f3e5u, 0x1ba9c2a4u, 0x30849167u, 0x299fa026u, 0xe4c5aeb8u, 0xfdde9ff9u, + 0xd6f3cc3au, 0xcfe8fd7bu, 0x80a96bbcu, 0x99b25afdu, 0xb29f093eu, 0xab84387fu, 0x2c1c24b0u, + 0x350715f1u, 0x1e2a4632u, 0x07317773u, 0x4870e1b4u, 0x516bd0f5u, 0x7a468336u, 0x635db277u, + 0xcbfad74eu, 0xd2e1e60fu, 0xf9ccb5ccu, 0xe0d7848du, 0xaf96124au, 0xb68d230bu, 0x9da070c8u, + 0x84bb4189u, 0x03235d46u, 0x1a386c07u, 0x31153fc4u, 0x280e0e85u, 0x674f9842u, 0x7e54a903u, + 0x5579fac0u, 0x4c62cb81u, 0x8138c51fu, 0x9823f45eu, 0xb30ea79du, 0xaa1596dcu, 0xe554001bu, + 0xfc4f315au, 0xd7626299u, 0xce7953d8u, 0x49e14f17u, 0x50fa7e56u, 0x7bd72d95u, 0x62cc1cd4u, + 0x2d8d8a13u, 0x3496bb52u, 0x1fbbe891u, 0x06a0d9d0u, 0x5e7ef3ecu, 0x4765c2adu, 0x6c48916eu, + 0x7553a02fu, 0x3a1236e8u, 0x230907a9u, 0x0824546au, 0x113f652bu, 0x96a779e4u, 0x8fbc48a5u, + 0xa4911b66u, 0xbd8a2a27u, 0xf2cbbce0u, 0xebd08da1u, 0xc0fdde62u, 0xd9e6ef23u, 0x14bce1bdu, + 0x0da7d0fcu, 0x268a833fu, 0x3f91b27eu, 0x70d024b9u, 0x69cb15f8u, 0x42e6463bu, 0x5bfd777au, + 0xdc656bb5u, 0xc57e5af4u, 0xee530937u, 0xf7483876u, 0xb809aeb1u, 0xa1129ff0u, 0x8a3fcc33u, + 0x9324fd72u}; + +static const unsigned lodepng_crc32_table2[256] = {0x00000000u, 0x01c26a37u, 0x0384d46eu, + 0x0246be59u, 0x0709a8dcu, 0x06cbc2ebu, 0x048d7cb2u, 0x054f1685u, 0x0e1351b8u, 0x0fd13b8fu, + 0x0d9785d6u, 0x0c55efe1u, 0x091af964u, 0x08d89353u, 0x0a9e2d0au, 0x0b5c473du, 0x1c26a370u, + 0x1de4c947u, 0x1fa2771eu, 0x1e601d29u, 0x1b2f0bacu, 0x1aed619bu, 0x18abdfc2u, 0x1969b5f5u, + 0x1235f2c8u, 0x13f798ffu, 0x11b126a6u, 0x10734c91u, 0x153c5a14u, 0x14fe3023u, 0x16b88e7au, + 0x177ae44du, 0x384d46e0u, 0x398f2cd7u, 0x3bc9928eu, 0x3a0bf8b9u, 0x3f44ee3cu, 0x3e86840bu, + 0x3cc03a52u, 0x3d025065u, 0x365e1758u, 0x379c7d6fu, 0x35dac336u, 0x3418a901u, 0x3157bf84u, + 0x3095d5b3u, 0x32d36beau, 0x331101ddu, 0x246be590u, 0x25a98fa7u, 0x27ef31feu, 0x262d5bc9u, + 0x23624d4cu, 0x22a0277bu, 0x20e69922u, 0x2124f315u, 0x2a78b428u, 0x2bbade1fu, 0x29fc6046u, + 0x283e0a71u, 0x2d711cf4u, 0x2cb376c3u, 0x2ef5c89au, 0x2f37a2adu, 0x709a8dc0u, 0x7158e7f7u, + 0x731e59aeu, 0x72dc3399u, 0x7793251cu, 0x76514f2bu, 0x7417f172u, 0x75d59b45u, 0x7e89dc78u, + 0x7f4bb64fu, 0x7d0d0816u, 0x7ccf6221u, 0x798074a4u, 0x78421e93u, 0x7a04a0cau, 0x7bc6cafdu, + 0x6cbc2eb0u, 0x6d7e4487u, 0x6f38fadeu, 0x6efa90e9u, 0x6bb5866cu, 0x6a77ec5bu, 0x68315202u, + 0x69f33835u, 0x62af7f08u, 0x636d153fu, 0x612bab66u, 0x60e9c151u, 0x65a6d7d4u, 0x6464bde3u, + 0x662203bau, 0x67e0698du, 0x48d7cb20u, 0x4915a117u, 0x4b531f4eu, 0x4a917579u, 0x4fde63fcu, + 0x4e1c09cbu, 0x4c5ab792u, 0x4d98dda5u, 0x46c49a98u, 0x4706f0afu, 0x45404ef6u, 0x448224c1u, + 0x41cd3244u, 0x400f5873u, 0x4249e62au, 0x438b8c1du, 0x54f16850u, 0x55330267u, 0x5775bc3eu, + 0x56b7d609u, 0x53f8c08cu, 0x523aaabbu, 0x507c14e2u, 0x51be7ed5u, 0x5ae239e8u, 0x5b2053dfu, + 0x5966ed86u, 0x58a487b1u, 0x5deb9134u, 0x5c29fb03u, 0x5e6f455au, 0x5fad2f6du, 0xe1351b80u, + 0xe0f771b7u, 0xe2b1cfeeu, 0xe373a5d9u, 0xe63cb35cu, 0xe7fed96bu, 0xe5b86732u, 0xe47a0d05u, + 0xef264a38u, 0xeee4200fu, 0xeca29e56u, 0xed60f461u, 0xe82fe2e4u, 0xe9ed88d3u, 0xebab368au, + 0xea695cbdu, 0xfd13b8f0u, 0xfcd1d2c7u, 0xfe976c9eu, 0xff5506a9u, 0xfa1a102cu, 0xfbd87a1bu, + 0xf99ec442u, 0xf85cae75u, 0xf300e948u, 0xf2c2837fu, 0xf0843d26u, 0xf1465711u, 0xf4094194u, + 0xf5cb2ba3u, 0xf78d95fau, 0xf64fffcdu, 0xd9785d60u, 0xd8ba3757u, 0xdafc890eu, 0xdb3ee339u, + 0xde71f5bcu, 0xdfb39f8bu, 0xddf521d2u, 0xdc374be5u, 0xd76b0cd8u, 0xd6a966efu, 0xd4efd8b6u, + 0xd52db281u, 0xd062a404u, 0xd1a0ce33u, 0xd3e6706au, 0xd2241a5du, 0xc55efe10u, 0xc49c9427u, + 0xc6da2a7eu, 0xc7184049u, 0xc25756ccu, 0xc3953cfbu, 0xc1d382a2u, 0xc011e895u, 0xcb4dafa8u, + 0xca8fc59fu, 0xc8c97bc6u, 0xc90b11f1u, 0xcc440774u, 0xcd866d43u, 0xcfc0d31au, 0xce02b92du, + 0x91af9640u, 0x906dfc77u, 0x922b422eu, 0x93e92819u, 0x96a63e9cu, 0x976454abu, 0x9522eaf2u, + 0x94e080c5u, 0x9fbcc7f8u, 0x9e7eadcfu, 0x9c381396u, 0x9dfa79a1u, 0x98b56f24u, 0x99770513u, + 0x9b31bb4au, 0x9af3d17du, 0x8d893530u, 0x8c4b5f07u, 0x8e0de15eu, 0x8fcf8b69u, 0x8a809decu, + 0x8b42f7dbu, 0x89044982u, 0x88c623b5u, 0x839a6488u, 0x82580ebfu, 0x801eb0e6u, 0x81dcdad1u, + 0x8493cc54u, 0x8551a663u, 0x8717183au, 0x86d5720du, 0xa9e2d0a0u, 0xa820ba97u, 0xaa6604ceu, + 0xaba46ef9u, 0xaeeb787cu, 0xaf29124bu, 0xad6fac12u, 0xacadc625u, 0xa7f18118u, 0xa633eb2fu, + 0xa4755576u, 0xa5b73f41u, 0xa0f829c4u, 0xa13a43f3u, 0xa37cfdaau, 0xa2be979du, 0xb5c473d0u, + 0xb40619e7u, 0xb640a7beu, 0xb782cd89u, 0xb2cddb0cu, 0xb30fb13bu, 0xb1490f62u, 0xb08b6555u, + 0xbbd72268u, 0xba15485fu, 0xb853f606u, 0xb9919c31u, 0xbcde8ab4u, 0xbd1ce083u, 0xbf5a5edau, + 0xbe9834edu}; + +static const unsigned lodepng_crc32_table3[256] = {0x00000000u, 0xb8bc6765u, 0xaa09c88bu, + 0x12b5afeeu, 0x8f629757u, 0x37def032u, 0x256b5fdcu, 0x9dd738b9u, 0xc5b428efu, 0x7d084f8au, + 0x6fbde064u, 0xd7018701u, 0x4ad6bfb8u, 0xf26ad8ddu, 0xe0df7733u, 0x58631056u, 0x5019579fu, + 0xe8a530fau, 0xfa109f14u, 0x42acf871u, 0xdf7bc0c8u, 0x67c7a7adu, 0x75720843u, 0xcdce6f26u, + 0x95ad7f70u, 0x2d111815u, 0x3fa4b7fbu, 0x8718d09eu, 0x1acfe827u, 0xa2738f42u, 0xb0c620acu, + 0x087a47c9u, 0xa032af3eu, 0x188ec85bu, 0x0a3b67b5u, 0xb28700d0u, 0x2f503869u, 0x97ec5f0cu, + 0x8559f0e2u, 0x3de59787u, 0x658687d1u, 0xdd3ae0b4u, 0xcf8f4f5au, 0x7733283fu, 0xeae41086u, + 0x525877e3u, 0x40edd80du, 0xf851bf68u, 0xf02bf8a1u, 0x48979fc4u, 0x5a22302au, 0xe29e574fu, + 0x7f496ff6u, 0xc7f50893u, 0xd540a77du, 0x6dfcc018u, 0x359fd04eu, 0x8d23b72bu, 0x9f9618c5u, + 0x272a7fa0u, 0xbafd4719u, 0x0241207cu, 0x10f48f92u, 0xa848e8f7u, 0x9b14583du, 0x23a83f58u, + 0x311d90b6u, 0x89a1f7d3u, 0x1476cf6au, 0xaccaa80fu, 0xbe7f07e1u, 0x06c36084u, 0x5ea070d2u, + 0xe61c17b7u, 0xf4a9b859u, 0x4c15df3cu, 0xd1c2e785u, 0x697e80e0u, 0x7bcb2f0eu, 0xc377486bu, + 0xcb0d0fa2u, 0x73b168c7u, 0x6104c729u, 0xd9b8a04cu, 0x446f98f5u, 0xfcd3ff90u, 0xee66507eu, + 0x56da371bu, 0x0eb9274du, 0xb6054028u, 0xa4b0efc6u, 0x1c0c88a3u, 0x81dbb01au, 0x3967d77fu, + 0x2bd27891u, 0x936e1ff4u, 0x3b26f703u, 0x839a9066u, 0x912f3f88u, 0x299358edu, 0xb4446054u, + 0x0cf80731u, 0x1e4da8dfu, 0xa6f1cfbau, 0xfe92dfecu, 0x462eb889u, 0x549b1767u, 0xec277002u, + 0x71f048bbu, 0xc94c2fdeu, 0xdbf98030u, 0x6345e755u, 0x6b3fa09cu, 0xd383c7f9u, 0xc1366817u, + 0x798a0f72u, 0xe45d37cbu, 0x5ce150aeu, 0x4e54ff40u, 0xf6e89825u, 0xae8b8873u, 0x1637ef16u, + 0x048240f8u, 0xbc3e279du, 0x21e91f24u, 0x99557841u, 0x8be0d7afu, 0x335cb0cau, 0xed59b63bu, + 0x55e5d15eu, 0x47507eb0u, 0xffec19d5u, 0x623b216cu, 0xda874609u, 0xc832e9e7u, 0x708e8e82u, + 0x28ed9ed4u, 0x9051f9b1u, 0x82e4565fu, 0x3a58313au, 0xa78f0983u, 0x1f336ee6u, 0x0d86c108u, + 0xb53aa66du, 0xbd40e1a4u, 0x05fc86c1u, 0x1749292fu, 0xaff54e4au, 0x322276f3u, 0x8a9e1196u, + 0x982bbe78u, 0x2097d91du, 0x78f4c94bu, 0xc048ae2eu, 0xd2fd01c0u, 0x6a4166a5u, 0xf7965e1cu, + 0x4f2a3979u, 0x5d9f9697u, 0xe523f1f2u, 0x4d6b1905u, 0xf5d77e60u, 0xe762d18eu, 0x5fdeb6ebu, + 0xc2098e52u, 0x7ab5e937u, 0x680046d9u, 0xd0bc21bcu, 0x88df31eau, 0x3063568fu, 0x22d6f961u, + 0x9a6a9e04u, 0x07bda6bdu, 0xbf01c1d8u, 0xadb46e36u, 0x15080953u, 0x1d724e9au, 0xa5ce29ffu, + 0xb77b8611u, 0x0fc7e174u, 0x9210d9cdu, 0x2aacbea8u, 0x38191146u, 0x80a57623u, 0xd8c66675u, + 0x607a0110u, 0x72cfaefeu, 0xca73c99bu, 0x57a4f122u, 0xef189647u, 0xfdad39a9u, 0x45115eccu, + 0x764dee06u, 0xcef18963u, 0xdc44268du, 0x64f841e8u, 0xf92f7951u, 0x41931e34u, 0x5326b1dau, + 0xeb9ad6bfu, 0xb3f9c6e9u, 0x0b45a18cu, 0x19f00e62u, 0xa14c6907u, 0x3c9b51beu, 0x842736dbu, + 0x96929935u, 0x2e2efe50u, 0x2654b999u, 0x9ee8defcu, 0x8c5d7112u, 0x34e11677u, 0xa9362eceu, + 0x118a49abu, 0x033fe645u, 0xbb838120u, 0xe3e09176u, 0x5b5cf613u, 0x49e959fdu, 0xf1553e98u, + 0x6c820621u, 0xd43e6144u, 0xc68bceaau, 0x7e37a9cfu, 0xd67f4138u, 0x6ec3265du, 0x7c7689b3u, + 0xc4caeed6u, 0x591dd66fu, 0xe1a1b10au, 0xf3141ee4u, 0x4ba87981u, 0x13cb69d7u, 0xab770eb2u, + 0xb9c2a15cu, 0x017ec639u, 0x9ca9fe80u, 0x241599e5u, 0x36a0360bu, 0x8e1c516eu, 0x866616a7u, + 0x3eda71c2u, 0x2c6fde2cu, 0x94d3b949u, 0x090481f0u, 0xb1b8e695u, 0xa30d497bu, 0x1bb12e1eu, + 0x43d23e48u, 0xfb6e592du, 0xe9dbf6c3u, 0x516791a6u, 0xccb0a91fu, 0x740cce7au, 0x66b96194u, + 0xde0506f1u}; + +static const unsigned lodepng_crc32_table4[256] = {0x00000000u, 0x3d6029b0u, 0x7ac05360u, + 0x47a07ad0u, 0xf580a6c0u, 0xc8e08f70u, 0x8f40f5a0u, 0xb220dc10u, 0x30704bc1u, 0x0d106271u, + 0x4ab018a1u, 0x77d03111u, 0xc5f0ed01u, 0xf890c4b1u, 0xbf30be61u, 0x825097d1u, 0x60e09782u, + 0x5d80be32u, 0x1a20c4e2u, 0x2740ed52u, 0x95603142u, 0xa80018f2u, 0xefa06222u, 0xd2c04b92u, + 0x5090dc43u, 0x6df0f5f3u, 0x2a508f23u, 0x1730a693u, 0xa5107a83u, 0x98705333u, 0xdfd029e3u, + 0xe2b00053u, 0xc1c12f04u, 0xfca106b4u, 0xbb017c64u, 0x866155d4u, 0x344189c4u, 0x0921a074u, + 0x4e81daa4u, 0x73e1f314u, 0xf1b164c5u, 0xccd14d75u, 0x8b7137a5u, 0xb6111e15u, 0x0431c205u, + 0x3951ebb5u, 0x7ef19165u, 0x4391b8d5u, 0xa121b886u, 0x9c419136u, 0xdbe1ebe6u, 0xe681c256u, + 0x54a11e46u, 0x69c137f6u, 0x2e614d26u, 0x13016496u, 0x9151f347u, 0xac31daf7u, 0xeb91a027u, + 0xd6f18997u, 0x64d15587u, 0x59b17c37u, 0x1e1106e7u, 0x23712f57u, 0x58f35849u, 0x659371f9u, + 0x22330b29u, 0x1f532299u, 0xad73fe89u, 0x9013d739u, 0xd7b3ade9u, 0xead38459u, 0x68831388u, + 0x55e33a38u, 0x124340e8u, 0x2f236958u, 0x9d03b548u, 0xa0639cf8u, 0xe7c3e628u, 0xdaa3cf98u, + 0x3813cfcbu, 0x0573e67bu, 0x42d39cabu, 0x7fb3b51bu, 0xcd93690bu, 0xf0f340bbu, 0xb7533a6bu, + 0x8a3313dbu, 0x0863840au, 0x3503adbau, 0x72a3d76au, 0x4fc3fedau, 0xfde322cau, 0xc0830b7au, + 0x872371aau, 0xba43581au, 0x9932774du, 0xa4525efdu, 0xe3f2242du, 0xde920d9du, 0x6cb2d18du, + 0x51d2f83du, 0x167282edu, 0x2b12ab5du, 0xa9423c8cu, 0x9422153cu, 0xd3826fecu, 0xeee2465cu, + 0x5cc29a4cu, 0x61a2b3fcu, 0x2602c92cu, 0x1b62e09cu, 0xf9d2e0cfu, 0xc4b2c97fu, 0x8312b3afu, + 0xbe729a1fu, 0x0c52460fu, 0x31326fbfu, 0x7692156fu, 0x4bf23cdfu, 0xc9a2ab0eu, 0xf4c282beu, + 0xb362f86eu, 0x8e02d1deu, 0x3c220dceu, 0x0142247eu, 0x46e25eaeu, 0x7b82771eu, 0xb1e6b092u, + 0x8c869922u, 0xcb26e3f2u, 0xf646ca42u, 0x44661652u, 0x79063fe2u, 0x3ea64532u, 0x03c66c82u, + 0x8196fb53u, 0xbcf6d2e3u, 0xfb56a833u, 0xc6368183u, 0x74165d93u, 0x49767423u, 0x0ed60ef3u, + 0x33b62743u, 0xd1062710u, 0xec660ea0u, 0xabc67470u, 0x96a65dc0u, 0x248681d0u, 0x19e6a860u, + 0x5e46d2b0u, 0x6326fb00u, 0xe1766cd1u, 0xdc164561u, 0x9bb63fb1u, 0xa6d61601u, 0x14f6ca11u, + 0x2996e3a1u, 0x6e369971u, 0x5356b0c1u, 0x70279f96u, 0x4d47b626u, 0x0ae7ccf6u, 0x3787e546u, + 0x85a73956u, 0xb8c710e6u, 0xff676a36u, 0xc2074386u, 0x4057d457u, 0x7d37fde7u, 0x3a978737u, + 0x07f7ae87u, 0xb5d77297u, 0x88b75b27u, 0xcf1721f7u, 0xf2770847u, 0x10c70814u, 0x2da721a4u, + 0x6a075b74u, 0x576772c4u, 0xe547aed4u, 0xd8278764u, 0x9f87fdb4u, 0xa2e7d404u, 0x20b743d5u, + 0x1dd76a65u, 0x5a7710b5u, 0x67173905u, 0xd537e515u, 0xe857cca5u, 0xaff7b675u, 0x92979fc5u, + 0xe915e8dbu, 0xd475c16bu, 0x93d5bbbbu, 0xaeb5920bu, 0x1c954e1bu, 0x21f567abu, 0x66551d7bu, + 0x5b3534cbu, 0xd965a31au, 0xe4058aaau, 0xa3a5f07au, 0x9ec5d9cau, 0x2ce505dau, 0x11852c6au, + 0x562556bau, 0x6b457f0au, 0x89f57f59u, 0xb49556e9u, 0xf3352c39u, 0xce550589u, 0x7c75d999u, + 0x4115f029u, 0x06b58af9u, 0x3bd5a349u, 0xb9853498u, 0x84e51d28u, 0xc34567f8u, 0xfe254e48u, + 0x4c059258u, 0x7165bbe8u, 0x36c5c138u, 0x0ba5e888u, 0x28d4c7dfu, 0x15b4ee6fu, 0x521494bfu, + 0x6f74bd0fu, 0xdd54611fu, 0xe03448afu, 0xa794327fu, 0x9af41bcfu, 0x18a48c1eu, 0x25c4a5aeu, + 0x6264df7eu, 0x5f04f6ceu, 0xed242adeu, 0xd044036eu, 0x97e479beu, 0xaa84500eu, 0x4834505du, + 0x755479edu, 0x32f4033du, 0x0f942a8du, 0xbdb4f69du, 0x80d4df2du, 0xc774a5fdu, 0xfa148c4du, + 0x78441b9cu, 0x4524322cu, 0x028448fcu, 0x3fe4614cu, 0x8dc4bd5cu, 0xb0a494ecu, 0xf704ee3cu, + 0xca64c78cu}; + +static const unsigned lodepng_crc32_table5[256] = {0x00000000u, 0xcb5cd3a5u, 0x4dc8a10bu, + 0x869472aeu, 0x9b914216u, 0x50cd91b3u, 0xd659e31du, 0x1d0530b8u, 0xec53826du, 0x270f51c8u, + 0xa19b2366u, 0x6ac7f0c3u, 0x77c2c07bu, 0xbc9e13deu, 0x3a0a6170u, 0xf156b2d5u, 0x03d6029bu, + 0xc88ad13eu, 0x4e1ea390u, 0x85427035u, 0x9847408du, 0x531b9328u, 0xd58fe186u, 0x1ed33223u, + 0xef8580f6u, 0x24d95353u, 0xa24d21fdu, 0x6911f258u, 0x7414c2e0u, 0xbf481145u, 0x39dc63ebu, + 0xf280b04eu, 0x07ac0536u, 0xccf0d693u, 0x4a64a43du, 0x81387798u, 0x9c3d4720u, 0x57619485u, + 0xd1f5e62bu, 0x1aa9358eu, 0xebff875bu, 0x20a354feu, 0xa6372650u, 0x6d6bf5f5u, 0x706ec54du, + 0xbb3216e8u, 0x3da66446u, 0xf6fab7e3u, 0x047a07adu, 0xcf26d408u, 0x49b2a6a6u, 0x82ee7503u, + 0x9feb45bbu, 0x54b7961eu, 0xd223e4b0u, 0x197f3715u, 0xe82985c0u, 0x23755665u, 0xa5e124cbu, + 0x6ebdf76eu, 0x73b8c7d6u, 0xb8e41473u, 0x3e7066ddu, 0xf52cb578u, 0x0f580a6cu, 0xc404d9c9u, + 0x4290ab67u, 0x89cc78c2u, 0x94c9487au, 0x5f959bdfu, 0xd901e971u, 0x125d3ad4u, 0xe30b8801u, + 0x28575ba4u, 0xaec3290au, 0x659ffaafu, 0x789aca17u, 0xb3c619b2u, 0x35526b1cu, 0xfe0eb8b9u, + 0x0c8e08f7u, 0xc7d2db52u, 0x4146a9fcu, 0x8a1a7a59u, 0x971f4ae1u, 0x5c439944u, 0xdad7ebeau, + 0x118b384fu, 0xe0dd8a9au, 0x2b81593fu, 0xad152b91u, 0x6649f834u, 0x7b4cc88cu, 0xb0101b29u, + 0x36846987u, 0xfdd8ba22u, 0x08f40f5au, 0xc3a8dcffu, 0x453cae51u, 0x8e607df4u, 0x93654d4cu, + 0x58399ee9u, 0xdeadec47u, 0x15f13fe2u, 0xe4a78d37u, 0x2ffb5e92u, 0xa96f2c3cu, 0x6233ff99u, + 0x7f36cf21u, 0xb46a1c84u, 0x32fe6e2au, 0xf9a2bd8fu, 0x0b220dc1u, 0xc07ede64u, 0x46eaaccau, + 0x8db67f6fu, 0x90b34fd7u, 0x5bef9c72u, 0xdd7beedcu, 0x16273d79u, 0xe7718facu, 0x2c2d5c09u, + 0xaab92ea7u, 0x61e5fd02u, 0x7ce0cdbau, 0xb7bc1e1fu, 0x31286cb1u, 0xfa74bf14u, 0x1eb014d8u, + 0xd5ecc77du, 0x5378b5d3u, 0x98246676u, 0x852156ceu, 0x4e7d856bu, 0xc8e9f7c5u, 0x03b52460u, + 0xf2e396b5u, 0x39bf4510u, 0xbf2b37beu, 0x7477e41bu, 0x6972d4a3u, 0xa22e0706u, 0x24ba75a8u, + 0xefe6a60du, 0x1d661643u, 0xd63ac5e6u, 0x50aeb748u, 0x9bf264edu, 0x86f75455u, 0x4dab87f0u, + 0xcb3ff55eu, 0x006326fbu, 0xf135942eu, 0x3a69478bu, 0xbcfd3525u, 0x77a1e680u, 0x6aa4d638u, + 0xa1f8059du, 0x276c7733u, 0xec30a496u, 0x191c11eeu, 0xd240c24bu, 0x54d4b0e5u, 0x9f886340u, + 0x828d53f8u, 0x49d1805du, 0xcf45f2f3u, 0x04192156u, 0xf54f9383u, 0x3e134026u, 0xb8873288u, + 0x73dbe12du, 0x6eded195u, 0xa5820230u, 0x2316709eu, 0xe84aa33bu, 0x1aca1375u, 0xd196c0d0u, + 0x5702b27eu, 0x9c5e61dbu, 0x815b5163u, 0x4a0782c6u, 0xcc93f068u, 0x07cf23cdu, 0xf6999118u, + 0x3dc542bdu, 0xbb513013u, 0x700de3b6u, 0x6d08d30eu, 0xa65400abu, 0x20c07205u, 0xeb9ca1a0u, + 0x11e81eb4u, 0xdab4cd11u, 0x5c20bfbfu, 0x977c6c1au, 0x8a795ca2u, 0x41258f07u, 0xc7b1fda9u, + 0x0ced2e0cu, 0xfdbb9cd9u, 0x36e74f7cu, 0xb0733dd2u, 0x7b2fee77u, 0x662adecfu, 0xad760d6au, + 0x2be27fc4u, 0xe0beac61u, 0x123e1c2fu, 0xd962cf8au, 0x5ff6bd24u, 0x94aa6e81u, 0x89af5e39u, + 0x42f38d9cu, 0xc467ff32u, 0x0f3b2c97u, 0xfe6d9e42u, 0x35314de7u, 0xb3a53f49u, 0x78f9ececu, + 0x65fcdc54u, 0xaea00ff1u, 0x28347d5fu, 0xe368aefau, 0x16441b82u, 0xdd18c827u, 0x5b8cba89u, + 0x90d0692cu, 0x8dd55994u, 0x46898a31u, 0xc01df89fu, 0x0b412b3au, 0xfa1799efu, 0x314b4a4au, + 0xb7df38e4u, 0x7c83eb41u, 0x6186dbf9u, 0xaada085cu, 0x2c4e7af2u, 0xe712a957u, 0x15921919u, + 0xdececabcu, 0x585ab812u, 0x93066bb7u, 0x8e035b0fu, 0x455f88aau, 0xc3cbfa04u, 0x089729a1u, + 0xf9c19b74u, 0x329d48d1u, 0xb4093a7fu, 0x7f55e9dau, 0x6250d962u, 0xa90c0ac7u, 0x2f987869u, + 0xe4c4abccu}; + +static const unsigned lodepng_crc32_table6[256] = {0x00000000u, 0xa6770bb4u, 0x979f1129u, + 0x31e81a9du, 0xf44f2413u, 0x52382fa7u, 0x63d0353au, 0xc5a73e8eu, 0x33ef4e67u, 0x959845d3u, + 0xa4705f4eu, 0x020754fau, 0xc7a06a74u, 0x61d761c0u, 0x503f7b5du, 0xf64870e9u, 0x67de9cceu, + 0xc1a9977au, 0xf0418de7u, 0x56368653u, 0x9391b8ddu, 0x35e6b369u, 0x040ea9f4u, 0xa279a240u, + 0x5431d2a9u, 0xf246d91du, 0xc3aec380u, 0x65d9c834u, 0xa07ef6bau, 0x0609fd0eu, 0x37e1e793u, + 0x9196ec27u, 0xcfbd399cu, 0x69ca3228u, 0x582228b5u, 0xfe552301u, 0x3bf21d8fu, 0x9d85163bu, + 0xac6d0ca6u, 0x0a1a0712u, 0xfc5277fbu, 0x5a257c4fu, 0x6bcd66d2u, 0xcdba6d66u, 0x081d53e8u, + 0xae6a585cu, 0x9f8242c1u, 0x39f54975u, 0xa863a552u, 0x0e14aee6u, 0x3ffcb47bu, 0x998bbfcfu, + 0x5c2c8141u, 0xfa5b8af5u, 0xcbb39068u, 0x6dc49bdcu, 0x9b8ceb35u, 0x3dfbe081u, 0x0c13fa1cu, + 0xaa64f1a8u, 0x6fc3cf26u, 0xc9b4c492u, 0xf85cde0fu, 0x5e2bd5bbu, 0x440b7579u, 0xe27c7ecdu, + 0xd3946450u, 0x75e36fe4u, 0xb044516au, 0x16335adeu, 0x27db4043u, 0x81ac4bf7u, 0x77e43b1eu, + 0xd19330aau, 0xe07b2a37u, 0x460c2183u, 0x83ab1f0du, 0x25dc14b9u, 0x14340e24u, 0xb2430590u, + 0x23d5e9b7u, 0x85a2e203u, 0xb44af89eu, 0x123df32au, 0xd79acda4u, 0x71edc610u, 0x4005dc8du, + 0xe672d739u, 0x103aa7d0u, 0xb64dac64u, 0x87a5b6f9u, 0x21d2bd4du, 0xe47583c3u, 0x42028877u, + 0x73ea92eau, 0xd59d995eu, 0x8bb64ce5u, 0x2dc14751u, 0x1c295dccu, 0xba5e5678u, 0x7ff968f6u, + 0xd98e6342u, 0xe86679dfu, 0x4e11726bu, 0xb8590282u, 0x1e2e0936u, 0x2fc613abu, 0x89b1181fu, + 0x4c162691u, 0xea612d25u, 0xdb8937b8u, 0x7dfe3c0cu, 0xec68d02bu, 0x4a1fdb9fu, 0x7bf7c102u, + 0xdd80cab6u, 0x1827f438u, 0xbe50ff8cu, 0x8fb8e511u, 0x29cfeea5u, 0xdf879e4cu, 0x79f095f8u, + 0x48188f65u, 0xee6f84d1u, 0x2bc8ba5fu, 0x8dbfb1ebu, 0xbc57ab76u, 0x1a20a0c2u, 0x8816eaf2u, + 0x2e61e146u, 0x1f89fbdbu, 0xb9fef06fu, 0x7c59cee1u, 0xda2ec555u, 0xebc6dfc8u, 0x4db1d47cu, + 0xbbf9a495u, 0x1d8eaf21u, 0x2c66b5bcu, 0x8a11be08u, 0x4fb68086u, 0xe9c18b32u, 0xd82991afu, + 0x7e5e9a1bu, 0xefc8763cu, 0x49bf7d88u, 0x78576715u, 0xde206ca1u, 0x1b87522fu, 0xbdf0599bu, + 0x8c184306u, 0x2a6f48b2u, 0xdc27385bu, 0x7a5033efu, 0x4bb82972u, 0xedcf22c6u, 0x28681c48u, + 0x8e1f17fcu, 0xbff70d61u, 0x198006d5u, 0x47abd36eu, 0xe1dcd8dau, 0xd034c247u, 0x7643c9f3u, + 0xb3e4f77du, 0x1593fcc9u, 0x247be654u, 0x820cede0u, 0x74449d09u, 0xd23396bdu, 0xe3db8c20u, + 0x45ac8794u, 0x800bb91au, 0x267cb2aeu, 0x1794a833u, 0xb1e3a387u, 0x20754fa0u, 0x86024414u, + 0xb7ea5e89u, 0x119d553du, 0xd43a6bb3u, 0x724d6007u, 0x43a57a9au, 0xe5d2712eu, 0x139a01c7u, + 0xb5ed0a73u, 0x840510eeu, 0x22721b5au, 0xe7d525d4u, 0x41a22e60u, 0x704a34fdu, 0xd63d3f49u, + 0xcc1d9f8bu, 0x6a6a943fu, 0x5b828ea2u, 0xfdf58516u, 0x3852bb98u, 0x9e25b02cu, 0xafcdaab1u, + 0x09baa105u, 0xfff2d1ecu, 0x5985da58u, 0x686dc0c5u, 0xce1acb71u, 0x0bbdf5ffu, 0xadcafe4bu, + 0x9c22e4d6u, 0x3a55ef62u, 0xabc30345u, 0x0db408f1u, 0x3c5c126cu, 0x9a2b19d8u, 0x5f8c2756u, + 0xf9fb2ce2u, 0xc813367fu, 0x6e643dcbu, 0x982c4d22u, 0x3e5b4696u, 0x0fb35c0bu, 0xa9c457bfu, + 0x6c636931u, 0xca146285u, 0xfbfc7818u, 0x5d8b73acu, 0x03a0a617u, 0xa5d7ada3u, 0x943fb73eu, + 0x3248bc8au, 0xf7ef8204u, 0x519889b0u, 0x6070932du, 0xc6079899u, 0x304fe870u, 0x9638e3c4u, + 0xa7d0f959u, 0x01a7f2edu, 0xc400cc63u, 0x6277c7d7u, 0x539fdd4au, 0xf5e8d6feu, 0x647e3ad9u, + 0xc209316du, 0xf3e12bf0u, 0x55962044u, 0x90311ecau, 0x3646157eu, 0x07ae0fe3u, 0xa1d90457u, + 0x579174beu, 0xf1e67f0au, 0xc00e6597u, 0x66796e23u, 0xa3de50adu, 0x05a95b19u, 0x34414184u, + 0x92364a30u}; + +static const unsigned lodepng_crc32_table7[256] = {0x00000000u, 0xccaa009eu, 0x4225077du, + 0x8e8f07e3u, 0x844a0efau, 0x48e00e64u, 0xc66f0987u, 0x0ac50919u, 0xd3e51bb5u, 0x1f4f1b2bu, + 0x91c01cc8u, 0x5d6a1c56u, 0x57af154fu, 0x9b0515d1u, 0x158a1232u, 0xd92012acu, 0x7cbb312bu, + 0xb01131b5u, 0x3e9e3656u, 0xf23436c8u, 0xf8f13fd1u, 0x345b3f4fu, 0xbad438acu, 0x767e3832u, + 0xaf5e2a9eu, 0x63f42a00u, 0xed7b2de3u, 0x21d12d7du, 0x2b142464u, 0xe7be24fau, 0x69312319u, + 0xa59b2387u, 0xf9766256u, 0x35dc62c8u, 0xbb53652bu, 0x77f965b5u, 0x7d3c6cacu, 0xb1966c32u, + 0x3f196bd1u, 0xf3b36b4fu, 0x2a9379e3u, 0xe639797du, 0x68b67e9eu, 0xa41c7e00u, 0xaed97719u, + 0x62737787u, 0xecfc7064u, 0x205670fau, 0x85cd537du, 0x496753e3u, 0xc7e85400u, 0x0b42549eu, + 0x01875d87u, 0xcd2d5d19u, 0x43a25afau, 0x8f085a64u, 0x562848c8u, 0x9a824856u, 0x140d4fb5u, + 0xd8a74f2bu, 0xd2624632u, 0x1ec846acu, 0x9047414fu, 0x5ced41d1u, 0x299dc2edu, 0xe537c273u, + 0x6bb8c590u, 0xa712c50eu, 0xadd7cc17u, 0x617dcc89u, 0xeff2cb6au, 0x2358cbf4u, 0xfa78d958u, + 0x36d2d9c6u, 0xb85dde25u, 0x74f7debbu, 0x7e32d7a2u, 0xb298d73cu, 0x3c17d0dfu, 0xf0bdd041u, + 0x5526f3c6u, 0x998cf358u, 0x1703f4bbu, 0xdba9f425u, 0xd16cfd3cu, 0x1dc6fda2u, 0x9349fa41u, + 0x5fe3fadfu, 0x86c3e873u, 0x4a69e8edu, 0xc4e6ef0eu, 0x084cef90u, 0x0289e689u, 0xce23e617u, + 0x40ace1f4u, 0x8c06e16au, 0xd0eba0bbu, 0x1c41a025u, 0x92cea7c6u, 0x5e64a758u, 0x54a1ae41u, + 0x980baedfu, 0x1684a93cu, 0xda2ea9a2u, 0x030ebb0eu, 0xcfa4bb90u, 0x412bbc73u, 0x8d81bcedu, + 0x8744b5f4u, 0x4beeb56au, 0xc561b289u, 0x09cbb217u, 0xac509190u, 0x60fa910eu, 0xee7596edu, + 0x22df9673u, 0x281a9f6au, 0xe4b09ff4u, 0x6a3f9817u, 0xa6959889u, 0x7fb58a25u, 0xb31f8abbu, + 0x3d908d58u, 0xf13a8dc6u, 0xfbff84dfu, 0x37558441u, 0xb9da83a2u, 0x7570833cu, 0x533b85dau, + 0x9f918544u, 0x111e82a7u, 0xddb48239u, 0xd7718b20u, 0x1bdb8bbeu, 0x95548c5du, 0x59fe8cc3u, + 0x80de9e6fu, 0x4c749ef1u, 0xc2fb9912u, 0x0e51998cu, 0x04949095u, 0xc83e900bu, 0x46b197e8u, + 0x8a1b9776u, 0x2f80b4f1u, 0xe32ab46fu, 0x6da5b38cu, 0xa10fb312u, 0xabcaba0bu, 0x6760ba95u, + 0xe9efbd76u, 0x2545bde8u, 0xfc65af44u, 0x30cfafdau, 0xbe40a839u, 0x72eaa8a7u, 0x782fa1beu, + 0xb485a120u, 0x3a0aa6c3u, 0xf6a0a65du, 0xaa4de78cu, 0x66e7e712u, 0xe868e0f1u, 0x24c2e06fu, + 0x2e07e976u, 0xe2ade9e8u, 0x6c22ee0bu, 0xa088ee95u, 0x79a8fc39u, 0xb502fca7u, 0x3b8dfb44u, + 0xf727fbdau, 0xfde2f2c3u, 0x3148f25du, 0xbfc7f5beu, 0x736df520u, 0xd6f6d6a7u, 0x1a5cd639u, + 0x94d3d1dau, 0x5879d144u, 0x52bcd85du, 0x9e16d8c3u, 0x1099df20u, 0xdc33dfbeu, 0x0513cd12u, + 0xc9b9cd8cu, 0x4736ca6fu, 0x8b9ccaf1u, 0x8159c3e8u, 0x4df3c376u, 0xc37cc495u, 0x0fd6c40bu, + 0x7aa64737u, 0xb60c47a9u, 0x3883404au, 0xf42940d4u, 0xfeec49cdu, 0x32464953u, 0xbcc94eb0u, + 0x70634e2eu, 0xa9435c82u, 0x65e95c1cu, 0xeb665bffu, 0x27cc5b61u, 0x2d095278u, 0xe1a352e6u, + 0x6f2c5505u, 0xa386559bu, 0x061d761cu, 0xcab77682u, 0x44387161u, 0x889271ffu, 0x825778e6u, + 0x4efd7878u, 0xc0727f9bu, 0x0cd87f05u, 0xd5f86da9u, 0x19526d37u, 0x97dd6ad4u, 0x5b776a4au, + 0x51b26353u, 0x9d1863cdu, 0x1397642eu, 0xdf3d64b0u, 0x83d02561u, 0x4f7a25ffu, 0xc1f5221cu, + 0x0d5f2282u, 0x079a2b9bu, 0xcb302b05u, 0x45bf2ce6u, 0x89152c78u, 0x50353ed4u, 0x9c9f3e4au, + 0x121039a9u, 0xdeba3937u, 0xd47f302eu, 0x18d530b0u, 0x965a3753u, 0x5af037cdu, 0xff6b144au, + 0x33c114d4u, 0xbd4e1337u, 0x71e413a9u, 0x7b211ab0u, 0xb78b1a2eu, 0x39041dcdu, 0xf5ae1d53u, + 0x2c8e0fffu, 0xe0240f61u, 0x6eab0882u, 0xa201081cu, 0xa8c40105u, 0x646e019bu, 0xeae10678u, + 0x264b06e6u}; /* Computes the cyclic redundancy check as used by PNG chunks*/ -unsigned lodepng_crc32(const unsigned char* data, size_t length) { - /*Using the Slicing by Eight algorithm*/ - unsigned r = 0xffffffffu; - while(length >= 8) { - r = lodepng_crc32_table7[(data[0] ^ (r & 0xffu))] ^ - lodepng_crc32_table6[(data[1] ^ ((r >> 8) & 0xffu))] ^ - lodepng_crc32_table5[(data[2] ^ ((r >> 16) & 0xffu))] ^ - lodepng_crc32_table4[(data[3] ^ ((r >> 24) & 0xffu))] ^ - lodepng_crc32_table3[data[4]] ^ - lodepng_crc32_table2[data[5]] ^ - lodepng_crc32_table1[data[6]] ^ - lodepng_crc32_table0[data[7]]; - data += 8; - length -= 8; - } - while(length--) { - r = lodepng_crc32_table0[(r ^ *data++) & 0xffu] ^ (r >> 8); - } - return r ^ 0xffffffffu; -} -#else /* LODEPNG_COMPILE_CRC */ -/*in this case, the function is only declared here, and must be defined externally -so that it will be linked in. - -Example implementation that uses a much smaller lookup table for memory constrained cases: +unsigned lodepng_crc32(const unsigned char *data, size_t length) { + /*Using the Slicing by Eight algorithm*/ + unsigned r = 0xffffffffu; + while (length >= 8) { + r = lodepng_crc32_table7[(data[0] ^ (r & 0xffu))] ^ + lodepng_crc32_table6[(data[1] ^ ((r >> 8) & 0xffu))] ^ + lodepng_crc32_table5[(data[2] ^ ((r >> 16) & 0xffu))] ^ + lodepng_crc32_table4[(data[3] ^ ((r >> 24) & 0xffu))] ^ lodepng_crc32_table3[data[4]] ^ + lodepng_crc32_table2[data[5]] ^ lodepng_crc32_table1[data[6]] ^ + lodepng_crc32_table0[data[7]]; + data += 8; + length -= 8; + } + while (length--) { + r = lodepng_crc32_table0[(r ^ *data++) & 0xffu] ^ (r >> 8); + } + return r ^ 0xffffffffu; +} +#else /* LODEPNG_COMPILE_CRC */ +/*in this case, the function is only declared here, and must be defined +externally so that it will be linked in. + +Example implementation that uses a much smaller lookup table for memory +constrained cases: unsigned lodepng_crc32(const unsigned char* data, size_t length) { unsigned r = 0xffffffffu; static const unsigned table[16] = { - 0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c, - 0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c + 0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, +0x4db26158, 0x5005713c, 0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, +0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c }; while(length--) { - r = table[(r ^ *data) & 0xf] ^ (r >> 4); - r = table[(r ^ (*data >> 4)) & 0xf] ^ (r >> 4); - data++; + r = table[(r ^ *data) & 0xf] ^ (r >> 4); + r = table[(r ^ (*data >> 4)) & 0xf] ^ (r >> 4); + data++; } return r ^ 0xffffffffu; } */ -unsigned lodepng_crc32(const unsigned char* data, size_t length); +unsigned lodepng_crc32(const unsigned char *data, size_t length); #endif /* LODEPNG_COMPILE_CRC */ /* ////////////////////////////////////////////////////////////////////////// */ /* / Reading and writing PNG color channel bits / */ /* ////////////////////////////////////////////////////////////////////////// */ -/* The color channel bits of less-than-8-bit pixels are read with the MSB of bytes first, -so LodePNGBitWriter and LodePNGBitReader can't be used for those. */ +/* The color channel bits of less-than-8-bit pixels are read with the MSB of +bytes first, so LodePNGBitWriter and LodePNGBitReader can't be used for those. +*/ -static unsigned char readBitFromReversedStream(size_t* bitpointer, const unsigned char* bitstream) { - unsigned char result = (unsigned char)((bitstream[(*bitpointer) >> 3] >> (7 - ((*bitpointer) & 0x7))) & 1); - ++(*bitpointer); - return result; +static unsigned char readBitFromReversedStream(size_t *bitpointer, const unsigned char *bitstream) { + unsigned char result = + (unsigned char)((bitstream[(*bitpointer) >> 3] >> (7 - ((*bitpointer) & 0x7))) & 1); + ++(*bitpointer); + return result; } /* TODO: make this faster */ -static unsigned readBitsFromReversedStream(size_t* bitpointer, const unsigned char* bitstream, size_t nbits) { - unsigned result = 0; - size_t i; - for(i = 0 ; i < nbits; ++i) { - result <<= 1u; - result |= (unsigned)readBitFromReversedStream(bitpointer, bitstream); - } - return result; -} - -static void setBitOfReversedStream(size_t* bitpointer, unsigned char* bitstream, unsigned char bit) { - /*the current bit in bitstream may be 0 or 1 for this to work*/ - if(bit == 0) bitstream[(*bitpointer) >> 3u] &= (unsigned char)(~(1u << (7u - ((*bitpointer) & 7u)))); - else bitstream[(*bitpointer) >> 3u] |= (1u << (7u - ((*bitpointer) & 7u))); - ++(*bitpointer); +static unsigned readBitsFromReversedStream( + size_t *bitpointer, const unsigned char *bitstream, size_t nbits) { + unsigned result = 0; + size_t i; + for (i = 0; i < nbits; ++i) { + result <<= 1u; + result |= (unsigned)readBitFromReversedStream(bitpointer, bitstream); + } + return result; +} + +static void setBitOfReversedStream( + size_t *bitpointer, unsigned char *bitstream, unsigned char bit) { + /*the current bit in bitstream may be 0 or 1 for this to work*/ + if (bit == 0) + bitstream[(*bitpointer) >> 3u] &= (unsigned char)(~(1u << (7u - ((*bitpointer) & 7u)))); + else + bitstream[(*bitpointer) >> 3u] |= (1u << (7u - ((*bitpointer) & 7u))); + ++(*bitpointer); } /* ////////////////////////////////////////////////////////////////////////// */ /* / PNG chunks / */ /* ////////////////////////////////////////////////////////////////////////// */ -unsigned lodepng_chunk_length(const unsigned char* chunk) { - return lodepng_read32bitInt(chunk); -} - -void lodepng_chunk_type(char type[5], const unsigned char* chunk) { - unsigned i; - for(i = 0; i != 4; ++i) type[i] = (char)chunk[4 + i]; - type[4] = 0; /*null termination char*/ -} - -unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type) { - if(lodepng_strlen(type) != 4) return 0; - return (chunk[4] == type[0] && chunk[5] == type[1] && chunk[6] == type[2] && chunk[7] == type[3]); -} - -unsigned char lodepng_chunk_ancillary(const unsigned char* chunk) { - return((chunk[4] & 32) != 0); -} - -unsigned char lodepng_chunk_private(const unsigned char* chunk) { - return((chunk[6] & 32) != 0); -} - -unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk) { - return((chunk[7] & 32) != 0); -} - -unsigned char* lodepng_chunk_data(unsigned char* chunk) { - return &chunk[8]; -} - -const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk) { - return &chunk[8]; -} - -unsigned lodepng_chunk_check_crc(const unsigned char* chunk) { - unsigned length = lodepng_chunk_length(chunk); - unsigned CRC = lodepng_read32bitInt(&chunk[length + 8]); - /*the CRC is taken of the data and the 4 chunk type letters, not the length*/ - unsigned checksum = lodepng_crc32(&chunk[4], length + 4); - if(CRC != checksum) return 1; - else return 0; -} - -void lodepng_chunk_generate_crc(unsigned char* chunk) { - unsigned length = lodepng_chunk_length(chunk); - unsigned CRC = lodepng_crc32(&chunk[4], length + 4); - lodepng_set32bitInt(chunk + 8 + length, CRC); -} - -unsigned char* lodepng_chunk_next(unsigned char* chunk, unsigned char* end) { - size_t available_size = (size_t)(end - chunk); - if(chunk >= end || available_size < 12) return end; /*too small to contain a chunk*/ - if(chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47 - && chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) { - /* Is PNG magic header at start of PNG file. Jump to first actual chunk. */ - return chunk + 8; - } else { - size_t total_chunk_length; - if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return end; - if(total_chunk_length > available_size) return end; /*outside of range*/ - return chunk + total_chunk_length; - } -} - -const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const unsigned char* end) { - size_t available_size = (size_t)(end - chunk); - if(chunk >= end || available_size < 12) return end; /*too small to contain a chunk*/ - if(chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47 - && chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) { - /* Is PNG magic header at start of PNG file. Jump to first actual chunk. */ - return chunk + 8; - } else { - size_t total_chunk_length; - if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return end; - if(total_chunk_length > available_size) return end; /*outside of range*/ - return chunk + total_chunk_length; - } -} - -unsigned char* lodepng_chunk_find(unsigned char* chunk, unsigned char* end, const char type[5]) { - for(;;) { - if(chunk >= end || end - chunk < 12) return 0; /* past file end: chunk + 12 > end */ - if(lodepng_chunk_type_equals(chunk, type)) return chunk; - chunk = lodepng_chunk_next(chunk, end); - } -} - -const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]) { - for(;;) { - if(chunk >= end || end - chunk < 12) return 0; /* past file end: chunk + 12 > end */ - if(lodepng_chunk_type_equals(chunk, type)) return chunk; - chunk = lodepng_chunk_next_const(chunk, end); - } -} - -unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk) { - unsigned i; - size_t total_chunk_length, new_length; - unsigned char *chunk_start, *new_buffer; - - if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return 77; - if(lodepng_addofl(*outsize, total_chunk_length, &new_length)) return 77; - - new_buffer = (unsigned char*)lodepng_realloc(*out, new_length); - if(!new_buffer) return 83; /*alloc fail*/ - (*out) = new_buffer; - (*outsize) = new_length; - chunk_start = &(*out)[new_length - total_chunk_length]; - - for(i = 0; i != total_chunk_length; ++i) chunk_start[i] = chunk[i]; - - return 0; +unsigned lodepng_chunk_length(const unsigned char *chunk) { return lodepng_read32bitInt(chunk); } + +void lodepng_chunk_type(char type[5], const unsigned char *chunk) { + unsigned i; + for (i = 0; i != 4; ++i) + type[i] = (char)chunk[4 + i]; + type[4] = 0; /*null termination char*/ +} + +unsigned char lodepng_chunk_type_equals(const unsigned char *chunk, const char *type) { + if (lodepng_strlen(type) != 4) + return 0; + return ( + chunk[4] == type[0] && chunk[5] == type[1] && chunk[6] == type[2] && chunk[7] == type[3]); +} + +unsigned char lodepng_chunk_ancillary(const unsigned char *chunk) { return ((chunk[4] & 32) != 0); } + +unsigned char lodepng_chunk_private(const unsigned char *chunk) { return ((chunk[6] & 32) != 0); } + +unsigned char lodepng_chunk_safetocopy(const unsigned char *chunk) { + return ((chunk[7] & 32) != 0); +} + +unsigned char *lodepng_chunk_data(unsigned char *chunk) { return &chunk[8]; } + +const unsigned char *lodepng_chunk_data_const(const unsigned char *chunk) { return &chunk[8]; } + +unsigned lodepng_chunk_check_crc(const unsigned char *chunk) { + unsigned length = lodepng_chunk_length(chunk); + unsigned CRC = lodepng_read32bitInt(&chunk[length + 8]); + /*the CRC is taken of the data and the 4 chunk type letters, not the + * length*/ + unsigned checksum = lodepng_crc32(&chunk[4], length + 4); + if (CRC != checksum) + return 1; + else + return 0; +} + +void lodepng_chunk_generate_crc(unsigned char *chunk) { + unsigned length = lodepng_chunk_length(chunk); + unsigned CRC = lodepng_crc32(&chunk[4], length + 4); + lodepng_set32bitInt(chunk + 8 + length, CRC); +} + +unsigned char *lodepng_chunk_next(unsigned char *chunk, unsigned char *end) { + size_t available_size = (size_t)(end - chunk); + if (chunk >= end || available_size < 12) + return end; /*too small to contain a chunk*/ + if (chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47 && + chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) { + /* Is PNG magic header at start of PNG file. Jump to first actual chunk. + */ + return chunk + 8; + } else { + size_t total_chunk_length; + if (lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) + return end; + if (total_chunk_length > available_size) + return end; /*outside of range*/ + return chunk + total_chunk_length; + } +} + +const unsigned char *lodepng_chunk_next_const( + const unsigned char *chunk, const unsigned char *end) { + size_t available_size = (size_t)(end - chunk); + if (chunk >= end || available_size < 12) + return end; /*too small to contain a chunk*/ + if (chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47 && + chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) { + /* Is PNG magic header at start of PNG file. Jump to first actual chunk. + */ + return chunk + 8; + } else { + size_t total_chunk_length; + if (lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) + return end; + if (total_chunk_length > available_size) + return end; /*outside of range*/ + return chunk + total_chunk_length; + } +} + +unsigned char *lodepng_chunk_find(unsigned char *chunk, unsigned char *end, const char type[5]) { + for (;;) { + if (chunk >= end || end - chunk < 12) + return 0; /* past file end: chunk + 12 > end */ + if (lodepng_chunk_type_equals(chunk, type)) + return chunk; + chunk = lodepng_chunk_next(chunk, end); + } +} + +const unsigned char *lodepng_chunk_find_const( + const unsigned char *chunk, const unsigned char *end, const char type[5]) { + for (;;) { + if (chunk >= end || end - chunk < 12) + return 0; /* past file end: chunk + 12 > end */ + if (lodepng_chunk_type_equals(chunk, type)) + return chunk; + chunk = lodepng_chunk_next_const(chunk, end); + } +} + +unsigned lodepng_chunk_append(unsigned char **out, size_t *outsize, const unsigned char *chunk) { + unsigned i; + size_t total_chunk_length, new_length; + unsigned char *chunk_start, *new_buffer; + + if (lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) + return 77; + if (lodepng_addofl(*outsize, total_chunk_length, &new_length)) + return 77; + + new_buffer = (unsigned char *)lodepng_realloc(*out, new_length); + if (!new_buffer) + return 83; /*alloc fail*/ + (*out) = new_buffer; + (*outsize) = new_length; + chunk_start = &(*out)[new_length - total_chunk_length]; + + for (i = 0; i != total_chunk_length; ++i) + chunk_start[i] = chunk[i]; + + return 0; } /*Sets length and name and allocates the space for data and crc but does not set data or crc yet. Returns the start of the chunk in chunk. The start of the data is at chunk + 8. To finalize chunk, add the data, then use lodepng_chunk_generate_crc */ -static unsigned lodepng_chunk_init(unsigned char** chunk, - ucvector* out, - size_t length, const char* type) { - size_t new_length = out->size; - if(lodepng_addofl(new_length, length, &new_length)) return 77; - if(lodepng_addofl(new_length, 12, &new_length)) return 77; - if(!ucvector_resize(out, new_length)) return 83; /*alloc fail*/ - *chunk = out->data + new_length - length - 12u; +static unsigned lodepng_chunk_init( + unsigned char **chunk, ucvector *out, size_t length, const char *type) { + size_t new_length = out->size; + if (lodepng_addofl(new_length, length, &new_length)) + return 77; + if (lodepng_addofl(new_length, 12, &new_length)) + return 77; + if (!ucvector_resize(out, new_length)) + return 83; /*alloc fail*/ + *chunk = out->data + new_length - length - 12u; - /*1: length*/ - lodepng_set32bitInt(*chunk, (unsigned)length); + /*1: length*/ + lodepng_set32bitInt(*chunk, (unsigned)length); - /*2: chunk name (4 letters)*/ - lodepng_memcpy(*chunk + 4, type, 4); + /*2: chunk name (4 letters)*/ + lodepng_memcpy(*chunk + 4, type, 4); - return 0; + return 0; } /* like lodepng_chunk_create but with custom allocsize */ -static unsigned lodepng_chunk_createv(ucvector* out, - size_t length, const char* type, const unsigned char* data) { - unsigned char* chunk; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, length, type)); +static unsigned lodepng_chunk_createv( + ucvector *out, size_t length, const char *type, const unsigned char *data) { + unsigned char *chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, length, type)); - /*3: the data*/ - lodepng_memcpy(chunk + 8, data, length); + /*3: the data*/ + lodepng_memcpy(chunk + 8, data, length); - /*4: CRC (of the chunkname characters and the data)*/ - lodepng_chunk_generate_crc(chunk); + /*4: CRC (of the chunkname characters and the data)*/ + lodepng_chunk_generate_crc(chunk); - return 0; + return 0; } -unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, - size_t length, const char* type, const unsigned char* data) { - ucvector v = ucvector_init(*out, *outsize); - unsigned error = lodepng_chunk_createv(&v, length, type, data); - *out = v.data; - *outsize = v.size; - return error; +unsigned lodepng_chunk_create(unsigned char **out, size_t *outsize, size_t length, const char *type, + const unsigned char *data) { + ucvector v = ucvector_init(*out, *outsize); + unsigned error = lodepng_chunk_createv(&v, length, type, data); + *out = v.data; + *outsize = v.size; + return error; } /* ////////////////////////////////////////////////////////////////////////// */ /* / Color types, channels, bits / */ /* ////////////////////////////////////////////////////////////////////////// */ -/*checks if the colortype is valid and the bitdepth bd is allowed for this colortype. -Return value is a LodePNG error code.*/ +/*checks if the colortype is valid and the bitdepth bd is allowed for this +colortype. Return value is a LodePNG error code.*/ static unsigned checkColorValidity(LodePNGColorType colortype, unsigned bd) { - switch(colortype) { - case LCT_GREY: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16)) return 37; break; - case LCT_RGB: if(!( bd == 8 || bd == 16)) return 37; break; - case LCT_PALETTE: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 )) return 37; break; - case LCT_GREY_ALPHA: if(!( bd == 8 || bd == 16)) return 37; break; - case LCT_RGBA: if(!( bd == 8 || bd == 16)) return 37; break; - case LCT_MAX_OCTET_VALUE: return 31; /* invalid color type */ - default: return 31; /* invalid color type */ - } - return 0; /*allowed color type / bits combination*/ + switch (colortype) { + case LCT_GREY: + if (!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16)) + return 37; + break; + case LCT_RGB: + if (!(bd == 8 || bd == 16)) + return 37; + break; + case LCT_PALETTE: + if (!(bd == 1 || bd == 2 || bd == 4 || bd == 8)) + return 37; + break; + case LCT_GREY_ALPHA: + if (!(bd == 8 || bd == 16)) + return 37; + break; + case LCT_RGBA: + if (!(bd == 8 || bd == 16)) + return 37; + break; + case LCT_MAX_OCTET_VALUE: + return 31; /* invalid color type */ + default: + return 31; /* invalid color type */ + } + return 0; /*allowed color type / bits combination*/ } static unsigned getNumColorChannels(LodePNGColorType colortype) { - switch(colortype) { - case LCT_GREY: return 1; - case LCT_RGB: return 3; - case LCT_PALETTE: return 1; - case LCT_GREY_ALPHA: return 2; - case LCT_RGBA: return 4; - case LCT_MAX_OCTET_VALUE: return 0; /* invalid color type */ - default: return 0; /*invalid color type*/ - } + switch (colortype) { + case LCT_GREY: + return 1; + case LCT_RGB: + return 3; + case LCT_PALETTE: + return 1; + case LCT_GREY_ALPHA: + return 2; + case LCT_RGBA: + return 4; + case LCT_MAX_OCTET_VALUE: + return 0; /* invalid color type */ + default: + return 0; /*invalid color type*/ + } } static unsigned lodepng_get_bpp_lct(LodePNGColorType colortype, unsigned bitdepth) { - /*bits per pixel is amount of channels * bits per channel*/ - return getNumColorChannels(colortype) * bitdepth; + /*bits per pixel is amount of channels * bits per channel*/ + return getNumColorChannels(colortype) * bitdepth; } /* ////////////////////////////////////////////////////////////////////////// */ -void lodepng_color_mode_init(LodePNGColorMode* info) { - info->key_defined = 0; - info->key_r = info->key_g = info->key_b = 0; - info->colortype = LCT_RGBA; - info->bitdepth = 8; - info->palette = 0; - info->palettesize = 0; +void lodepng_color_mode_init(LodePNGColorMode *info) { + info->key_defined = 0; + info->key_r = info->key_g = info->key_b = 0; + info->colortype = LCT_RGBA; + info->bitdepth = 8; + info->palette = 0; + info->palettesize = 0; } /*allocates palette memory if needed, and initializes all colors to black*/ -static void lodepng_color_mode_alloc_palette(LodePNGColorMode* info) { - size_t i; - /*if the palette is already allocated, it will have size 1024 so no reallocation needed in that case*/ - /*the palette must have room for up to 256 colors with 4 bytes each.*/ - if(!info->palette) info->palette = (unsigned char*)lodepng_malloc(1024); - if(!info->palette) return; /*alloc fail*/ - for(i = 0; i != 256; ++i) { - /*Initialize all unused colors with black, the value used for invalid palette indices. - This is an error according to the PNG spec, but common PNG decoders make it black instead. - That makes color conversion slightly faster due to no error handling needed.*/ - info->palette[i * 4 + 0] = 0; - info->palette[i * 4 + 1] = 0; - info->palette[i * 4 + 2] = 0; - info->palette[i * 4 + 3] = 255; - } -} - -void lodepng_color_mode_cleanup(LodePNGColorMode* info) { - lodepng_palette_clear(info); -} - -unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source) { - lodepng_color_mode_cleanup(dest); - lodepng_memcpy(dest, source, sizeof(LodePNGColorMode)); - if(source->palette) { - dest->palette = (unsigned char*)lodepng_malloc(1024); - if(!dest->palette && source->palettesize) return 83; /*alloc fail*/ - lodepng_memcpy(dest->palette, source->palette, source->palettesize * 4); - } - return 0; +static void lodepng_color_mode_alloc_palette(LodePNGColorMode *info) { + size_t i; + /*if the palette is already allocated, it will have size 1024 so no + * reallocation needed in that case*/ + /*the palette must have room for up to 256 colors with 4 bytes each.*/ + if (!info->palette) + info->palette = (unsigned char *)lodepng_malloc(1024); + if (!info->palette) + return; /*alloc fail*/ + for (i = 0; i != 256; ++i) { + /*Initialize all unused colors with black, the value used for invalid + palette indices. This is an error according to the PNG spec, but common + PNG decoders make it black instead. That makes color conversion slightly + faster due to no error handling needed.*/ + info->palette[i * 4 + 0] = 0; + info->palette[i * 4 + 1] = 0; + info->palette[i * 4 + 2] = 0; + info->palette[i * 4 + 3] = 255; + } +} + +void lodepng_color_mode_cleanup(LodePNGColorMode *info) { lodepng_palette_clear(info); } + +unsigned lodepng_color_mode_copy(LodePNGColorMode *dest, const LodePNGColorMode *source) { + lodepng_color_mode_cleanup(dest); + lodepng_memcpy(dest, source, sizeof(LodePNGColorMode)); + if (source->palette) { + dest->palette = (unsigned char *)lodepng_malloc(1024); + if (!dest->palette && source->palettesize) + return 83; /*alloc fail*/ + lodepng_memcpy(dest->palette, source->palette, source->palettesize * 4); + } + return 0; } LodePNGColorMode lodepng_color_mode_make(LodePNGColorType colortype, unsigned bitdepth) { - LodePNGColorMode result; - lodepng_color_mode_init(&result); - result.colortype = colortype; - result.bitdepth = bitdepth; - return result; -} - -static int lodepng_color_mode_equal(const LodePNGColorMode* a, const LodePNGColorMode* b) { - size_t i; - if(a->colortype != b->colortype) return 0; - if(a->bitdepth != b->bitdepth) return 0; - if(a->key_defined != b->key_defined) return 0; - if(a->key_defined) { - if(a->key_r != b->key_r) return 0; - if(a->key_g != b->key_g) return 0; - if(a->key_b != b->key_b) return 0; - } - if(a->palettesize != b->palettesize) return 0; - for(i = 0; i != a->palettesize * 4; ++i) { - if(a->palette[i] != b->palette[i]) return 0; - } - return 1; -} - -void lodepng_palette_clear(LodePNGColorMode* info) { - if(info->palette) lodepng_free(info->palette); - info->palette = 0; - info->palettesize = 0; -} - -unsigned lodepng_palette_add(LodePNGColorMode* info, - unsigned char r, unsigned char g, unsigned char b, unsigned char a) { - if(!info->palette) /*allocate palette if empty*/ { - lodepng_color_mode_alloc_palette(info); - if(!info->palette) return 83; /*alloc fail*/ - } - if(info->palettesize >= 256) { - return 108; /*too many palette values*/ - } - info->palette[4 * info->palettesize + 0] = r; - info->palette[4 * info->palettesize + 1] = g; - info->palette[4 * info->palettesize + 2] = b; - info->palette[4 * info->palettesize + 3] = a; - ++info->palettesize; - return 0; + LodePNGColorMode result; + lodepng_color_mode_init(&result); + result.colortype = colortype; + result.bitdepth = bitdepth; + return result; +} + +static int lodepng_color_mode_equal(const LodePNGColorMode *a, const LodePNGColorMode *b) { + size_t i; + if (a->colortype != b->colortype) + return 0; + if (a->bitdepth != b->bitdepth) + return 0; + if (a->key_defined != b->key_defined) + return 0; + if (a->key_defined) { + if (a->key_r != b->key_r) + return 0; + if (a->key_g != b->key_g) + return 0; + if (a->key_b != b->key_b) + return 0; + } + if (a->palettesize != b->palettesize) + return 0; + for (i = 0; i != a->palettesize * 4; ++i) { + if (a->palette[i] != b->palette[i]) + return 0; + } + return 1; +} + +void lodepng_palette_clear(LodePNGColorMode *info) { + if (info->palette) + lodepng_free(info->palette); + info->palette = 0; + info->palettesize = 0; +} + +unsigned lodepng_palette_add( + LodePNGColorMode *info, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { + if (!info->palette) /*allocate palette if empty*/ { + lodepng_color_mode_alloc_palette(info); + if (!info->palette) + return 83; /*alloc fail*/ + } + if (info->palettesize >= 256) { + return 108; /*too many palette values*/ + } + info->palette[4 * info->palettesize + 0] = r; + info->palette[4 * info->palettesize + 1] = g; + info->palette[4 * info->palettesize + 2] = b; + info->palette[4 * info->palettesize + 3] = a; + ++info->palettesize; + return 0; } /*calculate bits per pixel out of colortype and bitdepth*/ -unsigned lodepng_get_bpp(const LodePNGColorMode* info) { - return lodepng_get_bpp_lct(info->colortype, info->bitdepth); +unsigned lodepng_get_bpp(const LodePNGColorMode *info) { + return lodepng_get_bpp_lct(info->colortype, info->bitdepth); } -unsigned lodepng_get_channels(const LodePNGColorMode* info) { - return getNumColorChannels(info->colortype); +unsigned lodepng_get_channels(const LodePNGColorMode *info) { + return getNumColorChannels(info->colortype); } -unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info) { - return info->colortype == LCT_GREY || info->colortype == LCT_GREY_ALPHA; +unsigned lodepng_is_greyscale_type(const LodePNGColorMode *info) { + return info->colortype == LCT_GREY || info->colortype == LCT_GREY_ALPHA; } -unsigned lodepng_is_alpha_type(const LodePNGColorMode* info) { - return (info->colortype & 4) != 0; /*4 or 6*/ +unsigned lodepng_is_alpha_type(const LodePNGColorMode *info) { + return (info->colortype & 4) != 0; /*4 or 6*/ } -unsigned lodepng_is_palette_type(const LodePNGColorMode* info) { - return info->colortype == LCT_PALETTE; +unsigned lodepng_is_palette_type(const LodePNGColorMode *info) { + return info->colortype == LCT_PALETTE; } -unsigned lodepng_has_palette_alpha(const LodePNGColorMode* info) { - size_t i; - for(i = 0; i != info->palettesize; ++i) { - if(info->palette[i * 4 + 3] < 255) return 1; - } - return 0; +unsigned lodepng_has_palette_alpha(const LodePNGColorMode *info) { + size_t i; + for (i = 0; i != info->palettesize; ++i) { + if (info->palette[i * 4 + 3] < 255) + return 1; + } + return 0; } -unsigned lodepng_can_have_alpha(const LodePNGColorMode* info) { - return info->key_defined - || lodepng_is_alpha_type(info) - || lodepng_has_palette_alpha(info); +unsigned lodepng_can_have_alpha(const LodePNGColorMode *info) { + return info->key_defined || lodepng_is_alpha_type(info) || lodepng_has_palette_alpha(info); } -static size_t lodepng_get_raw_size_lct(unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { - size_t bpp = lodepng_get_bpp_lct(colortype, bitdepth); - size_t n = (size_t)w * (size_t)h; - return ((n / 8u) * bpp) + ((n & 7u) * bpp + 7u) / 8u; +static size_t lodepng_get_raw_size_lct( + unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { + size_t bpp = lodepng_get_bpp_lct(colortype, bitdepth); + size_t n = (size_t)w * (size_t)h; + return ((n / 8u) * bpp) + ((n & 7u) * bpp + 7u) / 8u; } -size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color) { - return lodepng_get_raw_size_lct(w, h, color->colortype, color->bitdepth); +size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode *color) { + return lodepng_get_raw_size_lct(w, h, color->colortype, color->bitdepth); } - #ifdef LODEPNG_COMPILE_PNG -/*in an idat chunk, each scanline is a multiple of 8 bits, unlike the lodepng output buffer, -and in addition has one extra byte per line: the filter byte. So this gives a larger -result than lodepng_get_raw_size. Set h to 1 to get the size of 1 row including filter byte. */ +/*in an idat chunk, each scanline is a multiple of 8 bits, unlike the lodepng +output buffer, and in addition has one extra byte per line: the filter byte. So +this gives a larger result than lodepng_get_raw_size. Set h to 1 to get the size +of 1 row including filter byte. */ static size_t lodepng_get_raw_size_idat(unsigned w, unsigned h, unsigned bpp) { - /* + 1 for the filter byte, and possibly plus padding bits per line. */ - /* Ignoring casts, the expression is equal to (w * bpp + 7) / 8 + 1, but avoids overflow of w * bpp */ - size_t line = ((size_t)(w / 8u) * bpp) + 1u + ((w & 7u) * bpp + 7u) / 8u; - return (size_t)h * line; + /* + 1 for the filter byte, and possibly plus padding bits per line. */ + /* Ignoring casts, the expression is equal to (w * bpp + 7) / 8 + 1, but + * avoids overflow of w * bpp */ + size_t line = ((size_t)(w / 8u) * bpp) + 1u + ((w & 7u) * bpp + 7u) / 8u; + return (size_t)h * line; } #ifdef LODEPNG_COMPILE_DECODER /*Safely checks whether size_t overflow can be caused due to amount of pixels. -This check is overcautious rather than precise. If this check indicates no overflow, -you can safely compute in a size_t (but not an unsigned): +This check is overcautious rather than precise. If this check indicates no +overflow, you can safely compute in a size_t (but not an unsigned): -(size_t)w * (size_t)h * 8 -amount of bytes in IDAT (including filter, padding and Adam7 bytes) -amount of bytes in raw color model Returns 1 if overflow possible, 0 if not. */ -static int lodepng_pixel_overflow(unsigned w, unsigned h, - const LodePNGColorMode* pngcolor, const LodePNGColorMode* rawcolor) { - size_t bpp = LODEPNG_MAX(lodepng_get_bpp(pngcolor), lodepng_get_bpp(rawcolor)); - size_t numpixels, total; - size_t line; /* bytes per line in worst case */ - - if(lodepng_mulofl((size_t)w, (size_t)h, &numpixels)) return 1; - if(lodepng_mulofl(numpixels, 8, &total)) return 1; /* bit pointer with 8-bit color, or 8 bytes per channel color */ - - /* Bytes per scanline with the expression "(w / 8u) * bpp) + ((w & 7u) * bpp + 7u) / 8u" */ - if(lodepng_mulofl((size_t)(w / 8u), bpp, &line)) return 1; - if(lodepng_addofl(line, ((w & 7u) * bpp + 7u) / 8u, &line)) return 1; - - if(lodepng_addofl(line, 5, &line)) return 1; /* 5 bytes overhead per line: 1 filterbyte, 4 for Adam7 worst case */ - if(lodepng_mulofl(line, h, &total)) return 1; /* Total bytes in worst case */ - - return 0; /* no overflow */ +static int lodepng_pixel_overflow( + unsigned w, unsigned h, const LodePNGColorMode *pngcolor, const LodePNGColorMode *rawcolor) { + size_t bpp = LODEPNG_MAX(lodepng_get_bpp(pngcolor), lodepng_get_bpp(rawcolor)); + size_t numpixels, total; + size_t line; /* bytes per line in worst case */ + + if (lodepng_mulofl((size_t)w, (size_t)h, &numpixels)) + return 1; + if (lodepng_mulofl(numpixels, 8, &total)) + return 1; /* bit pointer with 8-bit color, or 8 bytes per channel color + */ + + /* Bytes per scanline with the expression "(w / 8u) * bpp) + ((w & 7u) * bpp + * + 7u) / 8u" */ + if (lodepng_mulofl((size_t)(w / 8u), bpp, &line)) + return 1; + if (lodepng_addofl(line, ((w & 7u) * bpp + 7u) / 8u, &line)) + return 1; + + if (lodepng_addofl(line, 5, &line)) + return 1; /* 5 bytes overhead per line: 1 filterbyte, 4 for Adam7 worst + * case + */ + if (lodepng_mulofl(line, h, &total)) + return 1; /* Total bytes in worst case */ + + return 0; /* no overflow */ } #endif /*LODEPNG_COMPILE_DECODER*/ #endif /*LODEPNG_COMPILE_PNG*/ #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -static void LodePNGUnknownChunks_init(LodePNGInfo* info) { - unsigned i; - for(i = 0; i != 3; ++i) info->unknown_chunks_data[i] = 0; - for(i = 0; i != 3; ++i) info->unknown_chunks_size[i] = 0; +static void LodePNGUnknownChunks_init(LodePNGInfo *info) { + unsigned i; + for (i = 0; i != 3; ++i) + info->unknown_chunks_data[i] = 0; + for (i = 0; i != 3; ++i) + info->unknown_chunks_size[i] = 0; } -static void LodePNGUnknownChunks_cleanup(LodePNGInfo* info) { - unsigned i; - for(i = 0; i != 3; ++i) lodepng_free(info->unknown_chunks_data[i]); +static void LodePNGUnknownChunks_cleanup(LodePNGInfo *info) { + unsigned i; + for (i = 0; i != 3; ++i) + lodepng_free(info->unknown_chunks_data[i]); } -static unsigned LodePNGUnknownChunks_copy(LodePNGInfo* dest, const LodePNGInfo* src) { - unsigned i; +static unsigned LodePNGUnknownChunks_copy(LodePNGInfo *dest, const LodePNGInfo *src) { + unsigned i; - LodePNGUnknownChunks_cleanup(dest); + LodePNGUnknownChunks_cleanup(dest); - for(i = 0; i != 3; ++i) { - size_t j; - dest->unknown_chunks_size[i] = src->unknown_chunks_size[i]; - dest->unknown_chunks_data[i] = (unsigned char*)lodepng_malloc(src->unknown_chunks_size[i]); - if(!dest->unknown_chunks_data[i] && dest->unknown_chunks_size[i]) return 83; /*alloc fail*/ - for(j = 0; j < src->unknown_chunks_size[i]; ++j) { - dest->unknown_chunks_data[i][j] = src->unknown_chunks_data[i][j]; - } - } + for (i = 0; i != 3; ++i) { + size_t j; + dest->unknown_chunks_size[i] = src->unknown_chunks_size[i]; + dest->unknown_chunks_data[i] = (unsigned char *)lodepng_malloc(src->unknown_chunks_size[i]); + if (!dest->unknown_chunks_data[i] && dest->unknown_chunks_size[i]) + return 83; /*alloc fail*/ + for (j = 0; j < src->unknown_chunks_size[i]; ++j) { + dest->unknown_chunks_data[i][j] = src->unknown_chunks_data[i][j]; + } + } - return 0; + return 0; } /******************************************************************************/ -static void LodePNGText_init(LodePNGInfo* info) { - info->text_num = 0; - info->text_keys = NULL; - info->text_strings = NULL; +static void LodePNGText_init(LodePNGInfo *info) { + info->text_num = 0; + info->text_keys = NULL; + info->text_strings = NULL; } -static void LodePNGText_cleanup(LodePNGInfo* info) { - size_t i; - for(i = 0; i != info->text_num; ++i) { - string_cleanup(&info->text_keys[i]); - string_cleanup(&info->text_strings[i]); - } - lodepng_free(info->text_keys); - lodepng_free(info->text_strings); +static void LodePNGText_cleanup(LodePNGInfo *info) { + size_t i; + for (i = 0; i != info->text_num; ++i) { + string_cleanup(&info->text_keys[i]); + string_cleanup(&info->text_strings[i]); + } + lodepng_free(info->text_keys); + lodepng_free(info->text_strings); } -static unsigned LodePNGText_copy(LodePNGInfo* dest, const LodePNGInfo* source) { - size_t i = 0; - dest->text_keys = NULL; - dest->text_strings = NULL; - dest->text_num = 0; - for(i = 0; i != source->text_num; ++i) { - CERROR_TRY_RETURN(lodepng_add_text(dest, source->text_keys[i], source->text_strings[i])); - } - return 0; +static unsigned LodePNGText_copy(LodePNGInfo *dest, const LodePNGInfo *source) { + size_t i = 0; + dest->text_keys = NULL; + dest->text_strings = NULL; + dest->text_num = 0; + for (i = 0; i != source->text_num; ++i) { + CERROR_TRY_RETURN(lodepng_add_text(dest, source->text_keys[i], source->text_strings[i])); + } + return 0; } -static unsigned lodepng_add_text_sized(LodePNGInfo* info, const char* key, const char* str, size_t size) { - char** new_keys = (char**)(lodepng_realloc(info->text_keys, sizeof(char*) * (info->text_num + 1))); - char** new_strings = (char**)(lodepng_realloc(info->text_strings, sizeof(char*) * (info->text_num + 1))); +static unsigned lodepng_add_text_sized( + LodePNGInfo *info, const char *key, const char *str, size_t size) { + char **new_keys = + (char **)(lodepng_realloc(info->text_keys, sizeof(char *) * (info->text_num + 1))); + char **new_strings = + (char **)(lodepng_realloc(info->text_strings, sizeof(char *) * (info->text_num + 1))); - if(new_keys) info->text_keys = new_keys; - if(new_strings) info->text_strings = new_strings; + if (new_keys) + info->text_keys = new_keys; + if (new_strings) + info->text_strings = new_strings; - if(!new_keys || !new_strings) return 83; /*alloc fail*/ + if (!new_keys || !new_strings) + return 83; /*alloc fail*/ - ++info->text_num; - info->text_keys[info->text_num - 1] = alloc_string(key); - info->text_strings[info->text_num - 1] = alloc_string_sized(str, size); - if(!info->text_keys[info->text_num - 1] || !info->text_strings[info->text_num - 1]) return 83; /*alloc fail*/ + ++info->text_num; + info->text_keys[info->text_num - 1] = alloc_string(key); + info->text_strings[info->text_num - 1] = alloc_string_sized(str, size); + if (!info->text_keys[info->text_num - 1] || !info->text_strings[info->text_num - 1]) + return 83; /*alloc fail*/ - return 0; + return 0; } -unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str) { - return lodepng_add_text_sized(info, key, str, lodepng_strlen(str)); +unsigned lodepng_add_text(LodePNGInfo *info, const char *key, const char *str) { + return lodepng_add_text_sized(info, key, str, lodepng_strlen(str)); } -void lodepng_clear_text(LodePNGInfo* info) { - LodePNGText_cleanup(info); -} +void lodepng_clear_text(LodePNGInfo *info) { LodePNGText_cleanup(info); } /******************************************************************************/ -static void LodePNGIText_init(LodePNGInfo* info) { - info->itext_num = 0; - info->itext_keys = NULL; - info->itext_langtags = NULL; - info->itext_transkeys = NULL; - info->itext_strings = NULL; -} - -static void LodePNGIText_cleanup(LodePNGInfo* info) { - size_t i; - for(i = 0; i != info->itext_num; ++i) { - string_cleanup(&info->itext_keys[i]); - string_cleanup(&info->itext_langtags[i]); - string_cleanup(&info->itext_transkeys[i]); - string_cleanup(&info->itext_strings[i]); - } - lodepng_free(info->itext_keys); - lodepng_free(info->itext_langtags); - lodepng_free(info->itext_transkeys); - lodepng_free(info->itext_strings); -} - -static unsigned LodePNGIText_copy(LodePNGInfo* dest, const LodePNGInfo* source) { - size_t i = 0; - dest->itext_keys = NULL; - dest->itext_langtags = NULL; - dest->itext_transkeys = NULL; - dest->itext_strings = NULL; - dest->itext_num = 0; - for(i = 0; i != source->itext_num; ++i) { - CERROR_TRY_RETURN(lodepng_add_itext(dest, source->itext_keys[i], source->itext_langtags[i], - source->itext_transkeys[i], source->itext_strings[i])); - } - return 0; -} - -void lodepng_clear_itext(LodePNGInfo* info) { - LodePNGIText_cleanup(info); -} - -static unsigned lodepng_add_itext_sized(LodePNGInfo* info, const char* key, const char* langtag, - const char* transkey, const char* str, size_t size) { - char** new_keys = (char**)(lodepng_realloc(info->itext_keys, sizeof(char*) * (info->itext_num + 1))); - char** new_langtags = (char**)(lodepng_realloc(info->itext_langtags, sizeof(char*) * (info->itext_num + 1))); - char** new_transkeys = (char**)(lodepng_realloc(info->itext_transkeys, sizeof(char*) * (info->itext_num + 1))); - char** new_strings = (char**)(lodepng_realloc(info->itext_strings, sizeof(char*) * (info->itext_num + 1))); - - if(new_keys) info->itext_keys = new_keys; - if(new_langtags) info->itext_langtags = new_langtags; - if(new_transkeys) info->itext_transkeys = new_transkeys; - if(new_strings) info->itext_strings = new_strings; - - if(!new_keys || !new_langtags || !new_transkeys || !new_strings) return 83; /*alloc fail*/ - - ++info->itext_num; - - info->itext_keys[info->itext_num - 1] = alloc_string(key); - info->itext_langtags[info->itext_num - 1] = alloc_string(langtag); - info->itext_transkeys[info->itext_num - 1] = alloc_string(transkey); - info->itext_strings[info->itext_num - 1] = alloc_string_sized(str, size); - - return 0; -} - -unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag, - const char* transkey, const char* str) { - return lodepng_add_itext_sized(info, key, langtag, transkey, str, lodepng_strlen(str)); +static void LodePNGIText_init(LodePNGInfo *info) { + info->itext_num = 0; + info->itext_keys = NULL; + info->itext_langtags = NULL; + info->itext_transkeys = NULL; + info->itext_strings = NULL; +} + +static void LodePNGIText_cleanup(LodePNGInfo *info) { + size_t i; + for (i = 0; i != info->itext_num; ++i) { + string_cleanup(&info->itext_keys[i]); + string_cleanup(&info->itext_langtags[i]); + string_cleanup(&info->itext_transkeys[i]); + string_cleanup(&info->itext_strings[i]); + } + lodepng_free(info->itext_keys); + lodepng_free(info->itext_langtags); + lodepng_free(info->itext_transkeys); + lodepng_free(info->itext_strings); +} + +static unsigned LodePNGIText_copy(LodePNGInfo *dest, const LodePNGInfo *source) { + size_t i = 0; + dest->itext_keys = NULL; + dest->itext_langtags = NULL; + dest->itext_transkeys = NULL; + dest->itext_strings = NULL; + dest->itext_num = 0; + for (i = 0; i != source->itext_num; ++i) { + CERROR_TRY_RETURN(lodepng_add_itext(dest, source->itext_keys[i], source->itext_langtags[i], + source->itext_transkeys[i], source->itext_strings[i])); + } + return 0; +} + +void lodepng_clear_itext(LodePNGInfo *info) { LodePNGIText_cleanup(info); } + +static unsigned lodepng_add_itext_sized(LodePNGInfo *info, const char *key, const char *langtag, + const char *transkey, const char *str, size_t size) { + char **new_keys = + (char **)(lodepng_realloc(info->itext_keys, sizeof(char *) * (info->itext_num + 1))); + char **new_langtags = + (char **)(lodepng_realloc(info->itext_langtags, sizeof(char *) * (info->itext_num + 1))); + char **new_transkeys = + (char **)(lodepng_realloc(info->itext_transkeys, sizeof(char *) * (info->itext_num + 1))); + char **new_strings = + (char **)(lodepng_realloc(info->itext_strings, sizeof(char *) * (info->itext_num + 1))); + + if (new_keys) + info->itext_keys = new_keys; + if (new_langtags) + info->itext_langtags = new_langtags; + if (new_transkeys) + info->itext_transkeys = new_transkeys; + if (new_strings) + info->itext_strings = new_strings; + + if (!new_keys || !new_langtags || !new_transkeys || !new_strings) + return 83; /*alloc fail*/ + + ++info->itext_num; + + info->itext_keys[info->itext_num - 1] = alloc_string(key); + info->itext_langtags[info->itext_num - 1] = alloc_string(langtag); + info->itext_transkeys[info->itext_num - 1] = alloc_string(transkey); + info->itext_strings[info->itext_num - 1] = alloc_string_sized(str, size); + + return 0; +} + +unsigned lodepng_add_itext(LodePNGInfo *info, const char *key, const char *langtag, + const char *transkey, const char *str) { + return lodepng_add_itext_sized(info, key, langtag, transkey, str, lodepng_strlen(str)); } /* same as set but does not delete */ -static unsigned lodepng_assign_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) { - if(profile_size == 0) return 100; /*invalid ICC profile size*/ +static unsigned lodepng_assign_icc( + LodePNGInfo *info, const char *name, const unsigned char *profile, unsigned profile_size) { + if (profile_size == 0) + return 100; /*invalid ICC profile size*/ - info->iccp_name = alloc_string(name); - info->iccp_profile = (unsigned char*)lodepng_malloc(profile_size); + info->iccp_name = alloc_string(name); + info->iccp_profile = (unsigned char *)lodepng_malloc(profile_size); - if(!info->iccp_name || !info->iccp_profile) return 83; /*alloc fail*/ + if (!info->iccp_name || !info->iccp_profile) + return 83; /*alloc fail*/ - lodepng_memcpy(info->iccp_profile, profile, profile_size); - info->iccp_profile_size = profile_size; + lodepng_memcpy(info->iccp_profile, profile, profile_size); + info->iccp_profile_size = profile_size; - return 0; /*ok*/ + return 0; /*ok*/ } -unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) { - if(info->iccp_name) lodepng_clear_icc(info); - info->iccp_defined = 1; +unsigned lodepng_set_icc( + LodePNGInfo *info, const char *name, const unsigned char *profile, unsigned profile_size) { + if (info->iccp_name) + lodepng_clear_icc(info); + info->iccp_defined = 1; - return lodepng_assign_icc(info, name, profile, profile_size); + return lodepng_assign_icc(info, name, profile, profile_size); } -void lodepng_clear_icc(LodePNGInfo* info) { - string_cleanup(&info->iccp_name); - lodepng_free(info->iccp_profile); - info->iccp_profile = NULL; - info->iccp_profile_size = 0; - info->iccp_defined = 0; +void lodepng_clear_icc(LodePNGInfo *info) { + string_cleanup(&info->iccp_name); + lodepng_free(info->iccp_profile); + info->iccp_profile = NULL; + info->iccp_profile_size = 0; + info->iccp_defined = 0; } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -void lodepng_info_init(LodePNGInfo* info) { - lodepng_color_mode_init(&info->color); - info->interlace_method = 0; - info->compression_method = 0; - info->filter_method = 0; +void lodepng_info_init(LodePNGInfo *info) { + lodepng_color_mode_init(&info->color); + info->interlace_method = 0; + info->compression_method = 0; + info->filter_method = 0; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - info->background_defined = 0; - info->background_r = info->background_g = info->background_b = 0; + info->background_defined = 0; + info->background_r = info->background_g = info->background_b = 0; - LodePNGText_init(info); - LodePNGIText_init(info); + LodePNGText_init(info); + LodePNGIText_init(info); - info->time_defined = 0; - info->phys_defined = 0; + info->time_defined = 0; + info->phys_defined = 0; - info->gama_defined = 0; - info->chrm_defined = 0; - info->srgb_defined = 0; - info->iccp_defined = 0; - info->iccp_name = NULL; - info->iccp_profile = NULL; + info->gama_defined = 0; + info->chrm_defined = 0; + info->srgb_defined = 0; + info->iccp_defined = 0; + info->iccp_name = NULL; + info->iccp_profile = NULL; - info->sbit_defined = 0; - info->sbit_r = info->sbit_g = info->sbit_b = info->sbit_a = 0; + info->sbit_defined = 0; + info->sbit_r = info->sbit_g = info->sbit_b = info->sbit_a = 0; - LodePNGUnknownChunks_init(info); + LodePNGUnknownChunks_init(info); #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ } -void lodepng_info_cleanup(LodePNGInfo* info) { - lodepng_color_mode_cleanup(&info->color); +void lodepng_info_cleanup(LodePNGInfo *info) { + lodepng_color_mode_cleanup(&info->color); #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - LodePNGText_cleanup(info); - LodePNGIText_cleanup(info); + LodePNGText_cleanup(info); + LodePNGIText_cleanup(info); - lodepng_clear_icc(info); + lodepng_clear_icc(info); - LodePNGUnknownChunks_cleanup(info); + LodePNGUnknownChunks_cleanup(info); #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ } -unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source) { - lodepng_info_cleanup(dest); - lodepng_memcpy(dest, source, sizeof(LodePNGInfo)); - lodepng_color_mode_init(&dest->color); - CERROR_TRY_RETURN(lodepng_color_mode_copy(&dest->color, &source->color)); +unsigned lodepng_info_copy(LodePNGInfo *dest, const LodePNGInfo *source) { + lodepng_info_cleanup(dest); + lodepng_memcpy(dest, source, sizeof(LodePNGInfo)); + lodepng_color_mode_init(&dest->color); + CERROR_TRY_RETURN(lodepng_color_mode_copy(&dest->color, &source->color)); #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - CERROR_TRY_RETURN(LodePNGText_copy(dest, source)); - CERROR_TRY_RETURN(LodePNGIText_copy(dest, source)); - if(source->iccp_defined) { - CERROR_TRY_RETURN(lodepng_assign_icc(dest, source->iccp_name, source->iccp_profile, source->iccp_profile_size)); - } - - LodePNGUnknownChunks_init(dest); - CERROR_TRY_RETURN(LodePNGUnknownChunks_copy(dest, source)); + CERROR_TRY_RETURN(LodePNGText_copy(dest, source)); + CERROR_TRY_RETURN(LodePNGIText_copy(dest, source)); + if (source->iccp_defined) { + CERROR_TRY_RETURN(lodepng_assign_icc( + dest, source->iccp_name, source->iccp_profile, source->iccp_profile_size)); + } + + LodePNGUnknownChunks_init(dest); + CERROR_TRY_RETURN(LodePNGUnknownChunks_copy(dest, source)); #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - return 0; + return 0; } /* ////////////////////////////////////////////////////////////////////////// */ -/*index: bitgroup index, bits: bitgroup size(1, 2 or 4), in: bitgroup value, out: octet array to add bits to*/ -static void addColorBits(unsigned char* out, size_t index, unsigned bits, unsigned in) { - unsigned m = bits == 1 ? 7 : bits == 2 ? 3 : 1; /*8 / bits - 1*/ - /*p = the partial index in the byte, e.g. with 4 palettebits it is 0 for first half or 1 for second half*/ - unsigned p = index & m; - in &= (1u << bits) - 1u; /*filter out any other bits of the input value*/ - in = in << (bits * (m - p)); - if(p == 0) out[index * bits / 8u] = in; - else out[index * bits / 8u] |= in; +/*index: bitgroup index, bits: bitgroup size(1, 2 or 4), in: bitgroup value, + * out: octet array to add bits to*/ +static void addColorBits(unsigned char *out, size_t index, unsigned bits, unsigned in) { + unsigned m = bits == 1 ? 7 : bits == 2 ? 3 : 1; /*8 / bits - 1*/ + /*p = the partial index in the byte, e.g. with 4 palettebits it is 0 for + * first half or 1 for second half*/ + unsigned p = index & m; + in &= (1u << bits) - 1u; /*filter out any other bits of the input value*/ + in = in << (bits * (m - p)); + if (p == 0) + out[index * bits / 8u] = in; + else + out[index * bits / 8u] |= in; } typedef struct ColorTree ColorTree; /* One node of a color tree -This is the data structure used to count the number of unique colors and to get a palette -index for a color. It's like an octree, but because the alpha channel is used too, each -node has 16 instead of 8 children. +This is the data structure used to count the number of unique colors and to get +a palette index for a color. It's like an octree, but because the alpha channel +is used too, each node has 16 instead of 8 children. */ struct ColorTree { - ColorTree* children[16]; /*up to 16 pointers to ColorTree of next level*/ - int index; /*the payload. Only has a meaningful value if this is in the last level*/ + ColorTree *children[16]; /*up to 16 pointers to ColorTree of next level*/ + int index; /*the payload. Only has a meaningful value if this is in the last + level*/ }; -static void color_tree_init(ColorTree* tree) { - lodepng_memset(tree->children, 0, 16 * sizeof(*tree->children)); - tree->index = -1; +static void color_tree_init(ColorTree *tree) { + lodepng_memset(tree->children, 0, 16 * sizeof(*tree->children)); + tree->index = -1; } -static void color_tree_cleanup(ColorTree* tree) { - int i; - for(i = 0; i != 16; ++i) { - if(tree->children[i]) { - color_tree_cleanup(tree->children[i]); - lodepng_free(tree->children[i]); - } - } +static void color_tree_cleanup(ColorTree *tree) { + int i; + for (i = 0; i != 16; ++i) { + if (tree->children[i]) { + color_tree_cleanup(tree->children[i]); + lodepng_free(tree->children[i]); + } + } } /*returns -1 if color not present, its index otherwise*/ -static int color_tree_get(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { - int bit = 0; - for(bit = 0; bit < 8; ++bit) { - int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); - if(!tree->children[i]) return -1; - else tree = tree->children[i]; - } - return tree ? tree->index : -1; +static int color_tree_get( + ColorTree *tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { + int bit = 0; + for (bit = 0; bit < 8; ++bit) { + int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + + 1 * ((a >> bit) & 1); + if (!tree->children[i]) + return -1; + else + tree = tree->children[i]; + } + return tree ? tree->index : -1; } #ifdef LODEPNG_COMPILE_ENCODER -static int color_tree_has(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { - return color_tree_get(tree, r, g, b, a) >= 0; +static int color_tree_has( + ColorTree *tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) { + return color_tree_get(tree, r, g, b, a) >= 0; } #endif /*LODEPNG_COMPILE_ENCODER*/ /*color is not allowed to already exist. -Index should be >= 0 (it's signed to be compatible with using -1 for "doesn't exist") -Returns error code, or 0 if ok*/ -static unsigned color_tree_add(ColorTree* tree, - unsigned char r, unsigned char g, unsigned char b, unsigned char a, unsigned index) { - int bit; - for(bit = 0; bit < 8; ++bit) { - int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1); - if(!tree->children[i]) { - tree->children[i] = (ColorTree*)lodepng_malloc(sizeof(ColorTree)); - if(!tree->children[i]) return 83; /*alloc fail*/ - color_tree_init(tree->children[i]); - } - tree = tree->children[i]; - } - tree->index = (int)index; - return 0; +Index should be >= 0 (it's signed to be compatible with using -1 for "doesn't +exist") Returns error code, or 0 if ok*/ +static unsigned color_tree_add(ColorTree *tree, unsigned char r, unsigned char g, unsigned char b, + unsigned char a, unsigned index) { + int bit; + for (bit = 0; bit < 8; ++bit) { + int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + + 1 * ((a >> bit) & 1); + if (!tree->children[i]) { + tree->children[i] = (ColorTree *)lodepng_malloc(sizeof(ColorTree)); + if (!tree->children[i]) + return 83; /*alloc fail*/ + color_tree_init(tree->children[i]); + } + tree = tree->children[i]; + } + tree->index = (int)index; + return 0; } /*put a pixel, given its RGBA color, into image of any color type*/ -static unsigned rgba8ToPixel(unsigned char* out, size_t i, - const LodePNGColorMode* mode, ColorTree* tree /*for palette*/, - unsigned char r, unsigned char g, unsigned char b, unsigned char a) { - if(mode->colortype == LCT_GREY) { - unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/ - if(mode->bitdepth == 8) out[i] = gray; - else if(mode->bitdepth == 16) out[i * 2 + 0] = out[i * 2 + 1] = gray; - else { - /*take the most significant bits of gray*/ - gray = ((unsigned)gray >> (8u - mode->bitdepth)) & ((1u << mode->bitdepth) - 1u); - addColorBits(out, i, mode->bitdepth, gray); - } - } else if(mode->colortype == LCT_RGB) { - if(mode->bitdepth == 8) { - out[i * 3 + 0] = r; - out[i * 3 + 1] = g; - out[i * 3 + 2] = b; - } else { - out[i * 6 + 0] = out[i * 6 + 1] = r; - out[i * 6 + 2] = out[i * 6 + 3] = g; - out[i * 6 + 4] = out[i * 6 + 5] = b; - } - } else if(mode->colortype == LCT_PALETTE) { - int index = color_tree_get(tree, r, g, b, a); - if(index < 0) return 82; /*color not in palette*/ - if(mode->bitdepth == 8) out[i] = index; - else addColorBits(out, i, mode->bitdepth, (unsigned)index); - } else if(mode->colortype == LCT_GREY_ALPHA) { - unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/ - if(mode->bitdepth == 8) { - out[i * 2 + 0] = gray; - out[i * 2 + 1] = a; - } else if(mode->bitdepth == 16) { - out[i * 4 + 0] = out[i * 4 + 1] = gray; - out[i * 4 + 2] = out[i * 4 + 3] = a; - } - } else if(mode->colortype == LCT_RGBA) { - if(mode->bitdepth == 8) { - out[i * 4 + 0] = r; - out[i * 4 + 1] = g; - out[i * 4 + 2] = b; - out[i * 4 + 3] = a; - } else { - out[i * 8 + 0] = out[i * 8 + 1] = r; - out[i * 8 + 2] = out[i * 8 + 3] = g; - out[i * 8 + 4] = out[i * 8 + 5] = b; - out[i * 8 + 6] = out[i * 8 + 7] = a; - } - } - - return 0; /*no error*/ -} - -/*put a pixel, given its RGBA16 color, into image of any color 16-bitdepth type*/ -static void rgba16ToPixel(unsigned char* out, size_t i, - const LodePNGColorMode* mode, - unsigned short r, unsigned short g, unsigned short b, unsigned short a) { - if(mode->colortype == LCT_GREY) { - unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/ - out[i * 2 + 0] = (gray >> 8) & 255; - out[i * 2 + 1] = gray & 255; - } else if(mode->colortype == LCT_RGB) { - out[i * 6 + 0] = (r >> 8) & 255; - out[i * 6 + 1] = r & 255; - out[i * 6 + 2] = (g >> 8) & 255; - out[i * 6 + 3] = g & 255; - out[i * 6 + 4] = (b >> 8) & 255; - out[i * 6 + 5] = b & 255; - } else if(mode->colortype == LCT_GREY_ALPHA) { - unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/ - out[i * 4 + 0] = (gray >> 8) & 255; - out[i * 4 + 1] = gray & 255; - out[i * 4 + 2] = (a >> 8) & 255; - out[i * 4 + 3] = a & 255; - } else if(mode->colortype == LCT_RGBA) { - out[i * 8 + 0] = (r >> 8) & 255; - out[i * 8 + 1] = r & 255; - out[i * 8 + 2] = (g >> 8) & 255; - out[i * 8 + 3] = g & 255; - out[i * 8 + 4] = (b >> 8) & 255; - out[i * 8 + 5] = b & 255; - out[i * 8 + 6] = (a >> 8) & 255; - out[i * 8 + 7] = a & 255; - } -} - -/*Get RGBA8 color of pixel with index i (y * width + x) from the raw image with given color type.*/ -static void getPixelColorRGBA8(unsigned char* r, unsigned char* g, - unsigned char* b, unsigned char* a, - const unsigned char* in, size_t i, - const LodePNGColorMode* mode) { - if(mode->colortype == LCT_GREY) { - if(mode->bitdepth == 8) { - *r = *g = *b = in[i]; - if(mode->key_defined && *r == mode->key_r) *a = 0; - else *a = 255; - } else if(mode->bitdepth == 16) { - *r = *g = *b = in[i * 2 + 0]; - if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0; - else *a = 255; - } else { - unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ - size_t j = i * mode->bitdepth; - unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); - *r = *g = *b = (value * 255) / highest; - if(mode->key_defined && value == mode->key_r) *a = 0; - else *a = 255; - } - } else if(mode->colortype == LCT_RGB) { - if(mode->bitdepth == 8) { - *r = in[i * 3 + 0]; *g = in[i * 3 + 1]; *b = in[i * 3 + 2]; - if(mode->key_defined && *r == mode->key_r && *g == mode->key_g && *b == mode->key_b) *a = 0; - else *a = 255; - } else { - *r = in[i * 6 + 0]; - *g = in[i * 6 + 2]; - *b = in[i * 6 + 4]; - if(mode->key_defined && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r - && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g - && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0; - else *a = 255; - } - } else if(mode->colortype == LCT_PALETTE) { - unsigned index; - if(mode->bitdepth == 8) index = in[i]; - else { - size_t j = i * mode->bitdepth; - index = readBitsFromReversedStream(&j, in, mode->bitdepth); - } - /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ - *r = mode->palette[index * 4 + 0]; - *g = mode->palette[index * 4 + 1]; - *b = mode->palette[index * 4 + 2]; - *a = mode->palette[index * 4 + 3]; - } else if(mode->colortype == LCT_GREY_ALPHA) { - if(mode->bitdepth == 8) { - *r = *g = *b = in[i * 2 + 0]; - *a = in[i * 2 + 1]; - } else { - *r = *g = *b = in[i * 4 + 0]; - *a = in[i * 4 + 2]; - } - } else if(mode->colortype == LCT_RGBA) { - if(mode->bitdepth == 8) { - *r = in[i * 4 + 0]; - *g = in[i * 4 + 1]; - *b = in[i * 4 + 2]; - *a = in[i * 4 + 3]; - } else { - *r = in[i * 8 + 0]; - *g = in[i * 8 + 2]; - *b = in[i * 8 + 4]; - *a = in[i * 8 + 6]; - } - } +static unsigned rgba8ToPixel(unsigned char *out, size_t i, const LodePNGColorMode *mode, + ColorTree *tree /*for palette*/, unsigned char r, unsigned char g, unsigned char b, + unsigned char a) { + if (mode->colortype == LCT_GREY) { + unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/ + if (mode->bitdepth == 8) + out[i] = gray; + else if (mode->bitdepth == 16) + out[i * 2 + 0] = out[i * 2 + 1] = gray; + else { + /*take the most significant bits of gray*/ + gray = ((unsigned)gray >> (8u - mode->bitdepth)) & ((1u << mode->bitdepth) - 1u); + addColorBits(out, i, mode->bitdepth, gray); + } + } else if (mode->colortype == LCT_RGB) { + if (mode->bitdepth == 8) { + out[i * 3 + 0] = r; + out[i * 3 + 1] = g; + out[i * 3 + 2] = b; + } else { + out[i * 6 + 0] = out[i * 6 + 1] = r; + out[i * 6 + 2] = out[i * 6 + 3] = g; + out[i * 6 + 4] = out[i * 6 + 5] = b; + } + } else if (mode->colortype == LCT_PALETTE) { + int index = color_tree_get(tree, r, g, b, a); + if (index < 0) + return 82; /*color not in palette*/ + if (mode->bitdepth == 8) + out[i] = index; + else + addColorBits(out, i, mode->bitdepth, (unsigned)index); + } else if (mode->colortype == LCT_GREY_ALPHA) { + unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/ + if (mode->bitdepth == 8) { + out[i * 2 + 0] = gray; + out[i * 2 + 1] = a; + } else if (mode->bitdepth == 16) { + out[i * 4 + 0] = out[i * 4 + 1] = gray; + out[i * 4 + 2] = out[i * 4 + 3] = a; + } + } else if (mode->colortype == LCT_RGBA) { + if (mode->bitdepth == 8) { + out[i * 4 + 0] = r; + out[i * 4 + 1] = g; + out[i * 4 + 2] = b; + out[i * 4 + 3] = a; + } else { + out[i * 8 + 0] = out[i * 8 + 1] = r; + out[i * 8 + 2] = out[i * 8 + 3] = g; + out[i * 8 + 4] = out[i * 8 + 5] = b; + out[i * 8 + 6] = out[i * 8 + 7] = a; + } + } + + return 0; /*no error*/ +} + +/*put a pixel, given its RGBA16 color, into image of any color 16-bitdepth + * type*/ +static void rgba16ToPixel(unsigned char *out, size_t i, const LodePNGColorMode *mode, + unsigned short r, unsigned short g, unsigned short b, unsigned short a) { + if (mode->colortype == LCT_GREY) { + unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/ + out[i * 2 + 0] = (gray >> 8) & 255; + out[i * 2 + 1] = gray & 255; + } else if (mode->colortype == LCT_RGB) { + out[i * 6 + 0] = (r >> 8) & 255; + out[i * 6 + 1] = r & 255; + out[i * 6 + 2] = (g >> 8) & 255; + out[i * 6 + 3] = g & 255; + out[i * 6 + 4] = (b >> 8) & 255; + out[i * 6 + 5] = b & 255; + } else if (mode->colortype == LCT_GREY_ALPHA) { + unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/ + out[i * 4 + 0] = (gray >> 8) & 255; + out[i * 4 + 1] = gray & 255; + out[i * 4 + 2] = (a >> 8) & 255; + out[i * 4 + 3] = a & 255; + } else if (mode->colortype == LCT_RGBA) { + out[i * 8 + 0] = (r >> 8) & 255; + out[i * 8 + 1] = r & 255; + out[i * 8 + 2] = (g >> 8) & 255; + out[i * 8 + 3] = g & 255; + out[i * 8 + 4] = (b >> 8) & 255; + out[i * 8 + 5] = b & 255; + out[i * 8 + 6] = (a >> 8) & 255; + out[i * 8 + 7] = a & 255; + } +} + +/*Get RGBA8 color of pixel with index i (y * width + x) from the raw image with + * given color type.*/ +static void getPixelColorRGBA8(unsigned char *r, unsigned char *g, unsigned char *b, + unsigned char *a, const unsigned char *in, size_t i, const LodePNGColorMode *mode) { + if (mode->colortype == LCT_GREY) { + if (mode->bitdepth == 8) { + *r = *g = *b = in[i]; + if (mode->key_defined && *r == mode->key_r) + *a = 0; + else + *a = 255; + } else if (mode->bitdepth == 16) { + *r = *g = *b = in[i * 2 + 0]; + if (mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) + *a = 0; + else + *a = 255; + } else { + unsigned highest = + ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ + size_t j = i * mode->bitdepth; + unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); + *r = *g = *b = (value * 255) / highest; + if (mode->key_defined && value == mode->key_r) + *a = 0; + else + *a = 255; + } + } else if (mode->colortype == LCT_RGB) { + if (mode->bitdepth == 8) { + *r = in[i * 3 + 0]; + *g = in[i * 3 + 1]; + *b = in[i * 3 + 2]; + if (mode->key_defined && *r == mode->key_r && *g == mode->key_g && *b == mode->key_b) + *a = 0; + else + *a = 255; + } else { + *r = in[i * 6 + 0]; + *g = in[i * 6 + 2]; + *b = in[i * 6 + 4]; + if (mode->key_defined && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r && + 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g && + 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) + *a = 0; + else + *a = 255; + } + } else if (mode->colortype == LCT_PALETTE) { + unsigned index; + if (mode->bitdepth == 8) + index = in[i]; + else { + size_t j = i * mode->bitdepth; + index = readBitsFromReversedStream(&j, in, mode->bitdepth); + } + /*out of bounds of palette not checked: see + * lodepng_color_mode_alloc_palette.*/ + *r = mode->palette[index * 4 + 0]; + *g = mode->palette[index * 4 + 1]; + *b = mode->palette[index * 4 + 2]; + *a = mode->palette[index * 4 + 3]; + } else if (mode->colortype == LCT_GREY_ALPHA) { + if (mode->bitdepth == 8) { + *r = *g = *b = in[i * 2 + 0]; + *a = in[i * 2 + 1]; + } else { + *r = *g = *b = in[i * 4 + 0]; + *a = in[i * 4 + 2]; + } + } else if (mode->colortype == LCT_RGBA) { + if (mode->bitdepth == 8) { + *r = in[i * 4 + 0]; + *g = in[i * 4 + 1]; + *b = in[i * 4 + 2]; + *a = in[i * 4 + 3]; + } else { + *r = in[i * 8 + 0]; + *g = in[i * 8 + 2]; + *b = in[i * 8 + 4]; + *a = in[i * 8 + 6]; + } + } } /*Similar to getPixelColorRGBA8, but with all the for loops inside of the color mode test cases, optimized to convert the colors much faster, when converting to the common case of RGBA with 8 bit per channel. buffer must be RGBA with enough memory.*/ -static void getPixelColorsRGBA8(unsigned char* LODEPNG_RESTRICT buffer, size_t numpixels, - const unsigned char* LODEPNG_RESTRICT in, - const LodePNGColorMode* mode) { - unsigned num_channels = 4; - size_t i; - if(mode->colortype == LCT_GREY) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i]; - buffer[3] = 255; - } - if(mode->key_defined) { - buffer -= numpixels * num_channels; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - if(buffer[0] == mode->key_r) buffer[3] = 0; - } - } - } else if(mode->bitdepth == 16) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 2]; - buffer[3] = mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r ? 0 : 255; - } - } else { - unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); - buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; - buffer[3] = mode->key_defined && value == mode->key_r ? 0 : 255; - } - } - } else if(mode->colortype == LCT_RGB) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - lodepng_memcpy(buffer, &in[i * 3], 3); - buffer[3] = 255; - } - if(mode->key_defined) { - buffer -= numpixels * num_channels; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - if(buffer[0] == mode->key_r && buffer[1]== mode->key_g && buffer[2] == mode->key_b) buffer[3] = 0; - } - } - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 6 + 0]; - buffer[1] = in[i * 6 + 2]; - buffer[2] = in[i * 6 + 4]; - buffer[3] = mode->key_defined - && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r - && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g - && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b ? 0 : 255; - } - } - } else if(mode->colortype == LCT_PALETTE) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned index = in[i]; - /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ - lodepng_memcpy(buffer, &mode->palette[index * 4], 4); - } - } else { - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth); - /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ - lodepng_memcpy(buffer, &mode->palette[index * 4], 4); - } - } - } else if(mode->colortype == LCT_GREY_ALPHA) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; - buffer[3] = in[i * 2 + 1]; - } - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; - buffer[3] = in[i * 4 + 2]; - } - } - } else if(mode->colortype == LCT_RGBA) { - if(mode->bitdepth == 8) { - lodepng_memcpy(buffer, in, numpixels * 4); - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 8 + 0]; - buffer[1] = in[i * 8 + 2]; - buffer[2] = in[i * 8 + 4]; - buffer[3] = in[i * 8 + 6]; - } - } - } +static void getPixelColorsRGBA8(unsigned char *LODEPNG_RESTRICT buffer, size_t numpixels, + const unsigned char *LODEPNG_RESTRICT in, const LodePNGColorMode *mode) { + unsigned num_channels = 4; + size_t i; + if (mode->colortype == LCT_GREY) { + if (mode->bitdepth == 8) { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i]; + buffer[3] = 255; + } + if (mode->key_defined) { + buffer -= numpixels * num_channels; + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + if (buffer[0] == mode->key_r) + buffer[3] = 0; + } + } + } else if (mode->bitdepth == 16) { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 2]; + buffer[3] = mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r + ? 0 + : 255; + } + } else { + unsigned highest = + ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ + size_t j = 0; + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); + buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; + buffer[3] = mode->key_defined && value == mode->key_r ? 0 : 255; + } + } + } else if (mode->colortype == LCT_RGB) { + if (mode->bitdepth == 8) { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + lodepng_memcpy(buffer, &in[i * 3], 3); + buffer[3] = 255; + } + if (mode->key_defined) { + buffer -= numpixels * num_channels; + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + if (buffer[0] == mode->key_r && buffer[1] == mode->key_g && + buffer[2] == mode->key_b) + buffer[3] = 0; + } + } + } else { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = in[i * 6 + 0]; + buffer[1] = in[i * 6 + 2]; + buffer[2] = in[i * 6 + 4]; + buffer[3] = mode->key_defined && + 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r && + 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g && + 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b + ? 0 + : 255; + } + } + } else if (mode->colortype == LCT_PALETTE) { + if (mode->bitdepth == 8) { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = in[i]; + /*out of bounds of palette not checked: see + * lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 4); + } + } else { + size_t j = 0; + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth); + /*out of bounds of palette not checked: see + * lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 4); + } + } + } else if (mode->colortype == LCT_GREY_ALPHA) { + if (mode->bitdepth == 8) { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; + buffer[3] = in[i * 2 + 1]; + } + } else { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; + buffer[3] = in[i * 4 + 2]; + } + } + } else if (mode->colortype == LCT_RGBA) { + if (mode->bitdepth == 8) { + lodepng_memcpy(buffer, in, numpixels * 4); + } else { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = in[i * 8 + 0]; + buffer[1] = in[i * 8 + 2]; + buffer[2] = in[i * 8 + 4]; + buffer[3] = in[i * 8 + 6]; + } + } + } } /*Similar to getPixelColorsRGBA8, but with 3-channel RGB output.*/ -static void getPixelColorsRGB8(unsigned char* LODEPNG_RESTRICT buffer, size_t numpixels, - const unsigned char* LODEPNG_RESTRICT in, - const LodePNGColorMode* mode) { - const unsigned num_channels = 3; - size_t i; - if(mode->colortype == LCT_GREY) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i]; - } - } else if(mode->bitdepth == 16) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 2]; - } - } else { - unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); - buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; - } - } - } else if(mode->colortype == LCT_RGB) { - if(mode->bitdepth == 8) { - lodepng_memcpy(buffer, in, numpixels * 3); - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 6 + 0]; - buffer[1] = in[i * 6 + 2]; - buffer[2] = in[i * 6 + 4]; - } - } - } else if(mode->colortype == LCT_PALETTE) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned index = in[i]; - /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ - lodepng_memcpy(buffer, &mode->palette[index * 4], 3); - } - } else { - size_t j = 0; - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth); - /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/ - lodepng_memcpy(buffer, &mode->palette[index * 4], 3); - } - } - } else if(mode->colortype == LCT_GREY_ALPHA) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; - } - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; - } - } - } else if(mode->colortype == LCT_RGBA) { - if(mode->bitdepth == 8) { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - lodepng_memcpy(buffer, &in[i * 4], 3); - } - } else { - for(i = 0; i != numpixels; ++i, buffer += num_channels) { - buffer[0] = in[i * 8 + 0]; - buffer[1] = in[i * 8 + 2]; - buffer[2] = in[i * 8 + 4]; - } - } - } +static void getPixelColorsRGB8(unsigned char *LODEPNG_RESTRICT buffer, size_t numpixels, + const unsigned char *LODEPNG_RESTRICT in, const LodePNGColorMode *mode) { + const unsigned num_channels = 3; + size_t i; + if (mode->colortype == LCT_GREY) { + if (mode->bitdepth == 8) { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i]; + } + } else if (mode->bitdepth == 16) { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 2]; + } + } else { + unsigned highest = + ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/ + size_t j = 0; + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth); + buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest; + } + } + } else if (mode->colortype == LCT_RGB) { + if (mode->bitdepth == 8) { + lodepng_memcpy(buffer, in, numpixels * 3); + } else { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = in[i * 6 + 0]; + buffer[1] = in[i * 6 + 2]; + buffer[2] = in[i * 6 + 4]; + } + } + } else if (mode->colortype == LCT_PALETTE) { + if (mode->bitdepth == 8) { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = in[i]; + /*out of bounds of palette not checked: see + * lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 3); + } + } else { + size_t j = 0; + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth); + /*out of bounds of palette not checked: see + * lodepng_color_mode_alloc_palette.*/ + lodepng_memcpy(buffer, &mode->palette[index * 4], 3); + } + } + } else if (mode->colortype == LCT_GREY_ALPHA) { + if (mode->bitdepth == 8) { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0]; + } + } else { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0]; + } + } + } else if (mode->colortype == LCT_RGBA) { + if (mode->bitdepth == 8) { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + lodepng_memcpy(buffer, &in[i * 4], 3); + } + } else { + for (i = 0; i != numpixels; ++i, buffer += num_channels) { + buffer[0] = in[i * 8 + 0]; + buffer[1] = in[i * 8 + 2]; + buffer[2] = in[i * 8 + 4]; + } + } + } } /*Get RGBA16 color of pixel with index i (y * width + x) from the raw image with given color type, but the given color type must be 16-bit itself.*/ -static void getPixelColorRGBA16(unsigned short* r, unsigned short* g, unsigned short* b, unsigned short* a, - const unsigned char* in, size_t i, const LodePNGColorMode* mode) { - if(mode->colortype == LCT_GREY) { - *r = *g = *b = 256 * in[i * 2 + 0] + in[i * 2 + 1]; - if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0; - else *a = 65535; - } else if(mode->colortype == LCT_RGB) { - *r = 256u * in[i * 6 + 0] + in[i * 6 + 1]; - *g = 256u * in[i * 6 + 2] + in[i * 6 + 3]; - *b = 256u * in[i * 6 + 4] + in[i * 6 + 5]; - if(mode->key_defined - && 256u * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r - && 256u * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g - && 256u * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0; - else *a = 65535; - } else if(mode->colortype == LCT_GREY_ALPHA) { - *r = *g = *b = 256u * in[i * 4 + 0] + in[i * 4 + 1]; - *a = 256u * in[i * 4 + 2] + in[i * 4 + 3]; - } else if(mode->colortype == LCT_RGBA) { - *r = 256u * in[i * 8 + 0] + in[i * 8 + 1]; - *g = 256u * in[i * 8 + 2] + in[i * 8 + 3]; - *b = 256u * in[i * 8 + 4] + in[i * 8 + 5]; - *a = 256u * in[i * 8 + 6] + in[i * 8 + 7]; - } -} - -unsigned lodepng_convert(unsigned char* out, const unsigned char* in, - const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in, - unsigned w, unsigned h) { - size_t i; - ColorTree tree; - size_t numpixels = (size_t)w * (size_t)h; - unsigned error = 0; - - if(mode_in->colortype == LCT_PALETTE && !mode_in->palette) { - return 107; /* error: must provide palette if input mode is palette */ - } - - if(lodepng_color_mode_equal(mode_out, mode_in)) { - size_t numbytes = lodepng_get_raw_size(w, h, mode_in); - lodepng_memcpy(out, in, numbytes); - return 0; - } - - if(mode_out->colortype == LCT_PALETTE) { - size_t palettesize = mode_out->palettesize; - const unsigned char* palette = mode_out->palette; - size_t palsize = (size_t)1u << mode_out->bitdepth; - /*if the user specified output palette but did not give the values, assume - they want the values of the input color type (assuming that one is palette). - Note that we never create a new palette ourselves.*/ - if(palettesize == 0) { - palettesize = mode_in->palettesize; - palette = mode_in->palette; - /*if the input was also palette with same bitdepth, then the color types are also - equal, so copy literally. This to preserve the exact indices that were in the PNG - even in case there are duplicate colors in the palette.*/ - if(mode_in->colortype == LCT_PALETTE && mode_in->bitdepth == mode_out->bitdepth) { - size_t numbytes = lodepng_get_raw_size(w, h, mode_in); - lodepng_memcpy(out, in, numbytes); - return 0; - } - } - if(palettesize < palsize) palsize = palettesize; - color_tree_init(&tree); - for(i = 0; i != palsize; ++i) { - const unsigned char* p = &palette[i * 4]; - error = color_tree_add(&tree, p[0], p[1], p[2], p[3], (unsigned)i); - if(error) break; - } - } - - if(!error) { - if(mode_in->bitdepth == 16 && mode_out->bitdepth == 16) { - for(i = 0; i != numpixels; ++i) { - unsigned short r = 0, g = 0, b = 0, a = 0; - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - rgba16ToPixel(out, i, mode_out, r, g, b, a); - } - } else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGBA) { - getPixelColorsRGBA8(out, numpixels, in, mode_in); - } else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGB) { - getPixelColorsRGB8(out, numpixels, in, mode_in); - } else { - unsigned char r = 0, g = 0, b = 0, a = 0; - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); - error = rgba8ToPixel(out, i, mode_out, &tree, r, g, b, a); - if(error) break; - } - } - } - - if(mode_out->colortype == LCT_PALETTE) { - color_tree_cleanup(&tree); - } - - return error; -} - - -/* Converts a single rgb color without alpha from one type to another, color bits truncated to -their bitdepth. In case of single channel (gray or palette), only the r channel is used. Slow -function, do not use to process all pixels of an image. Alpha channel not supported on purpose: -this is for bKGD, supporting alpha may prevent it from finding a color in the palette, from the -specification it looks like bKGD should ignore the alpha values of the palette since it can use -any palette index but doesn't have an alpha channel. Idem with ignoring color key. */ -unsigned lodepng_convert_rgb( - unsigned* r_out, unsigned* g_out, unsigned* b_out, - unsigned r_in, unsigned g_in, unsigned b_in, - const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in) { - unsigned r = 0, g = 0, b = 0; - unsigned mul = 65535 / ((1u << mode_in->bitdepth) - 1u); /*65535, 21845, 4369, 257, 1*/ - unsigned shift = 16 - mode_out->bitdepth; - - if(mode_in->colortype == LCT_GREY || mode_in->colortype == LCT_GREY_ALPHA) { - r = g = b = r_in * mul; - } else if(mode_in->colortype == LCT_RGB || mode_in->colortype == LCT_RGBA) { - r = r_in * mul; - g = g_in * mul; - b = b_in * mul; - } else if(mode_in->colortype == LCT_PALETTE) { - if(r_in >= mode_in->palettesize) return 82; - r = mode_in->palette[r_in * 4 + 0] * 257u; - g = mode_in->palette[r_in * 4 + 1] * 257u; - b = mode_in->palette[r_in * 4 + 2] * 257u; - } else { - return 31; - } - - /* now convert to output format */ - if(mode_out->colortype == LCT_GREY || mode_out->colortype == LCT_GREY_ALPHA) { - *r_out = r >> shift ; - } else if(mode_out->colortype == LCT_RGB || mode_out->colortype == LCT_RGBA) { - *r_out = r >> shift ; - *g_out = g >> shift ; - *b_out = b >> shift ; - } else if(mode_out->colortype == LCT_PALETTE) { - unsigned i; - /* a 16-bit color cannot be in the palette */ - if((r >> 8) != (r & 255) || (g >> 8) != (g & 255) || (b >> 8) != (b & 255)) return 82; - for(i = 0; i < mode_out->palettesize; i++) { - unsigned j = i * 4; - if((r >> 8) == mode_out->palette[j + 0] && (g >> 8) == mode_out->palette[j + 1] && - (b >> 8) == mode_out->palette[j + 2]) { - *r_out = i; - return 0; - } - } - return 82; - } else { - return 31; - } - - return 0; +static void getPixelColorRGBA16(unsigned short *r, unsigned short *g, unsigned short *b, + unsigned short *a, const unsigned char *in, size_t i, const LodePNGColorMode *mode) { + if (mode->colortype == LCT_GREY) { + *r = *g = *b = 256 * in[i * 2 + 0] + in[i * 2 + 1]; + if (mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) + *a = 0; + else + *a = 65535; + } else if (mode->colortype == LCT_RGB) { + *r = 256u * in[i * 6 + 0] + in[i * 6 + 1]; + *g = 256u * in[i * 6 + 2] + in[i * 6 + 3]; + *b = 256u * in[i * 6 + 4] + in[i * 6 + 5]; + if (mode->key_defined && 256u * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r && + 256u * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g && + 256u * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) + *a = 0; + else + *a = 65535; + } else if (mode->colortype == LCT_GREY_ALPHA) { + *r = *g = *b = 256u * in[i * 4 + 0] + in[i * 4 + 1]; + *a = 256u * in[i * 4 + 2] + in[i * 4 + 3]; + } else if (mode->colortype == LCT_RGBA) { + *r = 256u * in[i * 8 + 0] + in[i * 8 + 1]; + *g = 256u * in[i * 8 + 2] + in[i * 8 + 3]; + *b = 256u * in[i * 8 + 4] + in[i * 8 + 5]; + *a = 256u * in[i * 8 + 6] + in[i * 8 + 7]; + } +} + +unsigned lodepng_convert(unsigned char *out, const unsigned char *in, + const LodePNGColorMode *mode_out, const LodePNGColorMode *mode_in, unsigned w, unsigned h) { + size_t i; + ColorTree tree; + size_t numpixels = (size_t)w * (size_t)h; + unsigned error = 0; + + if (mode_in->colortype == LCT_PALETTE && !mode_in->palette) { + return 107; /* error: must provide palette if input mode is palette */ + } + + if (lodepng_color_mode_equal(mode_out, mode_in)) { + size_t numbytes = lodepng_get_raw_size(w, h, mode_in); + lodepng_memcpy(out, in, numbytes); + return 0; + } + + if (mode_out->colortype == LCT_PALETTE) { + size_t palettesize = mode_out->palettesize; + const unsigned char *palette = mode_out->palette; + size_t palsize = (size_t)1u << mode_out->bitdepth; + /*if the user specified output palette but did not give the values, + assume they want the values of the input color type (assuming that one + is palette). Note that we never create a new palette ourselves.*/ + if (palettesize == 0) { + palettesize = mode_in->palettesize; + palette = mode_in->palette; + /*if the input was also palette with same bitdepth, then the color + types are also equal, so copy literally. This to preserve the exact + indices that were in the PNG even in case there are duplicate colors + in the palette.*/ + if (mode_in->colortype == LCT_PALETTE && mode_in->bitdepth == mode_out->bitdepth) { + size_t numbytes = lodepng_get_raw_size(w, h, mode_in); + lodepng_memcpy(out, in, numbytes); + return 0; + } + } + if (palettesize < palsize) + palsize = palettesize; + color_tree_init(&tree); + for (i = 0; i != palsize; ++i) { + const unsigned char *p = &palette[i * 4]; + error = color_tree_add(&tree, p[0], p[1], p[2], p[3], (unsigned)i); + if (error) + break; + } + } + + if (!error) { + if (mode_in->bitdepth == 16 && mode_out->bitdepth == 16) { + for (i = 0; i != numpixels; ++i) { + unsigned short r = 0, g = 0, b = 0, a = 0; + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); + rgba16ToPixel(out, i, mode_out, r, g, b, a); + } + } else if (mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGBA) { + getPixelColorsRGBA8(out, numpixels, in, mode_in); + } else if (mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGB) { + getPixelColorsRGB8(out, numpixels, in, mode_in); + } else { + unsigned char r = 0, g = 0, b = 0, a = 0; + for (i = 0; i != numpixels; ++i) { + getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); + error = rgba8ToPixel(out, i, mode_out, &tree, r, g, b, a); + if (error) + break; + } + } + } + + if (mode_out->colortype == LCT_PALETTE) { + color_tree_cleanup(&tree); + } + + return error; +} + +/* Converts a single rgb color without alpha from one type to another, color +bits truncated to their bitdepth. In case of single channel (gray or palette), +only the r channel is used. Slow function, do not use to process all pixels of +an image. Alpha channel not supported on purpose: this is for bKGD, supporting +alpha may prevent it from finding a color in the palette, from the specification +it looks like bKGD should ignore the alpha values of the palette since it can +use any palette index but doesn't have an alpha channel. Idem with ignoring +color key. */ +unsigned lodepng_convert_rgb(unsigned *r_out, unsigned *g_out, unsigned *b_out, unsigned r_in, + unsigned g_in, unsigned b_in, const LodePNGColorMode *mode_out, + const LodePNGColorMode *mode_in) { + unsigned r = 0, g = 0, b = 0; + unsigned mul = 65535 / ((1u << mode_in->bitdepth) - 1u); /*65535, 21845, 4369, 257, 1*/ + unsigned shift = 16 - mode_out->bitdepth; + + if (mode_in->colortype == LCT_GREY || mode_in->colortype == LCT_GREY_ALPHA) { + r = g = b = r_in * mul; + } else if (mode_in->colortype == LCT_RGB || mode_in->colortype == LCT_RGBA) { + r = r_in * mul; + g = g_in * mul; + b = b_in * mul; + } else if (mode_in->colortype == LCT_PALETTE) { + if (r_in >= mode_in->palettesize) + return 82; + r = mode_in->palette[r_in * 4 + 0] * 257u; + g = mode_in->palette[r_in * 4 + 1] * 257u; + b = mode_in->palette[r_in * 4 + 2] * 257u; + } else { + return 31; + } + + /* now convert to output format */ + if (mode_out->colortype == LCT_GREY || mode_out->colortype == LCT_GREY_ALPHA) { + *r_out = r >> shift; + } else if (mode_out->colortype == LCT_RGB || mode_out->colortype == LCT_RGBA) { + *r_out = r >> shift; + *g_out = g >> shift; + *b_out = b >> shift; + } else if (mode_out->colortype == LCT_PALETTE) { + unsigned i; + /* a 16-bit color cannot be in the palette */ + if ((r >> 8) != (r & 255) || (g >> 8) != (g & 255) || (b >> 8) != (b & 255)) + return 82; + for (i = 0; i < mode_out->palettesize; i++) { + unsigned j = i * 4; + if ((r >> 8) == mode_out->palette[j + 0] && (g >> 8) == mode_out->palette[j + 1] && + (b >> 8) == mode_out->palette[j + 2]) { + *r_out = i; + return 0; + } + } + return 82; + } else { + return 31; + } + + return 0; } #ifdef LODEPNG_COMPILE_ENCODER -void lodepng_color_stats_init(LodePNGColorStats* stats) { - /*stats*/ - stats->colored = 0; - stats->key = 0; - stats->key_r = stats->key_g = stats->key_b = 0; - stats->alpha = 0; - stats->numcolors = 0; - stats->bits = 1; - stats->numpixels = 0; - /*settings*/ - stats->allow_palette = 1; - stats->allow_greyscale = 1; +void lodepng_color_stats_init(LodePNGColorStats *stats) { + /*stats*/ + stats->colored = 0; + stats->key = 0; + stats->key_r = stats->key_g = stats->key_b = 0; + stats->alpha = 0; + stats->numcolors = 0; + stats->bits = 1; + stats->numpixels = 0; + /*settings*/ + stats->allow_palette = 1; + stats->allow_greyscale = 1; } /*function used for debug purposes with C++*/ @@ -3953,316 +4435,371 @@ void lodepng_color_stats_init(LodePNGColorStats* stats) { /*Returns how many bits needed to represent given value (max 8 bit)*/ static unsigned getValueRequiredBits(unsigned char value) { - if(value == 0 || value == 255) return 1; - /*The scaling of 2-bit and 4-bit values uses multiples of 85 and 17*/ - if(value % 17 == 0) return value % 85 == 0 ? 2 : 4; - return 8; + if (value == 0 || value == 255) + return 1; + /*The scaling of 2-bit and 4-bit values uses multiples of 85 and 17*/ + if (value % 17 == 0) + return value % 85 == 0 ? 2 : 4; + return 8; } /*stats must already have been inited. */ -unsigned lodepng_compute_color_stats(LodePNGColorStats* stats, - const unsigned char* in, unsigned w, unsigned h, - const LodePNGColorMode* mode_in) { - size_t i; - ColorTree tree; - size_t numpixels = (size_t)w * (size_t)h; - unsigned error = 0; - - /* mark things as done already if it would be impossible to have a more expensive case */ - unsigned colored_done = lodepng_is_greyscale_type(mode_in) ? 1 : 0; - unsigned alpha_done = lodepng_can_have_alpha(mode_in) ? 0 : 1; - unsigned numcolors_done = 0; - unsigned bpp = lodepng_get_bpp(mode_in); - unsigned bits_done = (stats->bits == 1 && bpp == 1) ? 1 : 0; - unsigned sixteen = 0; /* whether the input image is 16 bit */ - unsigned maxnumcolors = 257; - if(bpp <= 8) maxnumcolors = LODEPNG_MIN(257, stats->numcolors + (1u << bpp)); - - stats->numpixels += numpixels; - - /*if palette not allowed, no need to compute numcolors*/ - if(!stats->allow_palette) numcolors_done = 1; - - color_tree_init(&tree); - - /*If the stats was already filled in from previous data, fill its palette in tree - and mark things as done already if we know they are the most expensive case already*/ - if(stats->alpha) alpha_done = 1; - if(stats->colored) colored_done = 1; - if(stats->bits == 16) numcolors_done = 1; - if(stats->bits >= bpp) bits_done = 1; - if(stats->numcolors >= maxnumcolors) numcolors_done = 1; - - if(!numcolors_done) { - for(i = 0; i < stats->numcolors; i++) { - const unsigned char* color = &stats->palette[i * 4]; - error = color_tree_add(&tree, color[0], color[1], color[2], color[3], (unsigned)i); - if(error) goto cleanup; - } - } - - /*Check if the 16-bit input is truly 16-bit*/ - if(mode_in->bitdepth == 16 && !sixteen) { - unsigned short r = 0, g = 0, b = 0, a = 0; - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - if((r & 255) != ((r >> 8) & 255) || (g & 255) != ((g >> 8) & 255) || - (b & 255) != ((b >> 8) & 255) || (a & 255) != ((a >> 8) & 255)) /*first and second byte differ*/ { - stats->bits = 16; - sixteen = 1; - bits_done = 1; - numcolors_done = 1; /*counting colors no longer useful, palette doesn't support 16-bit*/ - break; - } - } - } - - if(sixteen) { - unsigned short r = 0, g = 0, b = 0, a = 0; - - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - - if(!colored_done && (r != g || r != b)) { - stats->colored = 1; - colored_done = 1; - } - - if(!alpha_done) { - unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b); - if(a != 65535 && (a != 0 || (stats->key && !matchkey))) { - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - } else if(a == 0 && !stats->alpha && !stats->key) { - stats->key = 1; - stats->key_r = r; - stats->key_g = g; - stats->key_b = b; - } else if(a == 65535 && stats->key && matchkey) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - } - } - if(alpha_done && numcolors_done && colored_done && bits_done) break; - } - - if(stats->key && !stats->alpha) { - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); - if(a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - } - } - } - } else /* < 16-bit */ { - unsigned char r = 0, g = 0, b = 0, a = 0; - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); - - if(!bits_done && stats->bits < 8) { - /*only r is checked, < 8 bits is only relevant for grayscale*/ - unsigned bits = getValueRequiredBits(r); - if(bits > stats->bits) stats->bits = bits; - } - bits_done = (stats->bits >= bpp); - - if(!colored_done && (r != g || r != b)) { - stats->colored = 1; - colored_done = 1; - if(stats->bits < 8) stats->bits = 8; /*PNG has no colored modes with less than 8-bit per channel*/ - } - - if(!alpha_done) { - unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b); - if(a != 255 && (a != 0 || (stats->key && !matchkey))) { - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } else if(a == 0 && !stats->alpha && !stats->key) { - stats->key = 1; - stats->key_r = r; - stats->key_g = g; - stats->key_b = b; - } else if(a == 255 && stats->key && matchkey) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } - } - - if(!numcolors_done) { - if(!color_tree_has(&tree, r, g, b, a)) { - error = color_tree_add(&tree, r, g, b, a, stats->numcolors); - if(error) goto cleanup; - if(stats->numcolors < 256) { - unsigned char* p = stats->palette; - unsigned n = stats->numcolors; - p[n * 4 + 0] = r; - p[n * 4 + 1] = g; - p[n * 4 + 2] = b; - p[n * 4 + 3] = a; - } - ++stats->numcolors; - numcolors_done = stats->numcolors >= maxnumcolors; - } - } - - if(alpha_done && numcolors_done && colored_done && bits_done) break; - } - - if(stats->key && !stats->alpha) { - for(i = 0; i != numpixels; ++i) { - getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); - if(a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) { - /* Color key cannot be used if an opaque pixel also has that RGB color. */ - stats->alpha = 1; - stats->key = 0; - alpha_done = 1; - if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } - } - } - - /*make the stats's key always 16-bit for consistency - repeat each byte twice*/ - stats->key_r += (stats->key_r << 8); - stats->key_g += (stats->key_g << 8); - stats->key_b += (stats->key_b << 8); - } +unsigned lodepng_compute_color_stats(LodePNGColorStats *stats, const unsigned char *in, unsigned w, + unsigned h, const LodePNGColorMode *mode_in) { + size_t i; + ColorTree tree; + size_t numpixels = (size_t)w * (size_t)h; + unsigned error = 0; + + /* mark things as done already if it would be impossible to have a more + * expensive case */ + unsigned colored_done = lodepng_is_greyscale_type(mode_in) ? 1 : 0; + unsigned alpha_done = lodepng_can_have_alpha(mode_in) ? 0 : 1; + unsigned numcolors_done = 0; + unsigned bpp = lodepng_get_bpp(mode_in); + unsigned bits_done = (stats->bits == 1 && bpp == 1) ? 1 : 0; + unsigned sixteen = 0; /* whether the input image is 16 bit */ + unsigned maxnumcolors = 257; + if (bpp <= 8) + maxnumcolors = LODEPNG_MIN(257, stats->numcolors + (1u << bpp)); + + stats->numpixels += numpixels; + + /*if palette not allowed, no need to compute numcolors*/ + if (!stats->allow_palette) + numcolors_done = 1; + + color_tree_init(&tree); + + /*If the stats was already filled in from previous data, fill its palette in + tree and mark things as done already if we know they are the most expensive + case already*/ + if (stats->alpha) + alpha_done = 1; + if (stats->colored) + colored_done = 1; + if (stats->bits == 16) + numcolors_done = 1; + if (stats->bits >= bpp) + bits_done = 1; + if (stats->numcolors >= maxnumcolors) + numcolors_done = 1; + + if (!numcolors_done) { + for (i = 0; i < stats->numcolors; i++) { + const unsigned char *color = &stats->palette[i * 4]; + error = color_tree_add(&tree, color[0], color[1], color[2], color[3], (unsigned)i); + if (error) + goto cleanup; + } + } + + /*Check if the 16-bit input is truly 16-bit*/ + if (mode_in->bitdepth == 16 && !sixteen) { + unsigned short r = 0, g = 0, b = 0, a = 0; + for (i = 0; i != numpixels; ++i) { + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); + if ((r & 255) != ((r >> 8) & 255) || (g & 255) != ((g >> 8) & 255) || + (b & 255) != ((b >> 8) & 255) || + (a & 255) != ((a >> 8) & 255)) /*first and second byte differ*/ { + stats->bits = 16; + sixteen = 1; + bits_done = 1; + numcolors_done = 1; /*counting colors no longer useful, palette + doesn't support 16-bit*/ + break; + } + } + } + + if (sixteen) { + unsigned short r = 0, g = 0, b = 0, a = 0; + + for (i = 0; i != numpixels; ++i) { + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); + + if (!colored_done && (r != g || r != b)) { + stats->colored = 1; + colored_done = 1; + } + + if (!alpha_done) { + unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b); + if (a != 65535 && (a != 0 || (stats->key && !matchkey))) { + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + } else if (a == 0 && !stats->alpha && !stats->key) { + stats->key = 1; + stats->key_r = r; + stats->key_g = g; + stats->key_b = b; + } else if (a == 65535 && stats->key && matchkey) { + /* Color key cannot be used if an opaque pixel also has that + * RGB color. */ + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + } + } + if (alpha_done && numcolors_done && colored_done && bits_done) + break; + } + + if (stats->key && !stats->alpha) { + for (i = 0; i != numpixels; ++i) { + getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in); + if (a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) { + /* Color key cannot be used if an opaque pixel also has that + * RGB color. */ + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + } + } + } + } else /* < 16-bit */ { + unsigned char r = 0, g = 0, b = 0, a = 0; + for (i = 0; i != numpixels; ++i) { + getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); + + if (!bits_done && stats->bits < 8) { + /*only r is checked, < 8 bits is only relevant for grayscale*/ + unsigned bits = getValueRequiredBits(r); + if (bits > stats->bits) + stats->bits = bits; + } + bits_done = (stats->bits >= bpp); + + if (!colored_done && (r != g || r != b)) { + stats->colored = 1; + colored_done = 1; + if (stats->bits < 8) + stats->bits = 8; /*PNG has no colored modes with less than + 8-bit per channel*/ + } + + if (!alpha_done) { + unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b); + if (a != 255 && (a != 0 || (stats->key && !matchkey))) { + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + if (stats->bits < 8) + stats->bits = 8; /*PNG has no alphachannel modes with + less than 8-bit per channel*/ + } else if (a == 0 && !stats->alpha && !stats->key) { + stats->key = 1; + stats->key_r = r; + stats->key_g = g; + stats->key_b = b; + } else if (a == 255 && stats->key && matchkey) { + /* Color key cannot be used if an opaque pixel also has that + * RGB color. */ + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + if (stats->bits < 8) + stats->bits = 8; /*PNG has no alphachannel modes with + less than 8-bit per channel*/ + } + } + + if (!numcolors_done) { + if (!color_tree_has(&tree, r, g, b, a)) { + error = color_tree_add(&tree, r, g, b, a, stats->numcolors); + if (error) + goto cleanup; + if (stats->numcolors < 256) { + unsigned char *p = stats->palette; + unsigned n = stats->numcolors; + p[n * 4 + 0] = r; + p[n * 4 + 1] = g; + p[n * 4 + 2] = b; + p[n * 4 + 3] = a; + } + ++stats->numcolors; + numcolors_done = stats->numcolors >= maxnumcolors; + } + } + + if (alpha_done && numcolors_done && colored_done && bits_done) + break; + } + + if (stats->key && !stats->alpha) { + for (i = 0; i != numpixels; ++i) { + getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in); + if (a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) { + /* Color key cannot be used if an opaque pixel also has that + * RGB color. */ + stats->alpha = 1; + stats->key = 0; + alpha_done = 1; + if (stats->bits < 8) + stats->bits = 8; /*PNG has no alphachannel modes with + less than 8-bit per channel*/ + } + } + } + + /*make the stats's key always 16-bit for consistency - repeat each byte + * twice*/ + stats->key_r += (stats->key_r << 8); + stats->key_g += (stats->key_g << 8); + stats->key_b += (stats->key_b << 8); + } cleanup: - color_tree_cleanup(&tree); - return error; + color_tree_cleanup(&tree); + return error; } #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*Adds a single color to the color stats. The stats must already have been inited. The color must be given as 16-bit -(with 2 bytes repeating for 8-bit and 65535 for opaque alpha channel). This function is expensive, do not call it for +/*Adds a single color to the color stats. The stats must already have been +inited. The color must be given as 16-bit (with 2 bytes repeating for 8-bit and +65535 for opaque alpha channel). This function is expensive, do not call it for all pixels of an image but only for a few additional values. */ -static unsigned lodepng_color_stats_add(LodePNGColorStats* stats, - unsigned r, unsigned g, unsigned b, unsigned a) { - unsigned error = 0; - unsigned char image[8]; - LodePNGColorMode mode; - lodepng_color_mode_init(&mode); - image[0] = r >> 8; image[1] = r; image[2] = g >> 8; image[3] = g; - image[4] = b >> 8; image[5] = b; image[6] = a >> 8; image[7] = a; - mode.bitdepth = 16; - mode.colortype = LCT_RGBA; - error = lodepng_compute_color_stats(stats, image, 1, 1, &mode); - lodepng_color_mode_cleanup(&mode); - return error; +static unsigned lodepng_color_stats_add( + LodePNGColorStats *stats, unsigned r, unsigned g, unsigned b, unsigned a) { + unsigned error = 0; + unsigned char image[8]; + LodePNGColorMode mode; + lodepng_color_mode_init(&mode); + image[0] = r >> 8; + image[1] = r; + image[2] = g >> 8; + image[3] = g; + image[4] = b >> 8; + image[5] = b; + image[6] = a >> 8; + image[7] = a; + mode.bitdepth = 16; + mode.colortype = LCT_RGBA; + error = lodepng_compute_color_stats(stats, image, 1, 1, &mode); + lodepng_color_mode_cleanup(&mode); + return error; } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -/*Computes a minimal PNG color model that can contain all colors as indicated by the stats. -The stats should be computed with lodepng_compute_color_stats. -mode_in is raw color profile of the image the stats were computed on, to copy palette order from when relevant. -Minimal PNG color model means the color type and bit depth that gives smallest amount of bits in the output image, -e.g. gray if only grayscale pixels, palette if less than 256 colors, color key if only single transparent color, ... -This is used if auto_convert is enabled (it is by default). +/*Computes a minimal PNG color model that can contain all colors as indicated by +the stats. The stats should be computed with lodepng_compute_color_stats. +mode_in is raw color profile of the image the stats were computed on, to copy +palette order from when relevant. Minimal PNG color model means the color type +and bit depth that gives smallest amount of bits in the output image, e.g. gray +if only grayscale pixels, palette if less than 256 colors, color key if only +single transparent color, ... This is used if auto_convert is enabled (it is by +default). */ -static unsigned auto_choose_color(LodePNGColorMode* mode_out, - const LodePNGColorMode* mode_in, - const LodePNGColorStats* stats) { - unsigned error = 0; - unsigned palettebits; - size_t i, n; - size_t numpixels = stats->numpixels; - unsigned palette_ok, gray_ok; - - unsigned alpha = stats->alpha; - unsigned key = stats->key; - unsigned bits = stats->bits; - - mode_out->key_defined = 0; - - if(key && numpixels <= 16) { - alpha = 1; /*too few pixels to justify tRNS chunk overhead*/ - key = 0; - if(bits < 8) bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/ - } - - gray_ok = !stats->colored; - if(!stats->allow_greyscale) gray_ok = 0; - if(!gray_ok && bits < 8) bits = 8; - - n = stats->numcolors; - palettebits = n <= 2 ? 1 : (n <= 4 ? 2 : (n <= 16 ? 4 : 8)); - palette_ok = n <= 256 && bits <= 8 && n != 0; /*n==0 means likely numcolors wasn't computed*/ - if(numpixels < n * 2) palette_ok = 0; /*don't add palette overhead if image has only a few pixels*/ - if(gray_ok && !alpha && bits <= palettebits) palette_ok = 0; /*gray is less overhead*/ - if(!stats->allow_palette) palette_ok = 0; - - if(palette_ok) { - const unsigned char* p = stats->palette; - lodepng_palette_clear(mode_out); /*remove potential earlier palette*/ - for(i = 0; i != stats->numcolors; ++i) { - error = lodepng_palette_add(mode_out, p[i * 4 + 0], p[i * 4 + 1], p[i * 4 + 2], p[i * 4 + 3]); - if(error) break; - } - - mode_out->colortype = LCT_PALETTE; - mode_out->bitdepth = palettebits; - - if(mode_in->colortype == LCT_PALETTE && mode_in->palettesize >= mode_out->palettesize - && mode_in->bitdepth == mode_out->bitdepth) { - /*If input should have same palette colors, keep original to preserve its order and prevent conversion*/ - lodepng_color_mode_cleanup(mode_out); /*clears palette, keeps the above set colortype and bitdepth fields as-is*/ - lodepng_color_mode_copy(mode_out, mode_in); - } - } else /*8-bit or 16-bit per channel*/ { - mode_out->bitdepth = bits; - mode_out->colortype = alpha ? (gray_ok ? LCT_GREY_ALPHA : LCT_RGBA) - : (gray_ok ? LCT_GREY : LCT_RGB); - if(key) { - unsigned mask = (1u << mode_out->bitdepth) - 1u; /*stats always uses 16-bit, mask converts it*/ - mode_out->key_r = stats->key_r & mask; - mode_out->key_g = stats->key_g & mask; - mode_out->key_b = stats->key_b & mask; - mode_out->key_defined = 1; - } - } - - return error; +static unsigned auto_choose_color( + LodePNGColorMode *mode_out, const LodePNGColorMode *mode_in, const LodePNGColorStats *stats) { + unsigned error = 0; + unsigned palettebits; + size_t i, n; + size_t numpixels = stats->numpixels; + unsigned palette_ok, gray_ok; + + unsigned alpha = stats->alpha; + unsigned key = stats->key; + unsigned bits = stats->bits; + + mode_out->key_defined = 0; + + if (key && numpixels <= 16) { + alpha = 1; /*too few pixels to justify tRNS chunk overhead*/ + key = 0; + if (bits < 8) + bits = 8; /*PNG has no alphachannel modes with less than 8-bit per + channel*/ + } + + gray_ok = !stats->colored; + if (!stats->allow_greyscale) + gray_ok = 0; + if (!gray_ok && bits < 8) + bits = 8; + + n = stats->numcolors; + palettebits = n <= 2 ? 1 : (n <= 4 ? 2 : (n <= 16 ? 4 : 8)); + palette_ok = n <= 256 && bits <= 8 && n != 0; /*n==0 means likely numcolors wasn't computed*/ + if (numpixels < n * 2) + palette_ok = 0; /*don't add palette overhead if image has only a few pixels*/ + if (gray_ok && !alpha && bits <= palettebits) + palette_ok = 0; /*gray is less overhead*/ + if (!stats->allow_palette) + palette_ok = 0; + + if (palette_ok) { + const unsigned char *p = stats->palette; + lodepng_palette_clear(mode_out); /*remove potential earlier palette*/ + for (i = 0; i != stats->numcolors; ++i) { + error = lodepng_palette_add( + mode_out, p[i * 4 + 0], p[i * 4 + 1], p[i * 4 + 2], p[i * 4 + 3]); + if (error) + break; + } + + mode_out->colortype = LCT_PALETTE; + mode_out->bitdepth = palettebits; + + if (mode_in->colortype == LCT_PALETTE && mode_in->palettesize >= mode_out->palettesize && + mode_in->bitdepth == mode_out->bitdepth) { + /*If input should have same palette colors, keep original to + * preserve its order and prevent conversion*/ + lodepng_color_mode_cleanup(mode_out); /*clears palette, keeps the above set colortype + and bitdepth fields as-is*/ + lodepng_color_mode_copy(mode_out, mode_in); + } + } else /*8-bit or 16-bit per channel*/ { + mode_out->bitdepth = bits; + mode_out->colortype = + alpha ? (gray_ok ? LCT_GREY_ALPHA : LCT_RGBA) : (gray_ok ? LCT_GREY : LCT_RGB); + if (key) { + unsigned mask = + (1u << mode_out->bitdepth) - 1u; /*stats always uses 16-bit, mask converts it*/ + mode_out->key_r = stats->key_r & mask; + mode_out->key_g = stats->key_g & mask; + mode_out->key_b = stats->key_b & mask; + mode_out->key_defined = 1; + } + } + + return error; } #endif /* #ifdef LODEPNG_COMPILE_ENCODER */ /*Paeth predictor, used by PNG filter type 4*/ static unsigned char paethPredictor(unsigned char a, unsigned char b, unsigned char c) { - /* the subtractions of unsigned char cast it to a signed type. - With gcc, short is faster than int, with clang int is as fast (as of april 2023)*/ - short pa = (b - c) < 0 ? -(b - c) : (b - c); - short pb = (a - c) < 0 ? -(a - c) : (a - c); - /* writing it out like this compiles to something faster than introducing a temp variable*/ - short pc = (a + b - c - c) < 0 ? -(a + b - c - c) : (a + b - c - c); - /* return input value associated with smallest of pa, pb, pc (with certain priority if equal) */ - if(pb < pa) { a = b; pa = pb; } - return (pc < pa) ? c : a; + /* the subtractions of unsigned char cast it to a signed type. + With gcc, short is faster than int, with clang int is as fast (as of april + 2023)*/ + short pa = (b - c) < 0 ? -(b - c) : (b - c); + short pb = (a - c) < 0 ? -(a - c) : (a - c); + /* writing it out like this compiles to something faster than introducing a + * temp variable*/ + short pc = (a + b - c - c) < 0 ? -(a + b - c - c) : (a + b - c - c); + /* return input value associated with smallest of pa, pb, pc (with certain + * priority if equal) */ + if (pb < pa) { + a = b; + pa = pb; + } + return (pc < pa) ? c : a; } /*shared values used by multiple Adam7 related functions*/ -static const unsigned ADAM7_IX[7] = { 0, 4, 0, 2, 0, 1, 0 }; /*x start values*/ -static const unsigned ADAM7_IY[7] = { 0, 0, 4, 0, 2, 0, 1 }; /*y start values*/ -static const unsigned ADAM7_DX[7] = { 8, 8, 4, 4, 2, 2, 1 }; /*x delta values*/ -static const unsigned ADAM7_DY[7] = { 8, 8, 8, 4, 4, 2, 2 }; /*y delta values*/ +static const unsigned ADAM7_IX[7] = {0, 4, 0, 2, 0, 1, 0}; /*x start values*/ +static const unsigned ADAM7_IY[7] = {0, 0, 4, 0, 2, 0, 1}; /*y start values*/ +static const unsigned ADAM7_DX[7] = {8, 8, 4, 4, 2, 2, 1}; /*x delta values*/ +static const unsigned ADAM7_DY[7] = {8, 8, 8, 4, 4, 2, 2}; /*y delta values*/ /* -Outputs various dimensions and positions in the image related to the Adam7 reduced images. -passw: output containing the width of the 7 passes -passh: output containing the height of the 7 passes -filter_passstart: output containing the index of the start and end of each - reduced image with filter bytes +Outputs various dimensions and positions in the image related to the Adam7 +reduced images. passw: output containing the width of the 7 passes passh: output +containing the height of the 7 passes filter_passstart: output containing the +index of the start and end of each reduced image with filter bytes padded_passstart output containing the index of the start and end of each reduced image when without filter bytes but with padded scanlines passstart: output containing the index of the start and end of each reduced @@ -4273,28 +4810,32 @@ bpp: bits per pixel end at a full byte */ static void Adam7_getpassvalues(unsigned passw[7], unsigned passh[7], size_t filter_passstart[8], - size_t padded_passstart[8], size_t passstart[8], unsigned w, unsigned h, unsigned bpp) { - /*the passstart values have 8 values: the 8th one indicates the byte after the end of the 7th (= last) pass*/ - unsigned i; - - /*calculate width and height in pixels of each pass*/ - for(i = 0; i != 7; ++i) { - passw[i] = (w + ADAM7_DX[i] - ADAM7_IX[i] - 1) / ADAM7_DX[i]; - passh[i] = (h + ADAM7_DY[i] - ADAM7_IY[i] - 1) / ADAM7_DY[i]; - if(passw[i] == 0) passh[i] = 0; - if(passh[i] == 0) passw[i] = 0; - } - - filter_passstart[0] = padded_passstart[0] = passstart[0] = 0; - for(i = 0; i != 7; ++i) { - /*if passw[i] is 0, it's 0 bytes, not 1 (no filtertype-byte)*/ - filter_passstart[i + 1] = filter_passstart[i] - + ((passw[i] && passh[i]) ? passh[i] * (1u + (passw[i] * bpp + 7u) / 8u) : 0); - /*bits padded if needed to fill full byte at end of each scanline*/ - padded_passstart[i + 1] = padded_passstart[i] + passh[i] * ((passw[i] * bpp + 7u) / 8u); - /*only padded at end of reduced image*/ - passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7u) / 8u; - } + size_t padded_passstart[8], size_t passstart[8], unsigned w, unsigned h, unsigned bpp) { + /*the passstart values have 8 values: the 8th one indicates the byte after + * the end of the 7th (= last) pass*/ + unsigned i; + + /*calculate width and height in pixels of each pass*/ + for (i = 0; i != 7; ++i) { + passw[i] = (w + ADAM7_DX[i] - ADAM7_IX[i] - 1) / ADAM7_DX[i]; + passh[i] = (h + ADAM7_DY[i] - ADAM7_IY[i] - 1) / ADAM7_DY[i]; + if (passw[i] == 0) + passh[i] = 0; + if (passh[i] == 0) + passw[i] = 0; + } + + filter_passstart[0] = padded_passstart[0] = passstart[0] = 0; + for (i = 0; i != 7; ++i) { + /*if passw[i] is 0, it's 0 bytes, not 1 (no filtertype-byte)*/ + filter_passstart[i + 1] = + filter_passstart[i] + + ((passw[i] && passh[i]) ? passh[i] * (1u + (passw[i] * bpp + 7u) / 8u) : 0); + /*bits padded if needed to fill full byte at end of each scanline*/ + padded_passstart[i + 1] = padded_passstart[i] + passh[i] * ((passw[i] * bpp + 7u) / 8u); + /*only padded at end of reduced image*/ + passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7u) / 8u; + } } #ifdef LODEPNG_COMPILE_DECODER @@ -4303,1193 +4844,1425 @@ static void Adam7_getpassvalues(unsigned passw[7], unsigned passh[7], size_t fil /* / PNG Decoder / */ /* ////////////////////////////////////////////////////////////////////////// */ -/*read the information from the header and store it in the LodePNGInfo. return value is error*/ -unsigned lodepng_inspect(unsigned* w, unsigned* h, LodePNGState* state, - const unsigned char* in, size_t insize) { - unsigned width, height; - LodePNGInfo* info = &state->info_png; - if(insize == 0 || in == 0) { - CERROR_RETURN_ERROR(state->error, 48); /*error: the given data is empty*/ - } - if(insize < 33) { - CERROR_RETURN_ERROR(state->error, 27); /*error: the data length is smaller than the length of a PNG header*/ - } - - /*when decoding a new PNG image, make sure all parameters created after previous decoding are reset*/ - /* TODO: remove this. One should use a new LodePNGState for new sessions */ - lodepng_info_cleanup(info); - lodepng_info_init(info); - - if(in[0] != 137 || in[1] != 80 || in[2] != 78 || in[3] != 71 - || in[4] != 13 || in[5] != 10 || in[6] != 26 || in[7] != 10) { - CERROR_RETURN_ERROR(state->error, 28); /*error: the first 8 bytes are not the correct PNG signature*/ - } - if(lodepng_chunk_length(in + 8) != 13) { - CERROR_RETURN_ERROR(state->error, 94); /*error: header size must be 13 bytes*/ - } - if(!lodepng_chunk_type_equals(in + 8, "IHDR")) { - CERROR_RETURN_ERROR(state->error, 29); /*error: it doesn't start with a IHDR chunk!*/ - } - - /*read the values given in the header*/ - width = lodepng_read32bitInt(&in[16]); - height = lodepng_read32bitInt(&in[20]); - /*TODO: remove the undocumented feature that allows to give null pointers to width or height*/ - if(w) *w = width; - if(h) *h = height; - info->color.bitdepth = in[24]; - info->color.colortype = (LodePNGColorType)in[25]; - info->compression_method = in[26]; - info->filter_method = in[27]; - info->interlace_method = in[28]; - - /*errors returned only after the parsing so other values are still output*/ - - /*error: invalid image size*/ - if(width == 0 || height == 0) CERROR_RETURN_ERROR(state->error, 93); - /*error: invalid colortype or bitdepth combination*/ - state->error = checkColorValidity(info->color.colortype, info->color.bitdepth); - if(state->error) return state->error; - /*error: only compression method 0 is allowed in the specification*/ - if(info->compression_method != 0) CERROR_RETURN_ERROR(state->error, 32); - /*error: only filter method 0 is allowed in the specification*/ - if(info->filter_method != 0) CERROR_RETURN_ERROR(state->error, 33); - /*error: only interlace methods 0 and 1 exist in the specification*/ - if(info->interlace_method > 1) CERROR_RETURN_ERROR(state->error, 34); - - if(!state->decoder.ignore_crc) { - unsigned CRC = lodepng_read32bitInt(&in[29]); - unsigned checksum = lodepng_crc32(&in[12], 17); - if(CRC != checksum) { - CERROR_RETURN_ERROR(state->error, 57); /*invalid CRC*/ - } - } - - return state->error; -} - -static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scanline, const unsigned char* precon, - size_t bytewidth, unsigned char filterType, size_t length) { - /* - For PNG filter method 0 - unfilter a PNG image scanline by scanline. when the pixels are smaller than 1 byte, - the filter works byte per byte (bytewidth = 1) - precon is the previous unfiltered scanline, recon the result, scanline the current one - the incoming scanlines do NOT include the filtertype byte, that one is given in the parameter filterType instead - recon and scanline MAY be the same memory address! precon must be disjoint. - */ - - size_t i; - switch(filterType) { - case 0: - for(i = 0; i != length; ++i) recon[i] = scanline[i]; - break; - case 1: { - size_t j = 0; - for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; - for(i = bytewidth; i != length; ++i, ++j) recon[i] = scanline[i] + recon[j]; - break; - } - case 2: - if(precon) { - for(i = 0; i != length; ++i) recon[i] = scanline[i] + precon[i]; - } else { - for(i = 0; i != length; ++i) recon[i] = scanline[i]; - } - break; - case 3: - if(precon) { - size_t j = 0; - for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i] + (precon[i] >> 1u); - /* Unroll independent paths of this predictor. A 6x and 8x version is also possible but that adds - too much code. Whether this speeds up anything depends on compiler and settings. */ - if(bytewidth >= 4) { - for(; i + 3 < length; i += 4, j += 4) { - unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2], s3 = scanline[i + 3]; - unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2], r3 = recon[j + 3]; - unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2], p3 = precon[i + 3]; - recon[i + 0] = s0 + ((r0 + p0) >> 1u); - recon[i + 1] = s1 + ((r1 + p1) >> 1u); - recon[i + 2] = s2 + ((r2 + p2) >> 1u); - recon[i + 3] = s3 + ((r3 + p3) >> 1u); - } - } else if(bytewidth >= 3) { - for(; i + 2 < length; i += 3, j += 3) { - unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2]; - unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2]; - unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2]; - recon[i + 0] = s0 + ((r0 + p0) >> 1u); - recon[i + 1] = s1 + ((r1 + p1) >> 1u); - recon[i + 2] = s2 + ((r2 + p2) >> 1u); - } - } else if(bytewidth >= 2) { - for(; i + 1 < length; i += 2, j += 2) { - unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1]; - unsigned char r0 = recon[j + 0], r1 = recon[j + 1]; - unsigned char p0 = precon[i + 0], p1 = precon[i + 1]; - recon[i + 0] = s0 + ((r0 + p0) >> 1u); - recon[i + 1] = s1 + ((r1 + p1) >> 1u); - } - } - for(; i != length; ++i, ++j) recon[i] = scanline[i] + ((recon[j] + precon[i]) >> 1u); - } else { - size_t j = 0; - for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i]; - for(i = bytewidth; i != length; ++i, ++j) recon[i] = scanline[i] + (recon[j] >> 1u); - } - break; - case 4: - if(precon) { - /* Unroll independent paths of this predictor. Whether this speeds up - anything depends on compiler and settings. */ - if(bytewidth == 8) { - unsigned char a0, b0 = 0, c0, d0 = 0, a1, b1 = 0, c1, d1 = 0; - unsigned char a2, b2 = 0, c2, d2 = 0, a3, b3 = 0, c3, d3 = 0; - unsigned char a4, b4 = 0, c4, d4 = 0, a5, b5 = 0, c5, d5 = 0; - unsigned char a6, b6 = 0, c6, d6 = 0, a7, b7 = 0, c7, d7 = 0; - for(i = 0; i + 7 < length; i += 8) { - c0 = b0; c1 = b1; c2 = b2; c3 = b3; - c4 = b4; c5 = b5; c6 = b6; c7 = b7; - b0 = precon[i + 0]; b1 = precon[i + 1]; b2 = precon[i + 2]; b3 = precon[i + 3]; - b4 = precon[i + 4]; b5 = precon[i + 5]; b6 = precon[i + 6]; b7 = precon[i + 7]; - a0 = d0; a1 = d1; a2 = d2; a3 = d3; - a4 = d4; a5 = d5; a6 = d6; a7 = d7; - d0 = scanline[i + 0] + paethPredictor(a0, b0, c0); - d1 = scanline[i + 1] + paethPredictor(a1, b1, c1); - d2 = scanline[i + 2] + paethPredictor(a2, b2, c2); - d3 = scanline[i + 3] + paethPredictor(a3, b3, c3); - d4 = scanline[i + 4] + paethPredictor(a4, b4, c4); - d5 = scanline[i + 5] + paethPredictor(a5, b5, c5); - d6 = scanline[i + 6] + paethPredictor(a6, b6, c6); - d7 = scanline[i + 7] + paethPredictor(a7, b7, c7); - recon[i + 0] = d0; recon[i + 1] = d1; recon[i + 2] = d2; recon[i + 3] = d3; - recon[i + 4] = d4; recon[i + 5] = d5; recon[i + 6] = d6; recon[i + 7] = d7; - } - } else if(bytewidth == 6) { - unsigned char a0, b0 = 0, c0, d0 = 0, a1, b1 = 0, c1, d1 = 0; - unsigned char a2, b2 = 0, c2, d2 = 0, a3, b3 = 0, c3, d3 = 0; - unsigned char a4, b4 = 0, c4, d4 = 0, a5, b5 = 0, c5, d5 = 0; - for(i = 0; i + 5 < length; i += 6) { - c0 = b0; c1 = b1; c2 = b2; - c3 = b3; c4 = b4; c5 = b5; - b0 = precon[i + 0]; b1 = precon[i + 1]; b2 = precon[i + 2]; - b3 = precon[i + 3]; b4 = precon[i + 4]; b5 = precon[i + 5]; - a0 = d0; a1 = d1; a2 = d2; - a3 = d3; a4 = d4; a5 = d5; - d0 = scanline[i + 0] + paethPredictor(a0, b0, c0); - d1 = scanline[i + 1] + paethPredictor(a1, b1, c1); - d2 = scanline[i + 2] + paethPredictor(a2, b2, c2); - d3 = scanline[i + 3] + paethPredictor(a3, b3, c3); - d4 = scanline[i + 4] + paethPredictor(a4, b4, c4); - d5 = scanline[i + 5] + paethPredictor(a5, b5, c5); - recon[i + 0] = d0; recon[i + 1] = d1; recon[i + 2] = d2; - recon[i + 3] = d3; recon[i + 4] = d4; recon[i + 5] = d5; - } - } else if(bytewidth == 4) { - unsigned char a0, b0 = 0, c0, d0 = 0, a1, b1 = 0, c1, d1 = 0; - unsigned char a2, b2 = 0, c2, d2 = 0, a3, b3 = 0, c3, d3 = 0; - for(i = 0; i + 3 < length; i += 4) { - c0 = b0; c1 = b1; c2 = b2; c3 = b3; - b0 = precon[i + 0]; b1 = precon[i + 1]; b2 = precon[i + 2]; b3 = precon[i + 3]; - a0 = d0; a1 = d1; a2 = d2; a3 = d3; - d0 = scanline[i + 0] + paethPredictor(a0, b0, c0); - d1 = scanline[i + 1] + paethPredictor(a1, b1, c1); - d2 = scanline[i + 2] + paethPredictor(a2, b2, c2); - d3 = scanline[i + 3] + paethPredictor(a3, b3, c3); - recon[i + 0] = d0; recon[i + 1] = d1; recon[i + 2] = d2; recon[i + 3] = d3; - } - } else if(bytewidth == 3) { - unsigned char a0, b0 = 0, c0, d0 = 0; - unsigned char a1, b1 = 0, c1, d1 = 0; - unsigned char a2, b2 = 0, c2, d2 = 0; - for(i = 0; i + 2 < length; i += 3) { - c0 = b0; c1 = b1; c2 = b2; - b0 = precon[i + 0]; b1 = precon[i + 1]; b2 = precon[i + 2]; - a0 = d0; a1 = d1; a2 = d2; - d0 = scanline[i + 0] + paethPredictor(a0, b0, c0); - d1 = scanline[i + 1] + paethPredictor(a1, b1, c1); - d2 = scanline[i + 2] + paethPredictor(a2, b2, c2); - recon[i + 0] = d0; recon[i + 1] = d1; recon[i + 2] = d2; - } - } else if(bytewidth == 2) { - unsigned char a0, b0 = 0, c0, d0 = 0; - unsigned char a1, b1 = 0, c1, d1 = 0; - for(i = 0; i + 1 < length; i += 2) { - c0 = b0; c1 = b1; - b0 = precon[i + 0]; - b1 = precon[i + 1]; - a0 = d0; a1 = d1; - d0 = scanline[i + 0] + paethPredictor(a0, b0, c0); - d1 = scanline[i + 1] + paethPredictor(a1, b1, c1); - recon[i + 0] = d0; - recon[i + 1] = d1; - } - } else if(bytewidth == 1) { - unsigned char a, b = 0, c, d = 0; - for(i = 0; i != length; ++i) { - c = b; - b = precon[i]; - a = d; - d = scanline[i] + paethPredictor(a, b, c); - recon[i] = d; - } - } else { - /* Normally not a possible case, but this would handle it correctly */ - for(i = 0; i != bytewidth; ++i) { - recon[i] = (scanline[i] + precon[i]); /*paethPredictor(0, precon[i], 0) is always precon[i]*/ - } - } - /* finish any remaining bytes */ - for(; i != length; ++i) { - recon[i] = (scanline[i] + paethPredictor(recon[i - bytewidth], precon[i], precon[i - bytewidth])); - } - } else { - size_t j = 0; - for(i = 0; i != bytewidth; ++i) { - recon[i] = scanline[i]; - } - for(i = bytewidth; i != length; ++i, ++j) { - /*paethPredictor(recon[i - bytewidth], 0, 0) is always recon[i - bytewidth]*/ - recon[i] = (scanline[i] + recon[j]); - } - } - break; - default: return 36; /*error: invalid filter type given*/ - } - return 0; -} - -static unsigned unfilter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { - /* - For PNG filter method 0 - this function unfilters a single image (e.g. without interlacing this is called once, with Adam7 seven times) - out must have enough bytes allocated already, in must have the scanlines + 1 filtertype byte per scanline - w and h are image dimensions or dimensions of reduced image, bpp is bits per pixel - in and out are allowed to be the same memory address (but aren't the same size since in has the extra filter bytes) - */ - - unsigned y; - unsigned char* prevline = 0; - - /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ - size_t bytewidth = (bpp + 7u) / 8u; - /*the width of a scanline in bytes, not including the filter type*/ - size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u; - - for(y = 0; y < h; ++y) { - size_t outindex = linebytes * y; - size_t inindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ - unsigned char filterType = in[inindex]; - - CERROR_TRY_RETURN(unfilterScanline(&out[outindex], &in[inindex + 1], prevline, bytewidth, filterType, linebytes)); - - prevline = &out[outindex]; - } - - return 0; +/*read the information from the header and store it in the LodePNGInfo. return + * value is error*/ +unsigned lodepng_inspect( + unsigned *w, unsigned *h, LodePNGState *state, const unsigned char *in, size_t insize) { + unsigned width, height; + LodePNGInfo *info = &state->info_png; + if (insize == 0 || in == 0) { + CERROR_RETURN_ERROR(state->error, 48); /*error: the given data is empty*/ + } + if (insize < 33) { + CERROR_RETURN_ERROR(state->error, 27); /*error: the data length is smaller + than the length of a PNG header*/ + } + + /*when decoding a new PNG image, make sure all parameters created after + * previous decoding are reset*/ + /* TODO: remove this. One should use a new LodePNGState for new sessions */ + lodepng_info_cleanup(info); + lodepng_info_init(info); + + if (in[0] != 137 || in[1] != 80 || in[2] != 78 || in[3] != 71 || in[4] != 13 || in[5] != 10 || + in[6] != 26 || in[7] != 10) { + CERROR_RETURN_ERROR( + state->error, 28); /*error: the first 8 bytes are not the correct PNG signature*/ + } + if (lodepng_chunk_length(in + 8) != 13) { + CERROR_RETURN_ERROR(state->error, 94); /*error: header size must be 13 bytes*/ + } + if (!lodepng_chunk_type_equals(in + 8, "IHDR")) { + CERROR_RETURN_ERROR(state->error, 29); /*error: it doesn't start with a IHDR chunk!*/ + } + + /*read the values given in the header*/ + width = lodepng_read32bitInt(&in[16]); + height = lodepng_read32bitInt(&in[20]); + /*TODO: remove the undocumented feature that allows to give null pointers to + * width or height*/ + if (w) + *w = width; + if (h) + *h = height; + info->color.bitdepth = in[24]; + info->color.colortype = (LodePNGColorType)in[25]; + info->compression_method = in[26]; + info->filter_method = in[27]; + info->interlace_method = in[28]; + + /*errors returned only after the parsing so other values are still output*/ + + /*error: invalid image size*/ + if (width == 0 || height == 0) + CERROR_RETURN_ERROR(state->error, 93); + /*error: invalid colortype or bitdepth combination*/ + state->error = checkColorValidity(info->color.colortype, info->color.bitdepth); + if (state->error) + return state->error; + /*error: only compression method 0 is allowed in the specification*/ + if (info->compression_method != 0) + CERROR_RETURN_ERROR(state->error, 32); + /*error: only filter method 0 is allowed in the specification*/ + if (info->filter_method != 0) + CERROR_RETURN_ERROR(state->error, 33); + /*error: only interlace methods 0 and 1 exist in the specification*/ + if (info->interlace_method > 1) + CERROR_RETURN_ERROR(state->error, 34); + + if (!state->decoder.ignore_crc) { + unsigned CRC = lodepng_read32bitInt(&in[29]); + unsigned checksum = lodepng_crc32(&in[12], 17); + if (CRC != checksum) { + CERROR_RETURN_ERROR(state->error, 57); /*invalid CRC*/ + } + } + + return state->error; +} + +static unsigned unfilterScanline(unsigned char *recon, const unsigned char *scanline, + const unsigned char *precon, size_t bytewidth, unsigned char filterType, size_t length) { + /* + For PNG filter method 0 + unfilter a PNG image scanline by scanline. when the pixels are smaller than + 1 byte, the filter works byte per byte (bytewidth = 1) precon is the + previous unfiltered scanline, recon the result, scanline the current one the + incoming scanlines do NOT include the filtertype byte, that one is given in + the parameter filterType instead recon and scanline MAY be the same memory + address! precon must be disjoint. + */ + + size_t i; + switch (filterType) { + case 0: + for (i = 0; i != length; ++i) + recon[i] = scanline[i]; + break; + case 1: { + size_t j = 0; + for (i = 0; i != bytewidth; ++i) + recon[i] = scanline[i]; + for (i = bytewidth; i != length; ++i, ++j) + recon[i] = scanline[i] + recon[j]; + break; + } + case 2: + if (precon) { + for (i = 0; i != length; ++i) + recon[i] = scanline[i] + precon[i]; + } else { + for (i = 0; i != length; ++i) + recon[i] = scanline[i]; + } + break; + case 3: + if (precon) { + size_t j = 0; + for (i = 0; i != bytewidth; ++i) + recon[i] = scanline[i] + (precon[i] >> 1u); + /* Unroll independent paths of this predictor. A 6x and 8x version + is also possible but that adds too much code. Whether this speeds up + anything depends on compiler and settings. */ + if (bytewidth >= 4) { + for (; i + 3 < length; i += 4, j += 4) { + unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2], + s3 = scanline[i + 3]; + unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2], + r3 = recon[j + 3]; + unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2], + p3 = precon[i + 3]; + recon[i + 0] = s0 + ((r0 + p0) >> 1u); + recon[i + 1] = s1 + ((r1 + p1) >> 1u); + recon[i + 2] = s2 + ((r2 + p2) >> 1u); + recon[i + 3] = s3 + ((r3 + p3) >> 1u); + } + } else if (bytewidth >= 3) { + for (; i + 2 < length; i += 3, j += 3) { + unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2]; + unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2]; + unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2]; + recon[i + 0] = s0 + ((r0 + p0) >> 1u); + recon[i + 1] = s1 + ((r1 + p1) >> 1u); + recon[i + 2] = s2 + ((r2 + p2) >> 1u); + } + } else if (bytewidth >= 2) { + for (; i + 1 < length; i += 2, j += 2) { + unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1]; + unsigned char r0 = recon[j + 0], r1 = recon[j + 1]; + unsigned char p0 = precon[i + 0], p1 = precon[i + 1]; + recon[i + 0] = s0 + ((r0 + p0) >> 1u); + recon[i + 1] = s1 + ((r1 + p1) >> 1u); + } + } + for (; i != length; ++i, ++j) + recon[i] = scanline[i] + ((recon[j] + precon[i]) >> 1u); + } else { + size_t j = 0; + for (i = 0; i != bytewidth; ++i) + recon[i] = scanline[i]; + for (i = bytewidth; i != length; ++i, ++j) + recon[i] = scanline[i] + (recon[j] >> 1u); + } + break; + case 4: + if (precon) { + /* Unroll independent paths of this predictor. Whether this speeds + up anything depends on compiler and settings. */ + if (bytewidth == 8) { + unsigned char a0, b0 = 0, c0, d0 = 0, a1, b1 = 0, c1, d1 = 0; + unsigned char a2, b2 = 0, c2, d2 = 0, a3, b3 = 0, c3, d3 = 0; + unsigned char a4, b4 = 0, c4, d4 = 0, a5, b5 = 0, c5, d5 = 0; + unsigned char a6, b6 = 0, c6, d6 = 0, a7, b7 = 0, c7, d7 = 0; + for (i = 0; i + 7 < length; i += 8) { + c0 = b0; + c1 = b1; + c2 = b2; + c3 = b3; + c4 = b4; + c5 = b5; + c6 = b6; + c7 = b7; + b0 = precon[i + 0]; + b1 = precon[i + 1]; + b2 = precon[i + 2]; + b3 = precon[i + 3]; + b4 = precon[i + 4]; + b5 = precon[i + 5]; + b6 = precon[i + 6]; + b7 = precon[i + 7]; + a0 = d0; + a1 = d1; + a2 = d2; + a3 = d3; + a4 = d4; + a5 = d5; + a6 = d6; + a7 = d7; + d0 = scanline[i + 0] + paethPredictor(a0, b0, c0); + d1 = scanline[i + 1] + paethPredictor(a1, b1, c1); + d2 = scanline[i + 2] + paethPredictor(a2, b2, c2); + d3 = scanline[i + 3] + paethPredictor(a3, b3, c3); + d4 = scanline[i + 4] + paethPredictor(a4, b4, c4); + d5 = scanline[i + 5] + paethPredictor(a5, b5, c5); + d6 = scanline[i + 6] + paethPredictor(a6, b6, c6); + d7 = scanline[i + 7] + paethPredictor(a7, b7, c7); + recon[i + 0] = d0; + recon[i + 1] = d1; + recon[i + 2] = d2; + recon[i + 3] = d3; + recon[i + 4] = d4; + recon[i + 5] = d5; + recon[i + 6] = d6; + recon[i + 7] = d7; + } + } else if (bytewidth == 6) { + unsigned char a0, b0 = 0, c0, d0 = 0, a1, b1 = 0, c1, d1 = 0; + unsigned char a2, b2 = 0, c2, d2 = 0, a3, b3 = 0, c3, d3 = 0; + unsigned char a4, b4 = 0, c4, d4 = 0, a5, b5 = 0, c5, d5 = 0; + for (i = 0; i + 5 < length; i += 6) { + c0 = b0; + c1 = b1; + c2 = b2; + c3 = b3; + c4 = b4; + c5 = b5; + b0 = precon[i + 0]; + b1 = precon[i + 1]; + b2 = precon[i + 2]; + b3 = precon[i + 3]; + b4 = precon[i + 4]; + b5 = precon[i + 5]; + a0 = d0; + a1 = d1; + a2 = d2; + a3 = d3; + a4 = d4; + a5 = d5; + d0 = scanline[i + 0] + paethPredictor(a0, b0, c0); + d1 = scanline[i + 1] + paethPredictor(a1, b1, c1); + d2 = scanline[i + 2] + paethPredictor(a2, b2, c2); + d3 = scanline[i + 3] + paethPredictor(a3, b3, c3); + d4 = scanline[i + 4] + paethPredictor(a4, b4, c4); + d5 = scanline[i + 5] + paethPredictor(a5, b5, c5); + recon[i + 0] = d0; + recon[i + 1] = d1; + recon[i + 2] = d2; + recon[i + 3] = d3; + recon[i + 4] = d4; + recon[i + 5] = d5; + } + } else if (bytewidth == 4) { + unsigned char a0, b0 = 0, c0, d0 = 0, a1, b1 = 0, c1, d1 = 0; + unsigned char a2, b2 = 0, c2, d2 = 0, a3, b3 = 0, c3, d3 = 0; + for (i = 0; i + 3 < length; i += 4) { + c0 = b0; + c1 = b1; + c2 = b2; + c3 = b3; + b0 = precon[i + 0]; + b1 = precon[i + 1]; + b2 = precon[i + 2]; + b3 = precon[i + 3]; + a0 = d0; + a1 = d1; + a2 = d2; + a3 = d3; + d0 = scanline[i + 0] + paethPredictor(a0, b0, c0); + d1 = scanline[i + 1] + paethPredictor(a1, b1, c1); + d2 = scanline[i + 2] + paethPredictor(a2, b2, c2); + d3 = scanline[i + 3] + paethPredictor(a3, b3, c3); + recon[i + 0] = d0; + recon[i + 1] = d1; + recon[i + 2] = d2; + recon[i + 3] = d3; + } + } else if (bytewidth == 3) { + unsigned char a0, b0 = 0, c0, d0 = 0; + unsigned char a1, b1 = 0, c1, d1 = 0; + unsigned char a2, b2 = 0, c2, d2 = 0; + for (i = 0; i + 2 < length; i += 3) { + c0 = b0; + c1 = b1; + c2 = b2; + b0 = precon[i + 0]; + b1 = precon[i + 1]; + b2 = precon[i + 2]; + a0 = d0; + a1 = d1; + a2 = d2; + d0 = scanline[i + 0] + paethPredictor(a0, b0, c0); + d1 = scanline[i + 1] + paethPredictor(a1, b1, c1); + d2 = scanline[i + 2] + paethPredictor(a2, b2, c2); + recon[i + 0] = d0; + recon[i + 1] = d1; + recon[i + 2] = d2; + } + } else if (bytewidth == 2) { + unsigned char a0, b0 = 0, c0, d0 = 0; + unsigned char a1, b1 = 0, c1, d1 = 0; + for (i = 0; i + 1 < length; i += 2) { + c0 = b0; + c1 = b1; + b0 = precon[i + 0]; + b1 = precon[i + 1]; + a0 = d0; + a1 = d1; + d0 = scanline[i + 0] + paethPredictor(a0, b0, c0); + d1 = scanline[i + 1] + paethPredictor(a1, b1, c1); + recon[i + 0] = d0; + recon[i + 1] = d1; + } + } else if (bytewidth == 1) { + unsigned char a, b = 0, c, d = 0; + for (i = 0; i != length; ++i) { + c = b; + b = precon[i]; + a = d; + d = scanline[i] + paethPredictor(a, b, c); + recon[i] = d; + } + } else { + /* Normally not a possible case, but this would handle it + * correctly */ + for (i = 0; i != bytewidth; ++i) { + recon[i] = (scanline[i] + precon[i]); /*paethPredictor(0, precon[i], + 0) is always precon[i]*/ + } + } + /* finish any remaining bytes */ + for (; i != length; ++i) { + recon[i] = (scanline[i] + + paethPredictor(recon[i - bytewidth], precon[i], precon[i - bytewidth])); + } + } else { + size_t j = 0; + for (i = 0; i != bytewidth; ++i) { + recon[i] = scanline[i]; + } + for (i = bytewidth; i != length; ++i, ++j) { + /*paethPredictor(recon[i - bytewidth], 0, 0) is always recon[i - + * bytewidth]*/ + recon[i] = (scanline[i] + recon[j]); + } + } + break; + default: + return 36; /*error: invalid filter type given*/ + } + return 0; +} + +static unsigned unfilter( + unsigned char *out, const unsigned char *in, unsigned w, unsigned h, unsigned bpp) { + /* + For PNG filter method 0 + this function unfilters a single image (e.g. without interlacing this is + called once, with Adam7 seven times) out must have enough bytes allocated + already, in must have the scanlines + 1 filtertype byte per scanline w and h + are image dimensions or dimensions of reduced image, bpp is bits per pixel + in and out are allowed to be the same memory address (but aren't the same + size since in has the extra filter bytes) + */ + + unsigned y; + unsigned char *prevline = 0; + + /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per + * pixel otherwise*/ + size_t bytewidth = (bpp + 7u) / 8u; + /*the width of a scanline in bytes, not including the filter type*/ + size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u; + + for (y = 0; y < h; ++y) { + size_t outindex = linebytes * y; + size_t inindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ + unsigned char filterType = in[inindex]; + + CERROR_TRY_RETURN(unfilterScanline( + &out[outindex], &in[inindex + 1], prevline, bytewidth, filterType, linebytes)); + + prevline = &out[outindex]; + } + + return 0; } /* in: Adam7 interlaced image, with no padding bits between scanlines, but between reduced images so that each reduced image starts at a byte. -out: the same pixels, but re-ordered so that they're now a non-interlaced image with size w*h -bpp: bits per pixel -out has the following size in bits: w * h * bpp. -in is possibly bigger due to padding bits between reduced images. -out must be big enough AND must be 0 everywhere if bpp < 8 in the current implementation +out: the same pixels, but re-ordered so that they're now a non-interlaced image +with size w*h bpp: bits per pixel out has the following size in bits: w * h * +bpp. in is possibly bigger due to padding bits between reduced images. out must +be big enough AND must be 0 everywhere if bpp < 8 in the current implementation (because that's likely a little bit faster) NOTE: comments about padding bits are only relevant if bpp < 8 */ -static void Adam7_deinterlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - if(bpp >= 8) { - for(i = 0; i != 7; ++i) { - unsigned x, y, b; - size_t bytewidth = bpp / 8u; - for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) { - size_t pixelinstart = passstart[i] + (y * passw[i] + x) * bytewidth; - size_t pixeloutstart = ((ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * (size_t)w - + ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bytewidth; - for(b = 0; b < bytewidth; ++b) { - out[pixeloutstart + b] = in[pixelinstart + b]; - } - } - } - } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ { - for(i = 0; i != 7; ++i) { - unsigned x, y, b; - unsigned ilinebits = bpp * passw[i]; - unsigned olinebits = bpp * w; - size_t obp, ibp; /*bit pointers (for out and in buffer)*/ - for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) { - ibp = (8 * passstart[i]) + (y * ilinebits + x * bpp); - obp = (ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bpp; - for(b = 0; b < bpp; ++b) { - unsigned char bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - } - } - } +static void Adam7_deinterlace( + unsigned char *out, const unsigned char *in, unsigned w, unsigned h, unsigned bpp) { + unsigned passw[7], passh[7]; + size_t filter_passstart[8], padded_passstart[8], passstart[8]; + unsigned i; + + Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); + + if (bpp >= 8) { + for (i = 0; i != 7; ++i) { + unsigned x, y, b; + size_t bytewidth = bpp / 8u; + for (y = 0; y < passh[i]; ++y) + for (x = 0; x < passw[i]; ++x) { + size_t pixelinstart = passstart[i] + (y * passw[i] + x) * bytewidth; + size_t pixeloutstart = ((ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * (size_t)w + + ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * + bytewidth; + for (b = 0; b < bytewidth; ++b) { + out[pixeloutstart + b] = in[pixelinstart + b]; + } + } + } + } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit + pointers*/ + { + for (i = 0; i != 7; ++i) { + unsigned x, y, b; + unsigned ilinebits = bpp * passw[i]; + unsigned olinebits = bpp * w; + size_t obp, ibp; /*bit pointers (for out and in buffer)*/ + for (y = 0; y < passh[i]; ++y) + for (x = 0; x < passw[i]; ++x) { + ibp = (8 * passstart[i]) + (y * ilinebits + x * bpp); + obp = (ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * olinebits + + (ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bpp; + for (b = 0; b < bpp; ++b) { + unsigned char bit = readBitFromReversedStream(&ibp, in); + setBitOfReversedStream(&obp, out, bit); + } + } + } + } +} + +static void removePaddingBits( + unsigned char *out, const unsigned char *in, size_t olinebits, size_t ilinebits, unsigned h) { + /* + After filtering there are still padding bits if scanlines have non multiple + of 8 bit amounts. They need to be removed (except at last scanline of + (Adam7-reduced) image) before working with pure image buffers for the Adam7 + code, the color convert code and the output to the user. in and out are + allowed to be the same buffer, in may also be higher but still overlapping; + in must have >= ilinebits*h bits, out must have >= olinebits*h bits, + olinebits must be <= ilinebits also used to move bits after earlier such + operations happened, e.g. in a sequence of reduced images from Adam7 only + useful if (ilinebits - olinebits) is a value in the range 1..7 + */ + unsigned y; + size_t diff = ilinebits - olinebits; + size_t ibp = 0, obp = 0; /*input and output bit pointers*/ + for (y = 0; y < h; ++y) { + size_t x; + for (x = 0; x < olinebits; ++x) { + unsigned char bit = readBitFromReversedStream(&ibp, in); + setBitOfReversedStream(&obp, out, bit); + } + ibp += diff; + } +} + +/*out must be buffer big enough to contain full image, and in must contain the +full decompressed data from the IDAT chunks (with filter index bytes and +possible padding bits) return value is error*/ +static unsigned postProcessScanlines( + unsigned char *out, unsigned char *in, unsigned w, unsigned h, const LodePNGInfo *info_png) { + /* + This function converts the filtered-padded-interlaced data into pure 2D + image buffer with the PNG's colortype. Steps: + *) if no Adam7: 1) unfilter 2) remove padding bits (= possible extra bits + per scanline if bpp < 8) + *) if adam7: 1) 7x unfilter 2) 7x remove padding bits 3) Adam7_deinterlace + NOTE: the in buffer will be overwritten with intermediate data! + */ + unsigned bpp = lodepng_get_bpp(&info_png->color); + if (bpp == 0) + return 31; /*error: invalid colortype*/ + + if (info_png->interlace_method == 0) { + if (bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) { + CERROR_TRY_RETURN(unfilter(in, in, w, h, bpp)); + removePaddingBits(out, in, w * bpp, ((w * bpp + 7u) / 8u) * 8u, h); + } + /*we can immediately filter into the out buffer, no other steps needed*/ + else + CERROR_TRY_RETURN(unfilter(out, in, w, h, bpp)); + } else /*interlace_method is 1 (Adam7)*/ { + unsigned passw[7], passh[7]; + size_t filter_passstart[8], padded_passstart[8], passstart[8]; + unsigned i; + + Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); + + for (i = 0; i != 7; ++i) { + CERROR_TRY_RETURN(unfilter( + &in[padded_passstart[i]], &in[filter_passstart[i]], passw[i], passh[i], bpp)); + /*TODO: possible efficiency improvement: if in this reduced image + the bits fit nicely in 1 scanline, move bytes instead of bits or + move not at all*/ + if (bpp < 8) { + /*remove padding bits in scanlines; after this there still may + be padding bits between the different reduced images: each + reduced image still starts nicely at a byte*/ + removePaddingBits(&in[passstart[i]], &in[padded_passstart[i]], passw[i] * bpp, + ((passw[i] * bpp + 7u) / 8u) * 8u, passh[i]); + } + } + + Adam7_deinterlace(out, in, w, h, bpp); + } + + return 0; +} + +static unsigned readChunk_PLTE( + LodePNGColorMode *color, const unsigned char *data, size_t chunkLength) { + unsigned pos = 0, i; + color->palettesize = chunkLength / 3u; + if (color->palettesize == 0 || color->palettesize > 256) + return 38; /*error: palette too small or big*/ + lodepng_color_mode_alloc_palette(color); + if (!color->palette && color->palettesize) { + color->palettesize = 0; + return 83; /*alloc fail*/ + } + + for (i = 0; i != color->palettesize; ++i) { + color->palette[4 * i + 0] = data[pos++]; /*R*/ + color->palette[4 * i + 1] = data[pos++]; /*G*/ + color->palette[4 * i + 2] = data[pos++]; /*B*/ + color->palette[4 * i + 3] = 255; /*alpha*/ + } + + return 0; /* OK */ +} + +static unsigned readChunk_tRNS( + LodePNGColorMode *color, const unsigned char *data, size_t chunkLength) { + unsigned i; + if (color->colortype == LCT_PALETTE) { + /*error: more alpha values given than there are palette entries*/ + if (chunkLength > color->palettesize) + return 39; + + for (i = 0; i != chunkLength; ++i) + color->palette[4 * i + 3] = data[i]; + } else if (color->colortype == LCT_GREY) { + /*error: this chunk must be 2 bytes for grayscale image*/ + if (chunkLength != 2) + return 30; + + color->key_defined = 1; + color->key_r = color->key_g = color->key_b = 256u * data[0] + data[1]; + } else if (color->colortype == LCT_RGB) { + /*error: this chunk must be 6 bytes for RGB image*/ + if (chunkLength != 6) + return 41; + + color->key_defined = 1; + color->key_r = 256u * data[0] + data[1]; + color->key_g = 256u * data[2] + data[3]; + color->key_b = 256u * data[4] + data[5]; + } else + return 42; /*error: tRNS chunk not allowed for other color models*/ + + return 0; /* OK */ } -static void removePaddingBits(unsigned char* out, const unsigned char* in, - size_t olinebits, size_t ilinebits, unsigned h) { - /* - After filtering there are still padding bits if scanlines have non multiple of 8 bit amounts. They need - to be removed (except at last scanline of (Adam7-reduced) image) before working with pure image buffers - for the Adam7 code, the color convert code and the output to the user. - in and out are allowed to be the same buffer, in may also be higher but still overlapping; in must - have >= ilinebits*h bits, out must have >= olinebits*h bits, olinebits must be <= ilinebits - also used to move bits after earlier such operations happened, e.g. in a sequence of reduced images from Adam7 - only useful if (ilinebits - olinebits) is a value in the range 1..7 - */ - unsigned y; - size_t diff = ilinebits - olinebits; - size_t ibp = 0, obp = 0; /*input and output bit pointers*/ - for(y = 0; y < h; ++y) { - size_t x; - for(x = 0; x < olinebits; ++x) { - unsigned char bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - ibp += diff; - } +#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS +/*background color chunk (bKGD)*/ +static unsigned readChunk_bKGD(LodePNGInfo *info, const unsigned char *data, size_t chunkLength) { + if (info->color.colortype == LCT_PALETTE) { + /*error: this chunk must be 1 byte for indexed color image*/ + if (chunkLength != 1) + return 43; + + /*error: invalid palette index, or maybe this chunk appeared before + * PLTE*/ + if (data[0] >= info->color.palettesize) + return 103; + + info->background_defined = 1; + info->background_r = info->background_g = info->background_b = data[0]; + } else if (info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { + /*error: this chunk must be 2 bytes for grayscale image*/ + if (chunkLength != 2) + return 44; + + /*the values are truncated to bitdepth in the PNG file*/ + info->background_defined = 1; + info->background_r = info->background_g = info->background_b = 256u * data[0] + data[1]; + } else if (info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { + /*error: this chunk must be 6 bytes for grayscale image*/ + if (chunkLength != 6) + return 45; + + /*the values are truncated to bitdepth in the PNG file*/ + info->background_defined = 1; + info->background_r = 256u * data[0] + data[1]; + info->background_g = 256u * data[2] + data[3]; + info->background_b = 256u * data[4] + data[5]; + } + + return 0; /* OK */ } -/*out must be buffer big enough to contain full image, and in must contain the full decompressed data from -the IDAT chunks (with filter index bytes and possible padding bits) -return value is error*/ -static unsigned postProcessScanlines(unsigned char* out, unsigned char* in, - unsigned w, unsigned h, const LodePNGInfo* info_png) { - /* - This function converts the filtered-padded-interlaced data into pure 2D image buffer with the PNG's colortype. - Steps: - *) if no Adam7: 1) unfilter 2) remove padding bits (= possible extra bits per scanline if bpp < 8) - *) if adam7: 1) 7x unfilter 2) 7x remove padding bits 3) Adam7_deinterlace - NOTE: the in buffer will be overwritten with intermediate data! - */ - unsigned bpp = lodepng_get_bpp(&info_png->color); - if(bpp == 0) return 31; /*error: invalid colortype*/ - - if(info_png->interlace_method == 0) { - if(bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) { - CERROR_TRY_RETURN(unfilter(in, in, w, h, bpp)); - removePaddingBits(out, in, w * bpp, ((w * bpp + 7u) / 8u) * 8u, h); - } - /*we can immediately filter into the out buffer, no other steps needed*/ - else CERROR_TRY_RETURN(unfilter(out, in, w, h, bpp)); - } else /*interlace_method is 1 (Adam7)*/ { - unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - for(i = 0; i != 7; ++i) { - CERROR_TRY_RETURN(unfilter(&in[padded_passstart[i]], &in[filter_passstart[i]], passw[i], passh[i], bpp)); - /*TODO: possible efficiency improvement: if in this reduced image the bits fit nicely in 1 scanline, - move bytes instead of bits or move not at all*/ - if(bpp < 8) { - /*remove padding bits in scanlines; after this there still may be padding - bits between the different reduced images: each reduced image still starts nicely at a byte*/ - removePaddingBits(&in[passstart[i]], &in[padded_passstart[i]], passw[i] * bpp, - ((passw[i] * bpp + 7u) / 8u) * 8u, passh[i]); - } - } - - Adam7_deinterlace(out, in, w, h, bpp); - } - - return 0; -} +/*text chunk (tEXt)*/ +static unsigned readChunk_tEXt(LodePNGInfo *info, const unsigned char *data, size_t chunkLength) { + unsigned error = 0; + char *key = 0, *str = 0; -static unsigned readChunk_PLTE(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) { - unsigned pos = 0, i; - color->palettesize = chunkLength / 3u; - if(color->palettesize == 0 || color->palettesize > 256) return 38; /*error: palette too small or big*/ - lodepng_color_mode_alloc_palette(color); - if(!color->palette && color->palettesize) { - color->palettesize = 0; - return 83; /*alloc fail*/ - } + while (!error) /*not really a while loop, only used to break on error*/ { + unsigned length, string2_begin; - for(i = 0; i != color->palettesize; ++i) { - color->palette[4 * i + 0] = data[pos++]; /*R*/ - color->palette[4 * i + 1] = data[pos++]; /*G*/ - color->palette[4 * i + 2] = data[pos++]; /*B*/ - color->palette[4 * i + 3] = 255; /*alpha*/ - } + length = 0; + while (length < chunkLength && data[length] != 0) + ++length; + /*even though it's not allowed by the standard, no error is thrown if + there's no null termination char, if the text is empty*/ + if (length < 1 || length > 79) + CERROR_BREAK(error, 89); /*keyword too short or long*/ - return 0; /* OK */ -} + key = (char *)lodepng_malloc(length + 1); + if (!key) + CERROR_BREAK(error, 83); /*alloc fail*/ -static unsigned readChunk_tRNS(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) { - unsigned i; - if(color->colortype == LCT_PALETTE) { - /*error: more alpha values given than there are palette entries*/ - if(chunkLength > color->palettesize) return 39; + lodepng_memcpy(key, data, length); + key[length] = 0; - for(i = 0; i != chunkLength; ++i) color->palette[4 * i + 3] = data[i]; - } else if(color->colortype == LCT_GREY) { - /*error: this chunk must be 2 bytes for grayscale image*/ - if(chunkLength != 2) return 30; + string2_begin = length + 1; /*skip keyword null terminator*/ - color->key_defined = 1; - color->key_r = color->key_g = color->key_b = 256u * data[0] + data[1]; - } else if(color->colortype == LCT_RGB) { - /*error: this chunk must be 6 bytes for RGB image*/ - if(chunkLength != 6) return 41; + length = (unsigned)(chunkLength < string2_begin ? 0 : chunkLength - string2_begin); + str = (char *)lodepng_malloc(length + 1); + if (!str) + CERROR_BREAK(error, 83); /*alloc fail*/ - color->key_defined = 1; - color->key_r = 256u * data[0] + data[1]; - color->key_g = 256u * data[2] + data[3]; - color->key_b = 256u * data[4] + data[5]; - } - else return 42; /*error: tRNS chunk not allowed for other color models*/ + lodepng_memcpy(str, data + string2_begin, length); + str[length] = 0; - return 0; /* OK */ -} + error = lodepng_add_text(info, key, str); + break; + } -#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -/*background color chunk (bKGD)*/ -static unsigned readChunk_bKGD(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(info->color.colortype == LCT_PALETTE) { - /*error: this chunk must be 1 byte for indexed color image*/ - if(chunkLength != 1) return 43; - - /*error: invalid palette index, or maybe this chunk appeared before PLTE*/ - if(data[0] >= info->color.palettesize) return 103; - - info->background_defined = 1; - info->background_r = info->background_g = info->background_b = data[0]; - } else if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { - /*error: this chunk must be 2 bytes for grayscale image*/ - if(chunkLength != 2) return 44; - - /*the values are truncated to bitdepth in the PNG file*/ - info->background_defined = 1; - info->background_r = info->background_g = info->background_b = 256u * data[0] + data[1]; - } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { - /*error: this chunk must be 6 bytes for grayscale image*/ - if(chunkLength != 6) return 45; - - /*the values are truncated to bitdepth in the PNG file*/ - info->background_defined = 1; - info->background_r = 256u * data[0] + data[1]; - info->background_g = 256u * data[2] + data[3]; - info->background_b = 256u * data[4] + data[5]; - } + lodepng_free(key); + lodepng_free(str); - return 0; /* OK */ + return error; } -/*text chunk (tEXt)*/ -static unsigned readChunk_tEXt(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - unsigned error = 0; - char *key = 0, *str = 0; - - while(!error) /*not really a while loop, only used to break on error*/ { - unsigned length, string2_begin; - - length = 0; - while(length < chunkLength && data[length] != 0) ++length; - /*even though it's not allowed by the standard, no error is thrown if - there's no null termination char, if the text is empty*/ - if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ - - key = (char*)lodepng_malloc(length + 1); - if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(key, data, length); - key[length] = 0; - - string2_begin = length + 1; /*skip keyword null terminator*/ +/*compressed text chunk (zTXt)*/ +static unsigned readChunk_zTXt(LodePNGInfo *info, const LodePNGDecoderSettings *decoder, + const unsigned char *data, size_t chunkLength) { + unsigned error = 0; + + /*copy the object to change parameters in it*/ + LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; + + unsigned length, string2_begin; + char *key = 0; + unsigned char *str = 0; + size_t size = 0; + + while (!error) /*not really a while loop, only used to break on error*/ { + for (length = 0; length < chunkLength && data[length] != 0; ++length) + ; + if (length + 2 >= chunkLength) + CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ + if (length < 1 || length > 79) + CERROR_BREAK(error, 89); /*keyword too short or long*/ + + key = (char *)lodepng_malloc(length + 1); + if (!key) + CERROR_BREAK(error, 83); /*alloc fail*/ + + lodepng_memcpy(key, data, length); + key[length] = 0; + + if (data[length + 1] != 0) + CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ + + string2_begin = length + 2; + if (string2_begin > chunkLength) + CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ + + length = (unsigned)chunkLength - string2_begin; + zlibsettings.max_output_size = decoder->max_text_size; + /*will fail if zlib error, e.g. if length is too small*/ + error = zlib_decompress(&str, &size, 0, &data[string2_begin], length, &zlibsettings); + /*error: compressed text larger than decoder->max_text_size*/ + if (error && size > zlibsettings.max_output_size) + error = 112; + if (error) + break; + error = lodepng_add_text_sized(info, key, (char *)str, size); + break; + } + + lodepng_free(key); + lodepng_free(str); + + return error; +} - length = (unsigned)(chunkLength < string2_begin ? 0 : chunkLength - string2_begin); - str = (char*)lodepng_malloc(length + 1); - if(!str) CERROR_BREAK(error, 83); /*alloc fail*/ +/*international text chunk (iTXt)*/ +static unsigned readChunk_iTXt(LodePNGInfo *info, const LodePNGDecoderSettings *decoder, + const unsigned char *data, size_t chunkLength) { + unsigned error = 0; + unsigned i; + + /*copy the object to change parameters in it*/ + LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; + + unsigned length, begin, compressed; + char *key = 0, *langtag = 0, *transkey = 0; + + while (!error) /*not really a while loop, only used to break on error*/ { + /*Quick check if the chunk length isn't too small. Even without check + it'd still fail with other error checks below if it's too short. This + just gives a different error code.*/ + if (chunkLength < 5) + CERROR_BREAK(error, 30); /*iTXt chunk too short*/ + + /*read the key*/ + for (length = 0; length < chunkLength && data[length] != 0; ++length) + ; + if (length + 3 >= chunkLength) + CERROR_BREAK(error, 75); /*no null termination char, corrupt?*/ + if (length < 1 || length > 79) + CERROR_BREAK(error, 89); /*keyword too short or long*/ + + key = (char *)lodepng_malloc(length + 1); + if (!key) + CERROR_BREAK(error, 83); /*alloc fail*/ + + lodepng_memcpy(key, data, length); + key[length] = 0; + + /*read the compression method*/ + compressed = data[length + 1]; + if (data[length + 2] != 0) + CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ - lodepng_memcpy(str, data + string2_begin, length); - str[length] = 0; + /*even though it's not allowed by the standard, no error is thrown if + there's no null termination char, if the text is empty for the next 3 + texts*/ - error = lodepng_add_text(info, key, str); + /*read the langtag*/ + begin = length + 3; + length = 0; + for (i = begin; i < chunkLength && data[i] != 0; ++i) + ++length; + + langtag = (char *)lodepng_malloc(length + 1); + if (!langtag) + CERROR_BREAK(error, 83); /*alloc fail*/ + + lodepng_memcpy(langtag, data + begin, length); + langtag[length] = 0; - break; - } + /*read the transkey*/ + begin += length + 1; + length = 0; + for (i = begin; i < chunkLength && data[i] != 0; ++i) + ++length; - lodepng_free(key); - lodepng_free(str); + transkey = (char *)lodepng_malloc(length + 1); + if (!transkey) + CERROR_BREAK(error, 83); /*alloc fail*/ - return error; -} + lodepng_memcpy(transkey, data + begin, length); + transkey[length] = 0; -/*compressed text chunk (zTXt)*/ -static unsigned readChunk_zTXt(LodePNGInfo* info, const LodePNGDecoderSettings* decoder, - const unsigned char* data, size_t chunkLength) { - unsigned error = 0; - - /*copy the object to change parameters in it*/ - LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; - - unsigned length, string2_begin; - char *key = 0; - unsigned char* str = 0; - size_t size = 0; - - while(!error) /*not really a while loop, only used to break on error*/ { - for(length = 0; length < chunkLength && data[length] != 0; ++length) ; - if(length + 2 >= chunkLength) CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ - if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ - - key = (char*)lodepng_malloc(length + 1); - if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(key, data, length); - key[length] = 0; - - if(data[length + 1] != 0) CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ - - string2_begin = length + 2; - if(string2_begin > chunkLength) CERROR_BREAK(error, 75); /*no null termination, corrupt?*/ - - length = (unsigned)chunkLength - string2_begin; - zlibsettings.max_output_size = decoder->max_text_size; - /*will fail if zlib error, e.g. if length is too small*/ - error = zlib_decompress(&str, &size, 0, &data[string2_begin], - length, &zlibsettings); - /*error: compressed text larger than decoder->max_text_size*/ - if(error && size > zlibsettings.max_output_size) error = 112; - if(error) break; - error = lodepng_add_text_sized(info, key, (char*)str, size); - break; - } + /*read the actual text*/ + begin += length + 1; - lodepng_free(key); - lodepng_free(str); + length = (unsigned)chunkLength < begin ? 0 : (unsigned)chunkLength - begin; - return error; -} + if (compressed) { + unsigned char *str = 0; + size_t size = 0; + zlibsettings.max_output_size = decoder->max_text_size; + /*will fail if zlib error, e.g. if length is too small*/ + error = zlib_decompress(&str, &size, 0, &data[begin], length, &zlibsettings); + /*error: compressed text larger than decoder->max_text_size*/ + if (error && size > zlibsettings.max_output_size) + error = 112; + if (!error) + error = lodepng_add_itext_sized(info, key, langtag, transkey, (char *)str, size); + lodepng_free(str); + } else { + error = lodepng_add_itext_sized( + info, key, langtag, transkey, (char *)(data + begin), length); + } -/*international text chunk (iTXt)*/ -static unsigned readChunk_iTXt(LodePNGInfo* info, const LodePNGDecoderSettings* decoder, - const unsigned char* data, size_t chunkLength) { - unsigned error = 0; - unsigned i; - - /*copy the object to change parameters in it*/ - LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; - - unsigned length, begin, compressed; - char *key = 0, *langtag = 0, *transkey = 0; - - while(!error) /*not really a while loop, only used to break on error*/ { - /*Quick check if the chunk length isn't too small. Even without check - it'd still fail with other error checks below if it's too short. This just gives a different error code.*/ - if(chunkLength < 5) CERROR_BREAK(error, 30); /*iTXt chunk too short*/ - - /*read the key*/ - for(length = 0; length < chunkLength && data[length] != 0; ++length) ; - if(length + 3 >= chunkLength) CERROR_BREAK(error, 75); /*no null termination char, corrupt?*/ - if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/ - - key = (char*)lodepng_malloc(length + 1); - if(!key) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(key, data, length); - key[length] = 0; - - /*read the compression method*/ - compressed = data[length + 1]; - if(data[length + 2] != 0) CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/ - - /*even though it's not allowed by the standard, no error is thrown if - there's no null termination char, if the text is empty for the next 3 texts*/ - - /*read the langtag*/ - begin = length + 3; - length = 0; - for(i = begin; i < chunkLength && data[i] != 0; ++i) ++length; - - langtag = (char*)lodepng_malloc(length + 1); - if(!langtag) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(langtag, data + begin, length); - langtag[length] = 0; - - /*read the transkey*/ - begin += length + 1; - length = 0; - for(i = begin; i < chunkLength && data[i] != 0; ++i) ++length; - - transkey = (char*)lodepng_malloc(length + 1); - if(!transkey) CERROR_BREAK(error, 83); /*alloc fail*/ - - lodepng_memcpy(transkey, data + begin, length); - transkey[length] = 0; - - /*read the actual text*/ - begin += length + 1; - - length = (unsigned)chunkLength < begin ? 0 : (unsigned)chunkLength - begin; - - if(compressed) { - unsigned char* str = 0; - size_t size = 0; - zlibsettings.max_output_size = decoder->max_text_size; - /*will fail if zlib error, e.g. if length is too small*/ - error = zlib_decompress(&str, &size, 0, &data[begin], - length, &zlibsettings); - /*error: compressed text larger than decoder->max_text_size*/ - if(error && size > zlibsettings.max_output_size) error = 112; - if(!error) error = lodepng_add_itext_sized(info, key, langtag, transkey, (char*)str, size); - lodepng_free(str); - } else { - error = lodepng_add_itext_sized(info, key, langtag, transkey, (char*)(data + begin), length); - } - - break; - } + break; + } - lodepng_free(key); - lodepng_free(langtag); - lodepng_free(transkey); + lodepng_free(key); + lodepng_free(langtag); + lodepng_free(transkey); - return error; + return error; } -static unsigned readChunk_tIME(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(chunkLength != 7) return 73; /*invalid tIME chunk size*/ +static unsigned readChunk_tIME(LodePNGInfo *info, const unsigned char *data, size_t chunkLength) { + if (chunkLength != 7) + return 73; /*invalid tIME chunk size*/ - info->time_defined = 1; - info->time.year = 256u * data[0] + data[1]; - info->time.month = data[2]; - info->time.day = data[3]; - info->time.hour = data[4]; - info->time.minute = data[5]; - info->time.second = data[6]; - - return 0; /* OK */ -} + info->time_defined = 1; + info->time.year = 256u * data[0] + data[1]; + info->time.month = data[2]; + info->time.day = data[3]; + info->time.hour = data[4]; + info->time.minute = data[5]; + info->time.second = data[6]; + + return 0; /* OK */ +} -static unsigned readChunk_pHYs(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(chunkLength != 9) return 74; /*invalid pHYs chunk size*/ +static unsigned readChunk_pHYs(LodePNGInfo *info, const unsigned char *data, size_t chunkLength) { + if (chunkLength != 9) + return 74; /*invalid pHYs chunk size*/ - info->phys_defined = 1; - info->phys_x = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; - info->phys_y = 16777216u * data[4] + 65536u * data[5] + 256u * data[6] + data[7]; - info->phys_unit = data[8]; + info->phys_defined = 1; + info->phys_x = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; + info->phys_y = 16777216u * data[4] + 65536u * data[5] + 256u * data[6] + data[7]; + info->phys_unit = data[8]; - return 0; /* OK */ + return 0; /* OK */ } -static unsigned readChunk_gAMA(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(chunkLength != 4) return 96; /*invalid gAMA chunk size*/ +static unsigned readChunk_gAMA(LodePNGInfo *info, const unsigned char *data, size_t chunkLength) { + if (chunkLength != 4) + return 96; /*invalid gAMA chunk size*/ - info->gama_defined = 1; - info->gama_gamma = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; + info->gama_defined = 1; + info->gama_gamma = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; - return 0; /* OK */ + return 0; /* OK */ } -static unsigned readChunk_cHRM(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(chunkLength != 32) return 97; /*invalid cHRM chunk size*/ +static unsigned readChunk_cHRM(LodePNGInfo *info, const unsigned char *data, size_t chunkLength) { + if (chunkLength != 32) + return 97; /*invalid cHRM chunk size*/ - info->chrm_defined = 1; - info->chrm_white_x = 16777216u * data[ 0] + 65536u * data[ 1] + 256u * data[ 2] + data[ 3]; - info->chrm_white_y = 16777216u * data[ 4] + 65536u * data[ 5] + 256u * data[ 6] + data[ 7]; - info->chrm_red_x = 16777216u * data[ 8] + 65536u * data[ 9] + 256u * data[10] + data[11]; - info->chrm_red_y = 16777216u * data[12] + 65536u * data[13] + 256u * data[14] + data[15]; - info->chrm_green_x = 16777216u * data[16] + 65536u * data[17] + 256u * data[18] + data[19]; - info->chrm_green_y = 16777216u * data[20] + 65536u * data[21] + 256u * data[22] + data[23]; - info->chrm_blue_x = 16777216u * data[24] + 65536u * data[25] + 256u * data[26] + data[27]; - info->chrm_blue_y = 16777216u * data[28] + 65536u * data[29] + 256u * data[30] + data[31]; + info->chrm_defined = 1; + info->chrm_white_x = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3]; + info->chrm_white_y = 16777216u * data[4] + 65536u * data[5] + 256u * data[6] + data[7]; + info->chrm_red_x = 16777216u * data[8] + 65536u * data[9] + 256u * data[10] + data[11]; + info->chrm_red_y = 16777216u * data[12] + 65536u * data[13] + 256u * data[14] + data[15]; + info->chrm_green_x = 16777216u * data[16] + 65536u * data[17] + 256u * data[18] + data[19]; + info->chrm_green_y = 16777216u * data[20] + 65536u * data[21] + 256u * data[22] + data[23]; + info->chrm_blue_x = 16777216u * data[24] + 65536u * data[25] + 256u * data[26] + data[27]; + info->chrm_blue_y = 16777216u * data[28] + 65536u * data[29] + 256u * data[30] + data[31]; - return 0; /* OK */ + return 0; /* OK */ } -static unsigned readChunk_sRGB(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - if(chunkLength != 1) return 98; /*invalid sRGB chunk size (this one is never ignored)*/ +static unsigned readChunk_sRGB(LodePNGInfo *info, const unsigned char *data, size_t chunkLength) { + if (chunkLength != 1) + return 98; /*invalid sRGB chunk size (this one is never ignored)*/ - info->srgb_defined = 1; - info->srgb_intent = data[0]; + info->srgb_defined = 1; + info->srgb_intent = data[0]; - return 0; /* OK */ + return 0; /* OK */ } -static unsigned readChunk_iCCP(LodePNGInfo* info, const LodePNGDecoderSettings* decoder, - const unsigned char* data, size_t chunkLength) { - unsigned error = 0; - unsigned i; - size_t size = 0; - /*copy the object to change parameters in it*/ - LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; +static unsigned readChunk_iCCP(LodePNGInfo *info, const LodePNGDecoderSettings *decoder, + const unsigned char *data, size_t chunkLength) { + unsigned error = 0; + unsigned i; + size_t size = 0; + /*copy the object to change parameters in it*/ + LodePNGDecompressSettings zlibsettings = decoder->zlibsettings; - unsigned length, string2_begin; + unsigned length, string2_begin; - info->iccp_defined = 1; - if(info->iccp_name) lodepng_clear_icc(info); + info->iccp_defined = 1; + if (info->iccp_name) + lodepng_clear_icc(info); - for(length = 0; length < chunkLength && data[length] != 0; ++length) ; - if(length + 2 >= chunkLength) return 75; /*no null termination, corrupt?*/ - if(length < 1 || length > 79) return 89; /*keyword too short or long*/ + for (length = 0; length < chunkLength && data[length] != 0; ++length) + ; + if (length + 2 >= chunkLength) + return 75; /*no null termination, corrupt?*/ + if (length < 1 || length > 79) + return 89; /*keyword too short or long*/ - info->iccp_name = (char*)lodepng_malloc(length + 1); - if(!info->iccp_name) return 83; /*alloc fail*/ + info->iccp_name = (char *)lodepng_malloc(length + 1); + if (!info->iccp_name) + return 83; /*alloc fail*/ - info->iccp_name[length] = 0; - for(i = 0; i != length; ++i) info->iccp_name[i] = (char)data[i]; + info->iccp_name[length] = 0; + for (i = 0; i != length; ++i) + info->iccp_name[i] = (char)data[i]; - if(data[length + 1] != 0) return 72; /*the 0 byte indicating compression must be 0*/ + if (data[length + 1] != 0) + return 72; /*the 0 byte indicating compression must be 0*/ - string2_begin = length + 2; - if(string2_begin > chunkLength) return 75; /*no null termination, corrupt?*/ + string2_begin = length + 2; + if (string2_begin > chunkLength) + return 75; /*no null termination, corrupt?*/ - length = (unsigned)chunkLength - string2_begin; - zlibsettings.max_output_size = decoder->max_icc_size; - error = zlib_decompress(&info->iccp_profile, &size, 0, - &data[string2_begin], - length, &zlibsettings); - /*error: ICC profile larger than decoder->max_icc_size*/ - if(error && size > zlibsettings.max_output_size) error = 113; - info->iccp_profile_size = (unsigned)size; - if(!error && !info->iccp_profile_size) error = 100; /*invalid ICC profile size*/ - return error; + length = (unsigned)chunkLength - string2_begin; + zlibsettings.max_output_size = decoder->max_icc_size; + error = + zlib_decompress(&info->iccp_profile, &size, 0, &data[string2_begin], length, &zlibsettings); + /*error: ICC profile larger than decoder->max_icc_size*/ + if (error && size > zlibsettings.max_output_size) + error = 113; + info->iccp_profile_size = (unsigned)size; + if (!error && !info->iccp_profile_size) + error = 100; /*invalid ICC profile size*/ + return error; } /*significant bits chunk (sBIT)*/ -static unsigned readChunk_sBIT(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) { - unsigned bitdepth = (info->color.colortype == LCT_PALETTE) ? 8 : info->color.bitdepth; - if(info->color.colortype == LCT_GREY) { - /*error: this chunk must be 1 bytes for grayscale image*/ - if(chunkLength != 1) return 114; - if(data[0] == 0 || data[0] > bitdepth) return 115; - info->sbit_defined = 1; - info->sbit_r = info->sbit_g = info->sbit_b = data[0]; /*setting g and b is not required, but sensible*/ - } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_PALETTE) { - /*error: this chunk must be 3 bytes for RGB and palette image*/ - if(chunkLength != 3) return 114; - if(data[0] == 0 || data[1] == 0 || data[2] == 0) return 115; - if(data[0] > bitdepth || data[1] > bitdepth || data[2] > bitdepth) return 115; - info->sbit_defined = 1; - info->sbit_r = data[0]; - info->sbit_g = data[1]; - info->sbit_b = data[2]; - } else if(info->color.colortype == LCT_GREY_ALPHA) { - /*error: this chunk must be 2 byte for grayscale with alpha image*/ - if(chunkLength != 2) return 114; - if(data[0] == 0 || data[1] == 0) return 115; - if(data[0] > bitdepth || data[1] > bitdepth) return 115; - info->sbit_defined = 1; - info->sbit_r = info->sbit_g = info->sbit_b = data[0]; /*setting g and b is not required, but sensible*/ - info->sbit_a = data[1]; - } else if(info->color.colortype == LCT_RGBA) { - /*error: this chunk must be 4 bytes for grayscale image*/ - if(chunkLength != 4) return 114; - if(data[0] == 0 || data[1] == 0 || data[2] == 0 || data[3] == 0) return 115; - if(data[0] > bitdepth || data[1] > bitdepth || data[2] > bitdepth || data[3] > bitdepth) return 115; - info->sbit_defined = 1; - info->sbit_r = data[0]; - info->sbit_g = data[1]; - info->sbit_b = data[2]; - info->sbit_a = data[3]; - } - - return 0; /* OK */ +static unsigned readChunk_sBIT(LodePNGInfo *info, const unsigned char *data, size_t chunkLength) { + unsigned bitdepth = (info->color.colortype == LCT_PALETTE) ? 8 : info->color.bitdepth; + if (info->color.colortype == LCT_GREY) { + /*error: this chunk must be 1 bytes for grayscale image*/ + if (chunkLength != 1) + return 114; + if (data[0] == 0 || data[0] > bitdepth) + return 115; + info->sbit_defined = 1; + info->sbit_r = info->sbit_g = info->sbit_b = + data[0]; /*setting g and b is not required, but sensible*/ + } else if (info->color.colortype == LCT_RGB || info->color.colortype == LCT_PALETTE) { + /*error: this chunk must be 3 bytes for RGB and palette image*/ + if (chunkLength != 3) + return 114; + if (data[0] == 0 || data[1] == 0 || data[2] == 0) + return 115; + if (data[0] > bitdepth || data[1] > bitdepth || data[2] > bitdepth) + return 115; + info->sbit_defined = 1; + info->sbit_r = data[0]; + info->sbit_g = data[1]; + info->sbit_b = data[2]; + } else if (info->color.colortype == LCT_GREY_ALPHA) { + /*error: this chunk must be 2 byte for grayscale with alpha image*/ + if (chunkLength != 2) + return 114; + if (data[0] == 0 || data[1] == 0) + return 115; + if (data[0] > bitdepth || data[1] > bitdepth) + return 115; + info->sbit_defined = 1; + info->sbit_r = info->sbit_g = info->sbit_b = + data[0]; /*setting g and b is not required, but sensible*/ + info->sbit_a = data[1]; + } else if (info->color.colortype == LCT_RGBA) { + /*error: this chunk must be 4 bytes for grayscale image*/ + if (chunkLength != 4) + return 114; + if (data[0] == 0 || data[1] == 0 || data[2] == 0 || data[3] == 0) + return 115; + if (data[0] > bitdepth || data[1] > bitdepth || data[2] > bitdepth || data[3] > bitdepth) + return 115; + info->sbit_defined = 1; + info->sbit_r = data[0]; + info->sbit_g = data[1]; + info->sbit_b = data[2]; + info->sbit_a = data[3]; + } + + return 0; /* OK */ } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos, - const unsigned char* in, size_t insize) { - const unsigned char* chunk = in + pos; - unsigned chunkLength; - const unsigned char* data; - unsigned unhandled = 0; - unsigned error = 0; - - if(pos + 4 > insize) return 30; - chunkLength = lodepng_chunk_length(chunk); - if(chunkLength > 2147483647) return 63; - data = lodepng_chunk_data_const(chunk); - if(chunkLength + 12 > insize - pos) return 30; - - if(lodepng_chunk_type_equals(chunk, "PLTE")) { - error = readChunk_PLTE(&state->info_png.color, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "tRNS")) { - error = readChunk_tRNS(&state->info_png.color, data, chunkLength); +unsigned lodepng_inspect_chunk( + LodePNGState *state, size_t pos, const unsigned char *in, size_t insize) { + const unsigned char *chunk = in + pos; + unsigned chunkLength; + const unsigned char *data; + unsigned unhandled = 0; + unsigned error = 0; + + if (pos + 4 > insize) + return 30; + chunkLength = lodepng_chunk_length(chunk); + if (chunkLength > 2147483647) + return 63; + data = lodepng_chunk_data_const(chunk); + if (chunkLength + 12 > insize - pos) + return 30; + + if (lodepng_chunk_type_equals(chunk, "PLTE")) { + error = readChunk_PLTE(&state->info_png.color, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "tRNS")) { + error = readChunk_tRNS(&state->info_png.color, data, chunkLength); #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - } else if(lodepng_chunk_type_equals(chunk, "bKGD")) { - error = readChunk_bKGD(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "tEXt")) { - error = readChunk_tEXt(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "zTXt")) { - error = readChunk_zTXt(&state->info_png, &state->decoder, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "iTXt")) { - error = readChunk_iTXt(&state->info_png, &state->decoder, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "tIME")) { - error = readChunk_tIME(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "pHYs")) { - error = readChunk_pHYs(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "gAMA")) { - error = readChunk_gAMA(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "cHRM")) { - error = readChunk_cHRM(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "sRGB")) { - error = readChunk_sRGB(&state->info_png, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "iCCP")) { - error = readChunk_iCCP(&state->info_png, &state->decoder, data, chunkLength); - } else if(lodepng_chunk_type_equals(chunk, "sBIT")) { - error = readChunk_sBIT(&state->info_png, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "bKGD")) { + error = readChunk_bKGD(&state->info_png, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "tEXt")) { + error = readChunk_tEXt(&state->info_png, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "zTXt")) { + error = readChunk_zTXt(&state->info_png, &state->decoder, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "iTXt")) { + error = readChunk_iTXt(&state->info_png, &state->decoder, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "tIME")) { + error = readChunk_tIME(&state->info_png, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "pHYs")) { + error = readChunk_pHYs(&state->info_png, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "gAMA")) { + error = readChunk_gAMA(&state->info_png, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "cHRM")) { + error = readChunk_cHRM(&state->info_png, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "sRGB")) { + error = readChunk_sRGB(&state->info_png, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "iCCP")) { + error = readChunk_iCCP(&state->info_png, &state->decoder, data, chunkLength); + } else if (lodepng_chunk_type_equals(chunk, "sBIT")) { + error = readChunk_sBIT(&state->info_png, data, chunkLength); #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } else { - /* unhandled chunk is ok (is not an error) */ - unhandled = 1; - } - - if(!error && !unhandled && !state->decoder.ignore_crc) { - if(lodepng_chunk_check_crc(chunk)) return 57; /*invalid CRC*/ - } - - return error; -} - -/*read a PNG, the result will be in the same color type as the PNG (hence "generic")*/ -static void decodeGeneric(unsigned char** out, unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize) { - unsigned char IEND = 0; - const unsigned char* chunk; /*points to beginning of next chunk*/ - unsigned char* idat; /*the data from idat chunks, zlib compressed*/ - size_t idatsize = 0; - unsigned char* scanlines = 0; - size_t scanlines_size = 0, expected_size = 0; - size_t outsize = 0; - - /*for unknown chunk order*/ - unsigned unknown = 0; + } else { + /* unhandled chunk is ok (is not an error) */ + unhandled = 1; + } + + if (!error && !unhandled && !state->decoder.ignore_crc) { + if (lodepng_chunk_check_crc(chunk)) + return 57; /*invalid CRC*/ + } + + return error; +} + +/*read a PNG, the result will be in the same color type as the PNG (hence + * "generic")*/ +static void decodeGeneric(unsigned char **out, unsigned *w, unsigned *h, LodePNGState *state, + const unsigned char *in, size_t insize) { + unsigned char IEND = 0; + const unsigned char *chunk; /*points to beginning of next chunk*/ + unsigned char *idat; /*the data from idat chunks, zlib compressed*/ + size_t idatsize = 0; + unsigned char *scanlines = 0; + size_t scanlines_size = 0, expected_size = 0; + size_t outsize = 0; + + /*for unknown chunk order*/ + unsigned unknown = 0; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - unsigned critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - - - /* safe output values in case error happens */ - *out = 0; - *w = *h = 0; - - state->error = lodepng_inspect(w, h, state, in, insize); /*reads header and resets other parameters in state->info_png*/ - if(state->error) return; - - if(lodepng_pixel_overflow(*w, *h, &state->info_png.color, &state->info_raw)) { - CERROR_RETURN(state->error, 92); /*overflow possible due to amount of pixels*/ - } - - /*the input filesize is a safe upper bound for the sum of idat chunks size*/ - idat = (unsigned char*)lodepng_malloc(insize); - if(!idat) CERROR_RETURN(state->error, 83); /*alloc fail*/ - - chunk = &in[33]; /*first byte of the first chunk after the header*/ - - /*loop through the chunks, ignoring unknown chunks and stopping at IEND chunk. - IDAT data is put at the start of the in buffer*/ - while(!IEND && !state->error) { - unsigned chunkLength; - const unsigned char* data; /*the data in the chunk*/ - size_t pos = (size_t)(chunk - in); - - /*error: next chunk out of bounds of the in buffer*/ - if(chunk < in || pos + 12 > insize) { - if(state->decoder.ignore_end) break; /*other errors may still happen though*/ - CERROR_BREAK(state->error, 30); - } - - /*length of the data of the chunk, excluding the 12 bytes for length, chunk type and CRC*/ - chunkLength = lodepng_chunk_length(chunk); - /*error: chunk length larger than the max PNG chunk size*/ - if(chunkLength > 2147483647) { - if(state->decoder.ignore_end) break; /*other errors may still happen though*/ - CERROR_BREAK(state->error, 63); - } - - if(pos + (size_t)chunkLength + 12 > insize || pos + (size_t)chunkLength + 12 < pos) { - CERROR_BREAK(state->error, 64); /*error: size of the in buffer too small to contain next chunk (or int overflow)*/ - } - - data = lodepng_chunk_data_const(chunk); - - unknown = 0; - - /*IDAT chunk, containing compressed image data*/ - if(lodepng_chunk_type_equals(chunk, "IDAT")) { - size_t newsize; - if(lodepng_addofl(idatsize, chunkLength, &newsize)) CERROR_BREAK(state->error, 95); - if(newsize > insize) CERROR_BREAK(state->error, 95); - lodepng_memcpy(idat + idatsize, data, chunkLength); - idatsize += chunkLength; + unsigned critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/ +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + + /* safe output values in case error happens */ + *out = 0; + *w = *h = 0; + + state->error = lodepng_inspect( + w, h, state, in, insize); /*reads header and resets other parameters in state->info_png*/ + if (state->error) + return; + + if (lodepng_pixel_overflow(*w, *h, &state->info_png.color, &state->info_raw)) { + CERROR_RETURN(state->error, 92); /*overflow possible due to amount of pixels*/ + } + + /*the input filesize is a safe upper bound for the sum of idat chunks size*/ + idat = (unsigned char *)lodepng_malloc(insize); + if (!idat) + CERROR_RETURN(state->error, 83); /*alloc fail*/ + + chunk = &in[33]; /*first byte of the first chunk after the header*/ + + /*loop through the chunks, ignoring unknown chunks and stopping at IEND + chunk. IDAT data is put at the start of the in buffer*/ + while (!IEND && !state->error) { + unsigned chunkLength; + const unsigned char *data; /*the data in the chunk*/ + size_t pos = (size_t)(chunk - in); + + /*error: next chunk out of bounds of the in buffer*/ + if (chunk < in || pos + 12 > insize) { + if (state->decoder.ignore_end) + break; /*other errors may still happen though*/ + CERROR_BREAK(state->error, 30); + } + + /*length of the data of the chunk, excluding the 12 bytes for length, + * chunk type and CRC*/ + chunkLength = lodepng_chunk_length(chunk); + /*error: chunk length larger than the max PNG chunk size*/ + if (chunkLength > 2147483647) { + if (state->decoder.ignore_end) + break; /*other errors may still happen though*/ + CERROR_BREAK(state->error, 63); + } + + if (pos + (size_t)chunkLength + 12 > insize || pos + (size_t)chunkLength + 12 < pos) { + CERROR_BREAK(state->error, 64); /*error: size of the in buffer too small to + contain next chunk (or int overflow)*/ + } + + data = lodepng_chunk_data_const(chunk); + + unknown = 0; + + /*IDAT chunk, containing compressed image data*/ + if (lodepng_chunk_type_equals(chunk, "IDAT")) { + size_t newsize; + if (lodepng_addofl(idatsize, chunkLength, &newsize)) + CERROR_BREAK(state->error, 95); + if (newsize > insize) + CERROR_BREAK(state->error, 95); + lodepng_memcpy(idat + idatsize, data, chunkLength); + idatsize += chunkLength; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - critical_pos = 3; + critical_pos = 3; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } else if(lodepng_chunk_type_equals(chunk, "IEND")) { - /*IEND chunk*/ - IEND = 1; - } else if(lodepng_chunk_type_equals(chunk, "PLTE")) { - /*palette chunk (PLTE)*/ - state->error = readChunk_PLTE(&state->info_png.color, data, chunkLength); - if(state->error) break; + } else if (lodepng_chunk_type_equals(chunk, "IEND")) { + /*IEND chunk*/ + IEND = 1; + } else if (lodepng_chunk_type_equals(chunk, "PLTE")) { + /*palette chunk (PLTE)*/ + state->error = readChunk_PLTE(&state->info_png.color, data, chunkLength); + if (state->error) + break; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - critical_pos = 2; + critical_pos = 2; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } else if(lodepng_chunk_type_equals(chunk, "tRNS")) { - /*palette transparency chunk (tRNS). Even though this one is an ancillary chunk , it is still compiled - in without 'LODEPNG_COMPILE_ANCILLARY_CHUNKS' because it contains essential color information that - affects the alpha channel of pixels. */ - state->error = readChunk_tRNS(&state->info_png.color, data, chunkLength); - if(state->error) break; + } else if (lodepng_chunk_type_equals(chunk, "tRNS")) { + /*palette transparency chunk (tRNS). Even though this one is an + ancillary chunk , it is still compiled in without + 'LODEPNG_COMPILE_ANCILLARY_CHUNKS' because it contains essential + color information that affects the alpha channel of pixels. */ + state->error = readChunk_tRNS(&state->info_png.color, data, chunkLength); + if (state->error) + break; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*background color chunk (bKGD)*/ - } else if(lodepng_chunk_type_equals(chunk, "bKGD")) { - state->error = readChunk_bKGD(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "tEXt")) { - /*text chunk (tEXt)*/ - if(state->decoder.read_text_chunks) { - state->error = readChunk_tEXt(&state->info_png, data, chunkLength); - if(state->error) break; - } - } else if(lodepng_chunk_type_equals(chunk, "zTXt")) { - /*compressed text chunk (zTXt)*/ - if(state->decoder.read_text_chunks) { - state->error = readChunk_zTXt(&state->info_png, &state->decoder, data, chunkLength); - if(state->error) break; - } - } else if(lodepng_chunk_type_equals(chunk, "iTXt")) { - /*international text chunk (iTXt)*/ - if(state->decoder.read_text_chunks) { - state->error = readChunk_iTXt(&state->info_png, &state->decoder, data, chunkLength); - if(state->error) break; - } - } else if(lodepng_chunk_type_equals(chunk, "tIME")) { - state->error = readChunk_tIME(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "pHYs")) { - state->error = readChunk_pHYs(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "gAMA")) { - state->error = readChunk_gAMA(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "cHRM")) { - state->error = readChunk_cHRM(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "sRGB")) { - state->error = readChunk_sRGB(&state->info_png, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "iCCP")) { - state->error = readChunk_iCCP(&state->info_png, &state->decoder, data, chunkLength); - if(state->error) break; - } else if(lodepng_chunk_type_equals(chunk, "sBIT")) { - state->error = readChunk_sBIT(&state->info_png, data, chunkLength); - if(state->error) break; -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } else /*it's not an implemented chunk type, so ignore it: skip over the data*/ { - /*error: unknown critical chunk (5th bit of first byte of chunk type is 0)*/ - if(!state->decoder.ignore_critical && !lodepng_chunk_ancillary(chunk)) { - CERROR_BREAK(state->error, 69); - } - - unknown = 1; + /*background color chunk (bKGD)*/ + } else if (lodepng_chunk_type_equals(chunk, "bKGD")) { + state->error = readChunk_bKGD(&state->info_png, data, chunkLength); + if (state->error) + break; + } else if (lodepng_chunk_type_equals(chunk, "tEXt")) { + /*text chunk (tEXt)*/ + if (state->decoder.read_text_chunks) { + state->error = readChunk_tEXt(&state->info_png, data, chunkLength); + if (state->error) + break; + } + } else if (lodepng_chunk_type_equals(chunk, "zTXt")) { + /*compressed text chunk (zTXt)*/ + if (state->decoder.read_text_chunks) { + state->error = readChunk_zTXt(&state->info_png, &state->decoder, data, chunkLength); + if (state->error) + break; + } + } else if (lodepng_chunk_type_equals(chunk, "iTXt")) { + /*international text chunk (iTXt)*/ + if (state->decoder.read_text_chunks) { + state->error = readChunk_iTXt(&state->info_png, &state->decoder, data, chunkLength); + if (state->error) + break; + } + } else if (lodepng_chunk_type_equals(chunk, "tIME")) { + state->error = readChunk_tIME(&state->info_png, data, chunkLength); + if (state->error) + break; + } else if (lodepng_chunk_type_equals(chunk, "pHYs")) { + state->error = readChunk_pHYs(&state->info_png, data, chunkLength); + if (state->error) + break; + } else if (lodepng_chunk_type_equals(chunk, "gAMA")) { + state->error = readChunk_gAMA(&state->info_png, data, chunkLength); + if (state->error) + break; + } else if (lodepng_chunk_type_equals(chunk, "cHRM")) { + state->error = readChunk_cHRM(&state->info_png, data, chunkLength); + if (state->error) + break; + } else if (lodepng_chunk_type_equals(chunk, "sRGB")) { + state->error = readChunk_sRGB(&state->info_png, data, chunkLength); + if (state->error) + break; + } else if (lodepng_chunk_type_equals(chunk, "iCCP")) { + state->error = readChunk_iCCP(&state->info_png, &state->decoder, data, chunkLength); + if (state->error) + break; + } else if (lodepng_chunk_type_equals(chunk, "sBIT")) { + state->error = readChunk_sBIT(&state->info_png, data, chunkLength); + if (state->error) + break; +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + } else /*it's not an implemented chunk type, so ignore it: skip over the + data*/ + { + /*error: unknown critical chunk (5th bit of first byte of chunk type + * is 0)*/ + if (!state->decoder.ignore_critical && !lodepng_chunk_ancillary(chunk)) { + CERROR_BREAK(state->error, 69); + } + + unknown = 1; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(state->decoder.remember_unknown_chunks) { - state->error = lodepng_chunk_append(&state->info_png.unknown_chunks_data[critical_pos - 1], - &state->info_png.unknown_chunks_size[critical_pos - 1], chunk); - if(state->error) break; - } + if (state->decoder.remember_unknown_chunks) { + state->error = + lodepng_chunk_append(&state->info_png.unknown_chunks_data[critical_pos - 1], + &state->info_png.unknown_chunks_size[critical_pos - 1], chunk); + if (state->error) + break; + } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - } - - if(!state->decoder.ignore_crc && !unknown) /*check CRC if wanted, only on known chunk types*/ { - if(lodepng_chunk_check_crc(chunk)) CERROR_BREAK(state->error, 57); /*invalid CRC*/ - } - - if(!IEND) chunk = lodepng_chunk_next_const(chunk, in + insize); - } - - if(!state->error && state->info_png.color.colortype == LCT_PALETTE && !state->info_png.color.palette) { - state->error = 106; /* error: PNG file must have PLTE chunk if color type is palette */ - } - - if(!state->error) { - /*predict output size, to allocate exact size for output buffer to avoid more dynamic allocation. - If the decompressed size does not match the prediction, the image must be corrupt.*/ - if(state->info_png.interlace_method == 0) { - unsigned bpp = lodepng_get_bpp(&state->info_png.color); - expected_size = lodepng_get_raw_size_idat(*w, *h, bpp); - } else { - unsigned bpp = lodepng_get_bpp(&state->info_png.color); - /*Adam-7 interlaced: expected size is the sum of the 7 sub-images sizes*/ - expected_size = 0; - expected_size += lodepng_get_raw_size_idat((*w + 7) >> 3, (*h + 7) >> 3, bpp); - if(*w > 4) expected_size += lodepng_get_raw_size_idat((*w + 3) >> 3, (*h + 7) >> 3, bpp); - expected_size += lodepng_get_raw_size_idat((*w + 3) >> 2, (*h + 3) >> 3, bpp); - if(*w > 2) expected_size += lodepng_get_raw_size_idat((*w + 1) >> 2, (*h + 3) >> 2, bpp); - expected_size += lodepng_get_raw_size_idat((*w + 1) >> 1, (*h + 1) >> 2, bpp); - if(*w > 1) expected_size += lodepng_get_raw_size_idat((*w + 0) >> 1, (*h + 1) >> 1, bpp); - expected_size += lodepng_get_raw_size_idat((*w + 0), (*h + 0) >> 1, bpp); - } - - state->error = zlib_decompress(&scanlines, &scanlines_size, expected_size, idat, idatsize, &state->decoder.zlibsettings); - } - if(!state->error && scanlines_size != expected_size) state->error = 91; /*decompressed size doesn't match prediction*/ - lodepng_free(idat); - - if(!state->error) { - outsize = lodepng_get_raw_size(*w, *h, &state->info_png.color); - *out = (unsigned char*)lodepng_malloc(outsize); - if(!*out) state->error = 83; /*alloc fail*/ - } - if(!state->error) { - lodepng_memset(*out, 0, outsize); - state->error = postProcessScanlines(*out, scanlines, *w, *h, &state->info_png); - } - lodepng_free(scanlines); -} - -unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize) { - *out = 0; - decodeGeneric(out, w, h, state, in, insize); - if(state->error) return state->error; - if(!state->decoder.color_convert || lodepng_color_mode_equal(&state->info_raw, &state->info_png.color)) { - /*same color type, no copying or converting of data needed*/ - /*store the info_png color settings on the info_raw so that the info_raw still reflects what colortype - the raw image has to the end user*/ - if(!state->decoder.color_convert) { - state->error = lodepng_color_mode_copy(&state->info_raw, &state->info_png.color); - if(state->error) return state->error; - } - } else { /*color conversion needed*/ - unsigned char* data = *out; - size_t outsize; - - /*TODO: check if this works according to the statement in the documentation: "The converter can convert - from grayscale input color type, to 8-bit grayscale or grayscale with alpha"*/ - if(!(state->info_raw.colortype == LCT_RGB || state->info_raw.colortype == LCT_RGBA) - && !(state->info_raw.bitdepth == 8)) { - return 56; /*unsupported color mode conversion*/ - } - - outsize = lodepng_get_raw_size(*w, *h, &state->info_raw); - *out = (unsigned char*)lodepng_malloc(outsize); - if(!(*out)) { - state->error = 83; /*alloc fail*/ - } - else state->error = lodepng_convert(*out, data, &state->info_raw, - &state->info_png.color, *w, *h); - lodepng_free(data); - } - return state->error; -} - -unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, - size_t insize, LodePNGColorType colortype, unsigned bitdepth) { - unsigned error; - LodePNGState state; - lodepng_state_init(&state); - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; + } + + if (!state->decoder.ignore_crc && + !unknown) /*check CRC if wanted, only on known chunk types*/ { + if (lodepng_chunk_check_crc(chunk)) + CERROR_BREAK(state->error, 57); /*invalid CRC*/ + } + + if (!IEND) + chunk = lodepng_chunk_next_const(chunk, in + insize); + } + + if (!state->error && state->info_png.color.colortype == LCT_PALETTE && + !state->info_png.color.palette) { + state->error = 106; /* error: PNG file must have PLTE chunk if color + type is palette */ + } + + if (!state->error) { + /*predict output size, to allocate exact size for output buffer to avoid + more dynamic allocation. If the decompressed size does not match the + prediction, the image must be corrupt.*/ + if (state->info_png.interlace_method == 0) { + unsigned bpp = lodepng_get_bpp(&state->info_png.color); + expected_size = lodepng_get_raw_size_idat(*w, *h, bpp); + } else { + unsigned bpp = lodepng_get_bpp(&state->info_png.color); + /*Adam-7 interlaced: expected size is the sum of the 7 sub-images + * sizes*/ + expected_size = 0; + expected_size += lodepng_get_raw_size_idat((*w + 7) >> 3, (*h + 7) >> 3, bpp); + if (*w > 4) + expected_size += lodepng_get_raw_size_idat((*w + 3) >> 3, (*h + 7) >> 3, bpp); + expected_size += lodepng_get_raw_size_idat((*w + 3) >> 2, (*h + 3) >> 3, bpp); + if (*w > 2) + expected_size += lodepng_get_raw_size_idat((*w + 1) >> 2, (*h + 3) >> 2, bpp); + expected_size += lodepng_get_raw_size_idat((*w + 1) >> 1, (*h + 1) >> 2, bpp); + if (*w > 1) + expected_size += lodepng_get_raw_size_idat((*w + 0) >> 1, (*h + 1) >> 1, bpp); + expected_size += lodepng_get_raw_size_idat((*w + 0), (*h + 0) >> 1, bpp); + } + + state->error = zlib_decompress(&scanlines, &scanlines_size, expected_size, idat, idatsize, + &state->decoder.zlibsettings); + } + if (!state->error && scanlines_size != expected_size) + state->error = 91; /*decompressed size doesn't match prediction*/ + lodepng_free(idat); + + if (!state->error) { + outsize = lodepng_get_raw_size(*w, *h, &state->info_png.color); + *out = (unsigned char *)lodepng_malloc(outsize); + if (!*out) + state->error = 83; /*alloc fail*/ + } + if (!state->error) { + lodepng_memset(*out, 0, outsize); + state->error = postProcessScanlines(*out, scanlines, *w, *h, &state->info_png); + } + lodepng_free(scanlines); +} + +unsigned lodepng_decode(unsigned char **out, unsigned *w, unsigned *h, LodePNGState *state, + const unsigned char *in, size_t insize) { + *out = 0; + decodeGeneric(out, w, h, state, in, insize); + if (state->error) + return state->error; + if (!state->decoder.color_convert || + lodepng_color_mode_equal(&state->info_raw, &state->info_png.color)) { + /*same color type, no copying or converting of data needed*/ + /*store the info_png color settings on the info_raw so that the info_raw + still reflects what colortype the raw image has to the end user*/ + if (!state->decoder.color_convert) { + state->error = lodepng_color_mode_copy(&state->info_raw, &state->info_png.color); + if (state->error) + return state->error; + } + } else { /*color conversion needed*/ + unsigned char *data = *out; + size_t outsize; + + /*TODO: check if this works according to the statement in the + documentation: "The converter can convert from grayscale input color + type, to 8-bit grayscale or grayscale with alpha"*/ + if (!(state->info_raw.colortype == LCT_RGB || state->info_raw.colortype == LCT_RGBA) && + !(state->info_raw.bitdepth == 8)) { + return 56; /*unsupported color mode conversion*/ + } + + outsize = lodepng_get_raw_size(*w, *h, &state->info_raw); + *out = (unsigned char *)lodepng_malloc(outsize); + if (!(*out)) { + state->error = 83; /*alloc fail*/ + } else + state->error = + lodepng_convert(*out, data, &state->info_raw, &state->info_png.color, *w, *h); + lodepng_free(data); + } + return state->error; +} + +unsigned lodepng_decode_memory(unsigned char **out, unsigned *w, unsigned *h, + const unsigned char *in, size_t insize, LodePNGColorType colortype, unsigned bitdepth) { + unsigned error; + LodePNGState state; + lodepng_state_init(&state); + state.info_raw.colortype = colortype; + state.info_raw.bitdepth = bitdepth; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*disable reading things that this function doesn't output*/ - state.decoder.read_text_chunks = 0; - state.decoder.remember_unknown_chunks = 0; + /*disable reading things that this function doesn't output*/ + state.decoder.read_text_chunks = 0; + state.decoder.remember_unknown_chunks = 0; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - error = lodepng_decode(out, w, h, &state, in, insize); - lodepng_state_cleanup(&state); - return error; + error = lodepng_decode(out, w, h, &state, in, insize); + lodepng_state_cleanup(&state); + return error; } -unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) { - return lodepng_decode_memory(out, w, h, in, insize, LCT_RGBA, 8); +unsigned lodepng_decode32( + unsigned char **out, unsigned *w, unsigned *h, const unsigned char *in, size_t insize) { + return lodepng_decode_memory(out, w, h, in, insize, LCT_RGBA, 8); } -unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) { - return lodepng_decode_memory(out, w, h, in, insize, LCT_RGB, 8); +unsigned lodepng_decode24( + unsigned char **out, unsigned *w, unsigned *h, const unsigned char *in, size_t insize) { + return lodepng_decode_memory(out, w, h, in, insize, LCT_RGB, 8); } #ifdef LODEPNG_COMPILE_DISK -unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename, - LodePNGColorType colortype, unsigned bitdepth) { - unsigned char* buffer = 0; - size_t buffersize; - unsigned error; - /* safe output values in case error happens */ - *out = 0; - *w = *h = 0; - error = lodepng_load_file(&buffer, &buffersize, filename); - if(!error) error = lodepng_decode_memory(out, w, h, buffer, buffersize, colortype, bitdepth); - lodepng_free(buffer); - return error; -} - -unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) { - return lodepng_decode_file(out, w, h, filename, LCT_RGBA, 8); -} - -unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) { - return lodepng_decode_file(out, w, h, filename, LCT_RGB, 8); +unsigned lodepng_decode_file(unsigned char **out, unsigned *w, unsigned *h, const char *filename, + LodePNGColorType colortype, unsigned bitdepth) { + unsigned char *buffer = 0; + size_t buffersize; + unsigned error; + /* safe output values in case error happens */ + *out = 0; + *w = *h = 0; + error = lodepng_load_file(&buffer, &buffersize, filename); + if (!error) + error = lodepng_decode_memory(out, w, h, buffer, buffersize, colortype, bitdepth); + lodepng_free(buffer); + return error; +} + +unsigned lodepng_decode32_file( + unsigned char **out, unsigned *w, unsigned *h, const char *filename) { + return lodepng_decode_file(out, w, h, filename, LCT_RGBA, 8); +} + +unsigned lodepng_decode24_file( + unsigned char **out, unsigned *w, unsigned *h, const char *filename) { + return lodepng_decode_file(out, w, h, filename, LCT_RGB, 8); } #endif /*LODEPNG_COMPILE_DISK*/ -void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings) { - settings->color_convert = 1; +void lodepng_decoder_settings_init(LodePNGDecoderSettings *settings) { + settings->color_convert = 1; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - settings->read_text_chunks = 1; - settings->remember_unknown_chunks = 0; - settings->max_text_size = 16777216; - settings->max_icc_size = 16777216; /* 16MB is much more than enough for any reasonable ICC profile */ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - settings->ignore_crc = 0; - settings->ignore_critical = 0; - settings->ignore_end = 0; - lodepng_decompress_settings_init(&settings->zlibsettings); + settings->read_text_chunks = 1; + settings->remember_unknown_chunks = 0; + settings->max_text_size = 16777216; + settings->max_icc_size = 16777216; /* 16MB is much more than enough for any + reasonable ICC profile */ +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + settings->ignore_crc = 0; + settings->ignore_critical = 0; + settings->ignore_end = 0; + lodepng_decompress_settings_init(&settings->zlibsettings); } #endif /*LODEPNG_COMPILE_DECODER*/ #if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) -void lodepng_state_init(LodePNGState* state) { +void lodepng_state_init(LodePNGState *state) { #ifdef LODEPNG_COMPILE_DECODER - lodepng_decoder_settings_init(&state->decoder); + lodepng_decoder_settings_init(&state->decoder); #endif /*LODEPNG_COMPILE_DECODER*/ #ifdef LODEPNG_COMPILE_ENCODER - lodepng_encoder_settings_init(&state->encoder); + lodepng_encoder_settings_init(&state->encoder); #endif /*LODEPNG_COMPILE_ENCODER*/ - lodepng_color_mode_init(&state->info_raw); - lodepng_info_init(&state->info_png); - state->error = 1; + lodepng_color_mode_init(&state->info_raw); + lodepng_info_init(&state->info_png); + state->error = 1; } -void lodepng_state_cleanup(LodePNGState* state) { - lodepng_color_mode_cleanup(&state->info_raw); - lodepng_info_cleanup(&state->info_png); +void lodepng_state_cleanup(LodePNGState *state) { + lodepng_color_mode_cleanup(&state->info_raw); + lodepng_info_cleanup(&state->info_png); } -void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source) { - lodepng_state_cleanup(dest); - *dest = *source; - lodepng_color_mode_init(&dest->info_raw); - lodepng_info_init(&dest->info_png); - dest->error = lodepng_color_mode_copy(&dest->info_raw, &source->info_raw); if(dest->error) return; - dest->error = lodepng_info_copy(&dest->info_png, &source->info_png); if(dest->error) return; +void lodepng_state_copy(LodePNGState *dest, const LodePNGState *source) { + lodepng_state_cleanup(dest); + *dest = *source; + lodepng_color_mode_init(&dest->info_raw); + lodepng_info_init(&dest->info_png); + dest->error = lodepng_color_mode_copy(&dest->info_raw, &source->info_raw); + if (dest->error) + return; + dest->error = lodepng_info_copy(&dest->info_png, &source->info_png); + if (dest->error) + return; } -#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */ +#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) \ + */ #ifdef LODEPNG_COMPILE_ENCODER @@ -5497,612 +6270,695 @@ void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source) { /* / PNG Encoder / */ /* ////////////////////////////////////////////////////////////////////////// */ - -static unsigned writeSignature(ucvector* out) { - size_t pos = out->size; - const unsigned char signature[] = {137, 80, 78, 71, 13, 10, 26, 10}; - /*8 bytes PNG signature, aka the magic bytes*/ - if(!ucvector_resize(out, out->size + 8)) return 83; /*alloc fail*/ - lodepng_memcpy(out->data + pos, signature, 8); - return 0; +static unsigned writeSignature(ucvector *out) { + size_t pos = out->size; + const unsigned char signature[] = {137, 80, 78, 71, 13, 10, 26, 10}; + /*8 bytes PNG signature, aka the magic bytes*/ + if (!ucvector_resize(out, out->size + 8)) + return 83; /*alloc fail*/ + lodepng_memcpy(out->data + pos, signature, 8); + return 0; } -static unsigned addChunk_IHDR(ucvector* out, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth, unsigned interlace_method) { - unsigned char *chunk, *data; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 13, "IHDR")); - data = chunk + 8; +static unsigned addChunk_IHDR(ucvector *out, unsigned w, unsigned h, LodePNGColorType colortype, + unsigned bitdepth, unsigned interlace_method) { + unsigned char *chunk, *data; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 13, "IHDR")); + data = chunk + 8; - lodepng_set32bitInt(data + 0, w); /*width*/ - lodepng_set32bitInt(data + 4, h); /*height*/ - data[8] = (unsigned char)bitdepth; /*bit depth*/ - data[9] = (unsigned char)colortype; /*color type*/ - data[10] = 0; /*compression method*/ - data[11] = 0; /*filter method*/ - data[12] = interlace_method; /*interlace method*/ + lodepng_set32bitInt(data + 0, w); /*width*/ + lodepng_set32bitInt(data + 4, h); /*height*/ + data[8] = (unsigned char)bitdepth; /*bit depth*/ + data[9] = (unsigned char)colortype; /*color type*/ + data[10] = 0; /*compression method*/ + data[11] = 0; /*filter method*/ + data[12] = interlace_method; /*interlace method*/ - lodepng_chunk_generate_crc(chunk); - return 0; + lodepng_chunk_generate_crc(chunk); + return 0; } /* only adds the chunk if needed (there is a key or palette with alpha) */ -static unsigned addChunk_PLTE(ucvector* out, const LodePNGColorMode* info) { - unsigned char* chunk; - size_t i, j = 8; - - if(info->palettesize == 0 || info->palettesize > 256) { - return 68; /*invalid palette size, it is only allowed to be 1-256*/ - } - - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, info->palettesize * 3, "PLTE")); - - for(i = 0; i != info->palettesize; ++i) { - /*add all channels except alpha channel*/ - chunk[j++] = info->palette[i * 4 + 0]; - chunk[j++] = info->palette[i * 4 + 1]; - chunk[j++] = info->palette[i * 4 + 2]; - } - - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_tRNS(ucvector* out, const LodePNGColorMode* info) { - unsigned char* chunk = 0; - - if(info->colortype == LCT_PALETTE) { - size_t i, amount = info->palettesize; - /*the tail of palette values that all have 255 as alpha, does not have to be encoded*/ - for(i = info->palettesize; i != 0; --i) { - if(info->palette[4 * (i - 1) + 3] != 255) break; - --amount; - } - if(amount) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, amount, "tRNS")); - /*add the alpha channel values from the palette*/ - for(i = 0; i != amount; ++i) chunk[8 + i] = info->palette[4 * i + 3]; - } - } else if(info->colortype == LCT_GREY) { - if(info->key_defined) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "tRNS")); - chunk[8] = (unsigned char)(info->key_r >> 8); - chunk[9] = (unsigned char)(info->key_r & 255); - } - } else if(info->colortype == LCT_RGB) { - if(info->key_defined) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "tRNS")); - chunk[8] = (unsigned char)(info->key_r >> 8); - chunk[9] = (unsigned char)(info->key_r & 255); - chunk[10] = (unsigned char)(info->key_g >> 8); - chunk[11] = (unsigned char)(info->key_g & 255); - chunk[12] = (unsigned char)(info->key_b >> 8); - chunk[13] = (unsigned char)(info->key_b & 255); - } - } - - if(chunk) lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_IDAT(ucvector* out, const unsigned char* data, size_t datasize, - LodePNGCompressSettings* zlibsettings) { - unsigned error = 0; - unsigned char* zlib = 0; - size_t zlibsize = 0; - - error = zlib_compress(&zlib, &zlibsize, data, datasize, zlibsettings); - if(!error) { - error = lodepng_chunk_createv(out, zlibsize, "IDAT", zlib); - } - lodepng_free(zlib); - return error; -} - -static unsigned addChunk_IEND(ucvector* out) { - return lodepng_chunk_createv(out, 0, "IEND", 0); -} +static unsigned addChunk_PLTE(ucvector *out, const LodePNGColorMode *info) { + unsigned char *chunk; + size_t i, j = 8; + + if (info->palettesize == 0 || info->palettesize > 256) { + return 68; /*invalid palette size, it is only allowed to be 1-256*/ + } + + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, info->palettesize * 3, "PLTE")); + + for (i = 0; i != info->palettesize; ++i) { + /*add all channels except alpha channel*/ + chunk[j++] = info->palette[i * 4 + 0]; + chunk[j++] = info->palette[i * 4 + 1]; + chunk[j++] = info->palette[i * 4 + 2]; + } + + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_tRNS(ucvector *out, const LodePNGColorMode *info) { + unsigned char *chunk = 0; + + if (info->colortype == LCT_PALETTE) { + size_t i, amount = info->palettesize; + /*the tail of palette values that all have 255 as alpha, does not have + * to be encoded*/ + for (i = info->palettesize; i != 0; --i) { + if (info->palette[4 * (i - 1) + 3] != 255) + break; + --amount; + } + if (amount) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, amount, "tRNS")); + /*add the alpha channel values from the palette*/ + for (i = 0; i != amount; ++i) + chunk[8 + i] = info->palette[4 * i + 3]; + } + } else if (info->colortype == LCT_GREY) { + if (info->key_defined) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "tRNS")); + chunk[8] = (unsigned char)(info->key_r >> 8); + chunk[9] = (unsigned char)(info->key_r & 255); + } + } else if (info->colortype == LCT_RGB) { + if (info->key_defined) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "tRNS")); + chunk[8] = (unsigned char)(info->key_r >> 8); + chunk[9] = (unsigned char)(info->key_r & 255); + chunk[10] = (unsigned char)(info->key_g >> 8); + chunk[11] = (unsigned char)(info->key_g & 255); + chunk[12] = (unsigned char)(info->key_b >> 8); + chunk[13] = (unsigned char)(info->key_b & 255); + } + } + + if (chunk) + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_IDAT(ucvector *out, const unsigned char *data, size_t datasize, + LodePNGCompressSettings *zlibsettings) { + unsigned error = 0; + unsigned char *zlib = 0; + size_t zlibsize = 0; + + error = zlib_compress(&zlib, &zlibsize, data, datasize, zlibsettings); + if (!error) { + error = lodepng_chunk_createv(out, zlibsize, "IDAT", zlib); + } + lodepng_free(zlib); + return error; +} + +static unsigned addChunk_IEND(ucvector *out) { return lodepng_chunk_createv(out, 0, "IEND", 0); } #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -static unsigned addChunk_tEXt(ucvector* out, const char* keyword, const char* textstring) { - unsigned char* chunk = 0; - size_t keysize = lodepng_strlen(keyword), textsize = lodepng_strlen(textstring); - size_t size = keysize + 1 + textsize; - if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, size, "tEXt")); - lodepng_memcpy(chunk + 8, keyword, keysize); - chunk[8 + keysize] = 0; /*null termination char*/ - lodepng_memcpy(chunk + 9 + keysize, textstring, textsize); - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_zTXt(ucvector* out, const char* keyword, const char* textstring, - LodePNGCompressSettings* zlibsettings) { - unsigned error = 0; - unsigned char* chunk = 0; - unsigned char* compressed = 0; - size_t compressedsize = 0; - size_t textsize = lodepng_strlen(textstring); - size_t keysize = lodepng_strlen(keyword); - if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ - - error = zlib_compress(&compressed, &compressedsize, - (const unsigned char*)textstring, textsize, zlibsettings); - if(!error) { - size_t size = keysize + 2 + compressedsize; - error = lodepng_chunk_init(&chunk, out, size, "zTXt"); - } - if(!error) { - lodepng_memcpy(chunk + 8, keyword, keysize); - chunk[8 + keysize] = 0; /*null termination char*/ - chunk[9 + keysize] = 0; /*compression method: 0*/ - lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize); - lodepng_chunk_generate_crc(chunk); - } - - lodepng_free(compressed); - return error; -} - -static unsigned addChunk_iTXt(ucvector* out, unsigned compress, const char* keyword, const char* langtag, - const char* transkey, const char* textstring, LodePNGCompressSettings* zlibsettings) { - unsigned error = 0; - unsigned char* chunk = 0; - unsigned char* compressed = 0; - size_t compressedsize = 0; - size_t textsize = lodepng_strlen(textstring); - size_t keysize = lodepng_strlen(keyword), langsize = lodepng_strlen(langtag), transsize = lodepng_strlen(transkey); - - if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ - - if(compress) { - error = zlib_compress(&compressed, &compressedsize, - (const unsigned char*)textstring, textsize, zlibsettings); - } - if(!error) { - size_t size = keysize + 3 + langsize + 1 + transsize + 1 + (compress ? compressedsize : textsize); - error = lodepng_chunk_init(&chunk, out, size, "iTXt"); - } - if(!error) { - size_t pos = 8; - lodepng_memcpy(chunk + pos, keyword, keysize); - pos += keysize; - chunk[pos++] = 0; /*null termination char*/ - chunk[pos++] = (compress ? 1 : 0); /*compression flag*/ - chunk[pos++] = 0; /*compression method: 0*/ - lodepng_memcpy(chunk + pos, langtag, langsize); - pos += langsize; - chunk[pos++] = 0; /*null termination char*/ - lodepng_memcpy(chunk + pos, transkey, transsize); - pos += transsize; - chunk[pos++] = 0; /*null termination char*/ - if(compress) { - lodepng_memcpy(chunk + pos, compressed, compressedsize); - } else { - lodepng_memcpy(chunk + pos, textstring, textsize); - } - lodepng_chunk_generate_crc(chunk); - } - - lodepng_free(compressed); - return error; -} - -static unsigned addChunk_bKGD(ucvector* out, const LodePNGInfo* info) { - unsigned char* chunk = 0; - if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "bKGD")); - chunk[8] = (unsigned char)(info->background_r >> 8); - chunk[9] = (unsigned char)(info->background_r & 255); - } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "bKGD")); - chunk[8] = (unsigned char)(info->background_r >> 8); - chunk[9] = (unsigned char)(info->background_r & 255); - chunk[10] = (unsigned char)(info->background_g >> 8); - chunk[11] = (unsigned char)(info->background_g & 255); - chunk[12] = (unsigned char)(info->background_b >> 8); - chunk[13] = (unsigned char)(info->background_b & 255); - } else if(info->color.colortype == LCT_PALETTE) { - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 1, "bKGD")); - chunk[8] = (unsigned char)(info->background_r & 255); /*palette index*/ - } - if(chunk) lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_tIME(ucvector* out, const LodePNGTime* time) { - unsigned char* chunk; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 7, "tIME")); - chunk[8] = (unsigned char)(time->year >> 8); - chunk[9] = (unsigned char)(time->year & 255); - chunk[10] = (unsigned char)time->month; - chunk[11] = (unsigned char)time->day; - chunk[12] = (unsigned char)time->hour; - chunk[13] = (unsigned char)time->minute; - chunk[14] = (unsigned char)time->second; - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_pHYs(ucvector* out, const LodePNGInfo* info) { - unsigned char* chunk; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 9, "pHYs")); - lodepng_set32bitInt(chunk + 8, info->phys_x); - lodepng_set32bitInt(chunk + 12, info->phys_y); - chunk[16] = info->phys_unit; - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_gAMA(ucvector* out, const LodePNGInfo* info) { - unsigned char* chunk; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 4, "gAMA")); - lodepng_set32bitInt(chunk + 8, info->gama_gamma); - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_cHRM(ucvector* out, const LodePNGInfo* info) { - unsigned char* chunk; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 32, "cHRM")); - lodepng_set32bitInt(chunk + 8, info->chrm_white_x); - lodepng_set32bitInt(chunk + 12, info->chrm_white_y); - lodepng_set32bitInt(chunk + 16, info->chrm_red_x); - lodepng_set32bitInt(chunk + 20, info->chrm_red_y); - lodepng_set32bitInt(chunk + 24, info->chrm_green_x); - lodepng_set32bitInt(chunk + 28, info->chrm_green_y); - lodepng_set32bitInt(chunk + 32, info->chrm_blue_x); - lodepng_set32bitInt(chunk + 36, info->chrm_blue_y); - lodepng_chunk_generate_crc(chunk); - return 0; -} - -static unsigned addChunk_sRGB(ucvector* out, const LodePNGInfo* info) { - unsigned char data = info->srgb_intent; - return lodepng_chunk_createv(out, 1, "sRGB", &data); -} - -static unsigned addChunk_iCCP(ucvector* out, const LodePNGInfo* info, LodePNGCompressSettings* zlibsettings) { - unsigned error = 0; - unsigned char* chunk = 0; - unsigned char* compressed = 0; - size_t compressedsize = 0; - size_t keysize = lodepng_strlen(info->iccp_name); - - if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/ - error = zlib_compress(&compressed, &compressedsize, - info->iccp_profile, info->iccp_profile_size, zlibsettings); - if(!error) { - size_t size = keysize + 2 + compressedsize; - error = lodepng_chunk_init(&chunk, out, size, "iCCP"); - } - if(!error) { - lodepng_memcpy(chunk + 8, info->iccp_name, keysize); - chunk[8 + keysize] = 0; /*null termination char*/ - chunk[9 + keysize] = 0; /*compression method: 0*/ - lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize); - lodepng_chunk_generate_crc(chunk); - } - - lodepng_free(compressed); - return error; -} - -static unsigned addChunk_sBIT(ucvector* out, const LodePNGInfo* info) { - unsigned bitdepth = (info->color.colortype == LCT_PALETTE) ? 8 : info->color.bitdepth; - unsigned char* chunk = 0; - if(info->color.colortype == LCT_GREY) { - if(info->sbit_r == 0 || info->sbit_r > bitdepth) return 115; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 1, "sBIT")); - chunk[8] = info->sbit_r; - } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_PALETTE) { - if(info->sbit_r == 0 || info->sbit_g == 0 || info->sbit_b == 0) return 115; - if(info->sbit_r > bitdepth || info->sbit_g > bitdepth || info->sbit_b > bitdepth) return 115; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 3, "sBIT")); - chunk[8] = info->sbit_r; - chunk[9] = info->sbit_g; - chunk[10] = info->sbit_b; - } else if(info->color.colortype == LCT_GREY_ALPHA) { - if(info->sbit_r == 0 || info->sbit_a == 0) return 115; - if(info->sbit_r > bitdepth || info->sbit_a > bitdepth) return 115; - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "sBIT")); - chunk[8] = info->sbit_r; - chunk[9] = info->sbit_a; - } else if(info->color.colortype == LCT_RGBA) { - if(info->sbit_r == 0 || info->sbit_g == 0 || info->sbit_b == 0 || info->sbit_a == 0 || - info->sbit_r > bitdepth || info->sbit_g > bitdepth || - info->sbit_b > bitdepth || info->sbit_a > bitdepth) { - return 115; - } - CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 4, "sBIT")); - chunk[8] = info->sbit_r; - chunk[9] = info->sbit_g; - chunk[10] = info->sbit_b; - chunk[11] = info->sbit_a; - } - if(chunk) lodepng_chunk_generate_crc(chunk); - return 0; +static unsigned addChunk_tEXt(ucvector *out, const char *keyword, const char *textstring) { + unsigned char *chunk = 0; + size_t keysize = lodepng_strlen(keyword), textsize = lodepng_strlen(textstring); + size_t size = keysize + 1 + textsize; + if (keysize < 1 || keysize > 79) + return 89; /*error: invalid keyword size*/ + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, size, "tEXt")); + lodepng_memcpy(chunk + 8, keyword, keysize); + chunk[8 + keysize] = 0; /*null termination char*/ + lodepng_memcpy(chunk + 9 + keysize, textstring, textsize); + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_zTXt(ucvector *out, const char *keyword, const char *textstring, + LodePNGCompressSettings *zlibsettings) { + unsigned error = 0; + unsigned char *chunk = 0; + unsigned char *compressed = 0; + size_t compressedsize = 0; + size_t textsize = lodepng_strlen(textstring); + size_t keysize = lodepng_strlen(keyword); + if (keysize < 1 || keysize > 79) + return 89; /*error: invalid keyword size*/ + + error = zlib_compress( + &compressed, &compressedsize, (const unsigned char *)textstring, textsize, zlibsettings); + if (!error) { + size_t size = keysize + 2 + compressedsize; + error = lodepng_chunk_init(&chunk, out, size, "zTXt"); + } + if (!error) { + lodepng_memcpy(chunk + 8, keyword, keysize); + chunk[8 + keysize] = 0; /*null termination char*/ + chunk[9 + keysize] = 0; /*compression method: 0*/ + lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize); + lodepng_chunk_generate_crc(chunk); + } + + lodepng_free(compressed); + return error; +} + +static unsigned addChunk_iTXt(ucvector *out, unsigned compress, const char *keyword, + const char *langtag, const char *transkey, const char *textstring, + LodePNGCompressSettings *zlibsettings) { + unsigned error = 0; + unsigned char *chunk = 0; + unsigned char *compressed = 0; + size_t compressedsize = 0; + size_t textsize = lodepng_strlen(textstring); + size_t keysize = lodepng_strlen(keyword), langsize = lodepng_strlen(langtag), + transsize = lodepng_strlen(transkey); + + if (keysize < 1 || keysize > 79) + return 89; /*error: invalid keyword size*/ + + if (compress) { + error = zlib_compress(&compressed, &compressedsize, (const unsigned char *)textstring, + textsize, zlibsettings); + } + if (!error) { + size_t size = + keysize + 3 + langsize + 1 + transsize + 1 + (compress ? compressedsize : textsize); + error = lodepng_chunk_init(&chunk, out, size, "iTXt"); + } + if (!error) { + size_t pos = 8; + lodepng_memcpy(chunk + pos, keyword, keysize); + pos += keysize; + chunk[pos++] = 0; /*null termination char*/ + chunk[pos++] = (compress ? 1 : 0); /*compression flag*/ + chunk[pos++] = 0; /*compression method: 0*/ + lodepng_memcpy(chunk + pos, langtag, langsize); + pos += langsize; + chunk[pos++] = 0; /*null termination char*/ + lodepng_memcpy(chunk + pos, transkey, transsize); + pos += transsize; + chunk[pos++] = 0; /*null termination char*/ + if (compress) { + lodepng_memcpy(chunk + pos, compressed, compressedsize); + } else { + lodepng_memcpy(chunk + pos, textstring, textsize); + } + lodepng_chunk_generate_crc(chunk); + } + + lodepng_free(compressed); + return error; +} + +static unsigned addChunk_bKGD(ucvector *out, const LodePNGInfo *info) { + unsigned char *chunk = 0; + if (info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "bKGD")); + chunk[8] = (unsigned char)(info->background_r >> 8); + chunk[9] = (unsigned char)(info->background_r & 255); + } else if (info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "bKGD")); + chunk[8] = (unsigned char)(info->background_r >> 8); + chunk[9] = (unsigned char)(info->background_r & 255); + chunk[10] = (unsigned char)(info->background_g >> 8); + chunk[11] = (unsigned char)(info->background_g & 255); + chunk[12] = (unsigned char)(info->background_b >> 8); + chunk[13] = (unsigned char)(info->background_b & 255); + } else if (info->color.colortype == LCT_PALETTE) { + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 1, "bKGD")); + chunk[8] = (unsigned char)(info->background_r & 255); /*palette index*/ + } + if (chunk) + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_tIME(ucvector *out, const LodePNGTime *time) { + unsigned char *chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 7, "tIME")); + chunk[8] = (unsigned char)(time->year >> 8); + chunk[9] = (unsigned char)(time->year & 255); + chunk[10] = (unsigned char)time->month; + chunk[11] = (unsigned char)time->day; + chunk[12] = (unsigned char)time->hour; + chunk[13] = (unsigned char)time->minute; + chunk[14] = (unsigned char)time->second; + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_pHYs(ucvector *out, const LodePNGInfo *info) { + unsigned char *chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 9, "pHYs")); + lodepng_set32bitInt(chunk + 8, info->phys_x); + lodepng_set32bitInt(chunk + 12, info->phys_y); + chunk[16] = info->phys_unit; + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_gAMA(ucvector *out, const LodePNGInfo *info) { + unsigned char *chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 4, "gAMA")); + lodepng_set32bitInt(chunk + 8, info->gama_gamma); + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_cHRM(ucvector *out, const LodePNGInfo *info) { + unsigned char *chunk; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 32, "cHRM")); + lodepng_set32bitInt(chunk + 8, info->chrm_white_x); + lodepng_set32bitInt(chunk + 12, info->chrm_white_y); + lodepng_set32bitInt(chunk + 16, info->chrm_red_x); + lodepng_set32bitInt(chunk + 20, info->chrm_red_y); + lodepng_set32bitInt(chunk + 24, info->chrm_green_x); + lodepng_set32bitInt(chunk + 28, info->chrm_green_y); + lodepng_set32bitInt(chunk + 32, info->chrm_blue_x); + lodepng_set32bitInt(chunk + 36, info->chrm_blue_y); + lodepng_chunk_generate_crc(chunk); + return 0; +} + +static unsigned addChunk_sRGB(ucvector *out, const LodePNGInfo *info) { + unsigned char data = info->srgb_intent; + return lodepng_chunk_createv(out, 1, "sRGB", &data); +} + +static unsigned addChunk_iCCP( + ucvector *out, const LodePNGInfo *info, LodePNGCompressSettings *zlibsettings) { + unsigned error = 0; + unsigned char *chunk = 0; + unsigned char *compressed = 0; + size_t compressedsize = 0; + size_t keysize = lodepng_strlen(info->iccp_name); + + if (keysize < 1 || keysize > 79) + return 89; /*error: invalid keyword size*/ + error = zlib_compress( + &compressed, &compressedsize, info->iccp_profile, info->iccp_profile_size, zlibsettings); + if (!error) { + size_t size = keysize + 2 + compressedsize; + error = lodepng_chunk_init(&chunk, out, size, "iCCP"); + } + if (!error) { + lodepng_memcpy(chunk + 8, info->iccp_name, keysize); + chunk[8 + keysize] = 0; /*null termination char*/ + chunk[9 + keysize] = 0; /*compression method: 0*/ + lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize); + lodepng_chunk_generate_crc(chunk); + } + + lodepng_free(compressed); + return error; +} + +static unsigned addChunk_sBIT(ucvector *out, const LodePNGInfo *info) { + unsigned bitdepth = (info->color.colortype == LCT_PALETTE) ? 8 : info->color.bitdepth; + unsigned char *chunk = 0; + if (info->color.colortype == LCT_GREY) { + if (info->sbit_r == 0 || info->sbit_r > bitdepth) + return 115; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 1, "sBIT")); + chunk[8] = info->sbit_r; + } else if (info->color.colortype == LCT_RGB || info->color.colortype == LCT_PALETTE) { + if (info->sbit_r == 0 || info->sbit_g == 0 || info->sbit_b == 0) + return 115; + if (info->sbit_r > bitdepth || info->sbit_g > bitdepth || info->sbit_b > bitdepth) + return 115; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 3, "sBIT")); + chunk[8] = info->sbit_r; + chunk[9] = info->sbit_g; + chunk[10] = info->sbit_b; + } else if (info->color.colortype == LCT_GREY_ALPHA) { + if (info->sbit_r == 0 || info->sbit_a == 0) + return 115; + if (info->sbit_r > bitdepth || info->sbit_a > bitdepth) + return 115; + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "sBIT")); + chunk[8] = info->sbit_r; + chunk[9] = info->sbit_a; + } else if (info->color.colortype == LCT_RGBA) { + if (info->sbit_r == 0 || info->sbit_g == 0 || info->sbit_b == 0 || info->sbit_a == 0 || + info->sbit_r > bitdepth || info->sbit_g > bitdepth || info->sbit_b > bitdepth || + info->sbit_a > bitdepth) { + return 115; + } + CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 4, "sBIT")); + chunk[8] = info->sbit_r; + chunk[9] = info->sbit_g; + chunk[10] = info->sbit_b; + chunk[11] = info->sbit_a; + } + if (chunk) + lodepng_chunk_generate_crc(chunk); + return 0; } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -static void filterScanline(unsigned char* out, const unsigned char* scanline, const unsigned char* prevline, - size_t length, size_t bytewidth, unsigned char filterType) { - size_t i; - switch(filterType) { - case 0: /*None*/ - for(i = 0; i != length; ++i) out[i] = scanline[i]; - break; - case 1: /*Sub*/ - for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; - for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - scanline[i - bytewidth]; - break; - case 2: /*Up*/ - if(prevline) { - for(i = 0; i != length; ++i) out[i] = scanline[i] - prevline[i]; - } else { - for(i = 0; i != length; ++i) out[i] = scanline[i]; - } - break; - case 3: /*Average*/ - if(prevline) { - for(i = 0; i != bytewidth; ++i) out[i] = scanline[i] - (prevline[i] >> 1); - for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - ((scanline[i - bytewidth] + prevline[i]) >> 1); - } else { - for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; - for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - (scanline[i - bytewidth] >> 1); - } - break; - case 4: /*Paeth*/ - if(prevline) { - /*paethPredictor(0, prevline[i], 0) is always prevline[i]*/ - for(i = 0; i != bytewidth; ++i) out[i] = (scanline[i] - prevline[i]); - for(i = bytewidth; i < length; ++i) { - out[i] = (scanline[i] - paethPredictor(scanline[i - bytewidth], prevline[i], prevline[i - bytewidth])); - } - } else { - for(i = 0; i != bytewidth; ++i) out[i] = scanline[i]; - /*paethPredictor(scanline[i - bytewidth], 0, 0) is always scanline[i - bytewidth]*/ - for(i = bytewidth; i < length; ++i) out[i] = (scanline[i] - scanline[i - bytewidth]); - } - break; - default: return; /*invalid filter type given*/ - } +static void filterScanline(unsigned char *out, const unsigned char *scanline, + const unsigned char *prevline, size_t length, size_t bytewidth, unsigned char filterType) { + size_t i; + switch (filterType) { + case 0: /*None*/ + for (i = 0; i != length; ++i) + out[i] = scanline[i]; + break; + case 1: /*Sub*/ + for (i = 0; i != bytewidth; ++i) + out[i] = scanline[i]; + for (i = bytewidth; i < length; ++i) + out[i] = scanline[i] - scanline[i - bytewidth]; + break; + case 2: /*Up*/ + if (prevline) { + for (i = 0; i != length; ++i) + out[i] = scanline[i] - prevline[i]; + } else { + for (i = 0; i != length; ++i) + out[i] = scanline[i]; + } + break; + case 3: /*Average*/ + if (prevline) { + for (i = 0; i != bytewidth; ++i) + out[i] = scanline[i] - (prevline[i] >> 1); + for (i = bytewidth; i < length; ++i) + out[i] = scanline[i] - ((scanline[i - bytewidth] + prevline[i]) >> 1); + } else { + for (i = 0; i != bytewidth; ++i) + out[i] = scanline[i]; + for (i = bytewidth; i < length; ++i) + out[i] = scanline[i] - (scanline[i - bytewidth] >> 1); + } + break; + case 4: /*Paeth*/ + if (prevline) { + /*paethPredictor(0, prevline[i], 0) is always prevline[i]*/ + for (i = 0; i != bytewidth; ++i) + out[i] = (scanline[i] - prevline[i]); + for (i = bytewidth; i < length; ++i) { + out[i] = (scanline[i] - paethPredictor(scanline[i - bytewidth], prevline[i], + prevline[i - bytewidth])); + } + } else { + for (i = 0; i != bytewidth; ++i) + out[i] = scanline[i]; + /*paethPredictor(scanline[i - bytewidth], 0, 0) is always scanline[i + * - bytewidth]*/ + for (i = bytewidth; i < length; ++i) + out[i] = (scanline[i] - scanline[i - bytewidth]); + } + break; + default: + return; /*invalid filter type given*/ + } } /* integer binary logarithm, max return value is 31 */ static size_t ilog2(size_t i) { - size_t result = 0; - if(i >= 65536) { result += 16; i >>= 16; } - if(i >= 256) { result += 8; i >>= 8; } - if(i >= 16) { result += 4; i >>= 4; } - if(i >= 4) { result += 2; i >>= 2; } - if(i >= 2) { result += 1; /*i >>= 1;*/ } - return result; + size_t result = 0; + if (i >= 65536) { + result += 16; + i >>= 16; + } + if (i >= 256) { + result += 8; + i >>= 8; + } + if (i >= 16) { + result += 4; + i >>= 4; + } + if (i >= 4) { + result += 2; + i >>= 2; + } + if (i >= 2) { + result += 1; /*i >>= 1;*/ + } + return result; } /* integer approximation for i * log2(i), helper function for LFS_ENTROPY */ static size_t ilog2i(size_t i) { - size_t l; - if(i == 0) return 0; - l = ilog2(i); - /* approximate i*log2(i): l is integer logarithm, ((i - (1u << l)) << 1u) - linearly approximates the missing fractional part multiplied by i */ - return i * l + ((i - (((size_t)1) << l)) << 1u); -} - -static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, - const LodePNGColorMode* color, const LodePNGEncoderSettings* settings) { - /* - For PNG filter method 0 - out must be a buffer with as size: h + (w * h * bpp + 7u) / 8u, because there are - the scanlines with 1 extra byte per scanline - */ - - unsigned bpp = lodepng_get_bpp(color); - /*the width of a scanline in bytes, not including the filter type*/ - size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u; - - /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/ - size_t bytewidth = (bpp + 7u) / 8u; - const unsigned char* prevline = 0; - unsigned x, y; - unsigned error = 0; - LodePNGFilterStrategy strategy = settings->filter_strategy; - - /* - There is a heuristic called the minimum sum of absolute differences heuristic, suggested by the PNG standard: - * If the image type is Palette, or the bit depth is smaller than 8, then do not filter the image (i.e. - use fixed filtering, with the filter None). - * (The other case) If the image type is Grayscale or RGB (with or without Alpha), and the bit depth is - not smaller than 8, then use adaptive filtering heuristic as follows: independently for each row, apply - all five filters and select the filter that produces the smallest sum of absolute values per row. - This heuristic is used if filter strategy is LFS_MINSUM and filter_palette_zero is true. - - If filter_palette_zero is true and filter_strategy is not LFS_MINSUM, the above heuristic is followed, - but for "the other case", whatever strategy filter_strategy is set to instead of the minimum sum - heuristic is used. - */ - if(settings->filter_palette_zero && - (color->colortype == LCT_PALETTE || color->bitdepth < 8)) strategy = LFS_ZERO; - - if(bpp == 0) return 31; /*error: invalid color type*/ - - if(strategy >= LFS_ZERO && strategy <= LFS_FOUR) { - unsigned char type = (unsigned char)strategy; - for(y = 0; y != h; ++y) { - size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ - size_t inindex = linebytes * y; - out[outindex] = type; /*filter type byte*/ - filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); - prevline = &in[inindex]; - } - } else if(strategy == LFS_MINSUM) { - /*adaptive filtering*/ - unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ - size_t smallest = 0; - unsigned char type, bestType = 0; - - for(type = 0; type != 5; ++type) { - attempt[type] = (unsigned char*)lodepng_malloc(linebytes); - if(!attempt[type]) error = 83; /*alloc fail*/ - } - - if(!error) { - for(y = 0; y != h; ++y) { - /*try the 5 filter types*/ - for(type = 0; type != 5; ++type) { - size_t sum = 0; - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - - /*calculate the sum of the result*/ - if(type == 0) { - for(x = 0; x != linebytes; ++x) sum += (unsigned char)(attempt[type][x]); - } else { - for(x = 0; x != linebytes; ++x) { - /*For differences, each byte should be treated as signed, values above 127 are negative - (converted to signed char). Filtertype 0 isn't a difference though, so use unsigned there. - This means filtertype 0 is almost never chosen, but that is justified.*/ - unsigned char s = attempt[type][x]; - sum += s < 128 ? s : (255U - s); - } - } - - /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ - if(type == 0 || sum < smallest) { - bestType = type; - smallest = sum; - } - } - - prevline = &in[y * linebytes]; - - /*now fill the out values*/ - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; - } - } - - for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); - } else if(strategy == LFS_ENTROPY) { - unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ - size_t bestSum = 0; - unsigned type, bestType = 0; - unsigned count[256]; - - for(type = 0; type != 5; ++type) { - attempt[type] = (unsigned char*)lodepng_malloc(linebytes); - if(!attempt[type]) error = 83; /*alloc fail*/ - } - - if(!error) { - for(y = 0; y != h; ++y) { - /*try the 5 filter types*/ - for(type = 0; type != 5; ++type) { - size_t sum = 0; - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - lodepng_memset(count, 0, 256 * sizeof(*count)); - for(x = 0; x != linebytes; ++x) ++count[attempt[type][x]]; - ++count[type]; /*the filter type itself is part of the scanline*/ - for(x = 0; x != 256; ++x) { - sum += ilog2i(count[x]); - } - /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/ - if(type == 0 || sum > bestSum) { - bestType = type; - bestSum = sum; - } - } - - prevline = &in[y * linebytes]; - - /*now fill the out values*/ - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; - } - } - - for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); - } else if(strategy == LFS_PREDEFINED) { - for(y = 0; y != h; ++y) { - size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ - size_t inindex = linebytes * y; - unsigned char type = settings->predefined_filters[y]; - out[outindex] = type; /*filter type byte*/ - filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); - prevline = &in[inindex]; - } - } else if(strategy == LFS_BRUTE_FORCE) { - /*brute force filter chooser. - deflate the scanline after every filter attempt to see which one deflates best. - This is very slow and gives only slightly smaller, sometimes even larger, result*/ - size_t size[5]; - unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/ - size_t smallest = 0; - unsigned type = 0, bestType = 0; - unsigned char* dummy; - LodePNGCompressSettings zlibsettings; - lodepng_memcpy(&zlibsettings, &settings->zlibsettings, sizeof(LodePNGCompressSettings)); - /*use fixed tree on the attempts so that the tree is not adapted to the filtertype on purpose, - to simulate the true case where the tree is the same for the whole image. Sometimes it gives - better result with dynamic tree anyway. Using the fixed tree sometimes gives worse, but in rare - cases better compression. It does make this a bit less slow, so it's worth doing this.*/ - zlibsettings.btype = 1; - /*a custom encoder likely doesn't read the btype setting and is optimized for complete PNG - images only, so disable it*/ - zlibsettings.custom_zlib = 0; - zlibsettings.custom_deflate = 0; - for(type = 0; type != 5; ++type) { - attempt[type] = (unsigned char*)lodepng_malloc(linebytes); - if(!attempt[type]) error = 83; /*alloc fail*/ - } - if(!error) { - for(y = 0; y != h; ++y) /*try the 5 filter types*/ { - for(type = 0; type != 5; ++type) { - unsigned testsize = (unsigned)linebytes; - /*if(testsize > 8) testsize /= 8;*/ /*it already works good enough by testing a part of the row*/ - - filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); - size[type] = 0; - dummy = 0; - zlib_compress(&dummy, &size[type], attempt[type], testsize, &zlibsettings); - lodepng_free(dummy); - /*check if this is smallest size (or if type == 0 it's the first case so always store the values)*/ - if(type == 0 || size[type] < smallest) { - bestType = type; - smallest = size[type]; - } - } - prevline = &in[y * linebytes]; - out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/ - for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; - } - } - for(type = 0; type != 5; ++type) lodepng_free(attempt[type]); - } - else return 88; /* unknown filter strategy */ - - return error; -} - -static void addPaddingBits(unsigned char* out, const unsigned char* in, - size_t olinebits, size_t ilinebits, unsigned h) { - /*The opposite of the removePaddingBits function - olinebits must be >= ilinebits*/ - unsigned y; - size_t diff = olinebits - ilinebits; - size_t obp = 0, ibp = 0; /*bit pointers*/ - for(y = 0; y != h; ++y) { - size_t x; - for(x = 0; x < ilinebits; ++x) { - unsigned char bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - /*obp += diff; --> no, fill in some value in the padding bits too, to avoid - "Use of uninitialised value of size ###" warning from valgrind*/ - for(x = 0; x != diff; ++x) setBitOfReversedStream(&obp, out, 0); - } + size_t l; + if (i == 0) + return 0; + l = ilog2(i); + /* approximate i*log2(i): l is integer logarithm, ((i - (1u << l)) << 1u) + linearly approximates the missing fractional part multiplied by i */ + return i * l + ((i - (((size_t)1) << l)) << 1u); +} + +static unsigned filter(unsigned char *out, const unsigned char *in, unsigned w, unsigned h, + const LodePNGColorMode *color, const LodePNGEncoderSettings *settings) { + /* + For PNG filter method 0 + out must be a buffer with as size: h + (w * h * bpp + 7u) / 8u, because + there are the scanlines with 1 extra byte per scanline + */ + + unsigned bpp = lodepng_get_bpp(color); + /*the width of a scanline in bytes, not including the filter type*/ + size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u; + + /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per + * pixel otherwise*/ + size_t bytewidth = (bpp + 7u) / 8u; + const unsigned char *prevline = 0; + unsigned x, y; + unsigned error = 0; + LodePNGFilterStrategy strategy = settings->filter_strategy; + + /* + There is a heuristic called the minimum sum of absolute differences + heuristic, suggested by the PNG standard: + * If the image type is Palette, or the bit depth is smaller than 8, then + do not filter the image (i.e. use fixed filtering, with the filter None). + * (The other case) If the image type is Grayscale or RGB (with or without + Alpha), and the bit depth is not smaller than 8, then use adaptive filtering + heuristic as follows: independently for each row, apply all five filters and + select the filter that produces the smallest sum of absolute values per row. + This heuristic is used if filter strategy is LFS_MINSUM and + filter_palette_zero is true. + + If filter_palette_zero is true and filter_strategy is not LFS_MINSUM, the + above heuristic is followed, but for "the other case", whatever strategy + filter_strategy is set to instead of the minimum sum heuristic is used. + */ + if (settings->filter_palette_zero && (color->colortype == LCT_PALETTE || color->bitdepth < 8)) + strategy = LFS_ZERO; + + if (bpp == 0) + return 31; /*error: invalid color type*/ + + if (strategy >= LFS_ZERO && strategy <= LFS_FOUR) { + unsigned char type = (unsigned char)strategy; + for (y = 0; y != h; ++y) { + size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ + size_t inindex = linebytes * y; + out[outindex] = type; /*filter type byte*/ + filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); + prevline = &in[inindex]; + } + } else if (strategy == LFS_MINSUM) { + /*adaptive filtering*/ + unsigned char *attempt[5]; /*five filtering attempts, one for each filter type*/ + size_t smallest = 0; + unsigned char type, bestType = 0; + + for (type = 0; type != 5; ++type) { + attempt[type] = (unsigned char *)lodepng_malloc(linebytes); + if (!attempt[type]) + error = 83; /*alloc fail*/ + } + + if (!error) { + for (y = 0; y != h; ++y) { + /*try the 5 filter types*/ + for (type = 0; type != 5; ++type) { + size_t sum = 0; + filterScanline( + attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); + + /*calculate the sum of the result*/ + if (type == 0) { + for (x = 0; x != linebytes; ++x) + sum += (unsigned char)(attempt[type][x]); + } else { + for (x = 0; x != linebytes; ++x) { + /*For differences, each byte should be + treated as signed, values above 127 are + negative (converted to signed char). + Filtertype 0 isn't a difference though, so + use unsigned there. This means filtertype 0 + is almost never chosen, but that is + justified.*/ + unsigned char s = attempt[type][x]; + sum += s < 128 ? s : (255U - s); + } + } + + /*check if this is smallest sum (or if type == 0 it's the + * first case so always store the values)*/ + if (type == 0 || sum < smallest) { + bestType = type; + smallest = sum; + } + } + + prevline = &in[y * linebytes]; + + /*now fill the out values*/ + out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline + will be the filter type*/ + for (x = 0; x != linebytes; ++x) + out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; + } + } + + for (type = 0; type != 5; ++type) + lodepng_free(attempt[type]); + } else if (strategy == LFS_ENTROPY) { + unsigned char *attempt[5]; /*five filtering attempts, one for each filter type*/ + size_t bestSum = 0; + unsigned type, bestType = 0; + unsigned count[256]; + + for (type = 0; type != 5; ++type) { + attempt[type] = (unsigned char *)lodepng_malloc(linebytes); + if (!attempt[type]) + error = 83; /*alloc fail*/ + } + + if (!error) { + for (y = 0; y != h; ++y) { + /*try the 5 filter types*/ + for (type = 0; type != 5; ++type) { + size_t sum = 0; + filterScanline( + attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); + lodepng_memset(count, 0, 256 * sizeof(*count)); + for (x = 0; x != linebytes; ++x) + ++count[attempt[type][x]]; + ++count[type]; /*the filter type itself is part of the + scanline*/ + for (x = 0; x != 256; ++x) { + sum += ilog2i(count[x]); + } + /*check if this is smallest sum (or if type == 0 it's the + * first case so always store the values)*/ + if (type == 0 || sum > bestSum) { + bestType = type; + bestSum = sum; + } + } + + prevline = &in[y * linebytes]; + + /*now fill the out values*/ + out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline + will be the filter type*/ + for (x = 0; x != linebytes; ++x) + out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; + } + } + + for (type = 0; type != 5; ++type) + lodepng_free(attempt[type]); + } else if (strategy == LFS_PREDEFINED) { + for (y = 0; y != h; ++y) { + size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/ + size_t inindex = linebytes * y; + unsigned char type = settings->predefined_filters[y]; + out[outindex] = type; /*filter type byte*/ + filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type); + prevline = &in[inindex]; + } + } else if (strategy == LFS_BRUTE_FORCE) { + /*brute force filter chooser. + deflate the scanline after every filter attempt to see which one + deflates best. This is very slow and gives only slightly smaller, + sometimes even larger, result*/ + size_t size[5]; + unsigned char *attempt[5]; /*five filtering attempts, one for each filter type*/ + size_t smallest = 0; + unsigned type = 0, bestType = 0; + unsigned char *dummy; + LodePNGCompressSettings zlibsettings; + lodepng_memcpy(&zlibsettings, &settings->zlibsettings, sizeof(LodePNGCompressSettings)); + /*use fixed tree on the attempts so that the tree is not adapted to the + filtertype on purpose, to simulate the true case where the tree is the + same for the whole image. Sometimes it gives better result with dynamic + tree anyway. Using the fixed tree sometimes gives worse, but in rare + cases better compression. It does make this a bit less slow, so it's + worth doing this.*/ + zlibsettings.btype = 1; + /*a custom encoder likely doesn't read the btype setting and is + optimized for complete PNG images only, so disable it*/ + zlibsettings.custom_zlib = 0; + zlibsettings.custom_deflate = 0; + for (type = 0; type != 5; ++type) { + attempt[type] = (unsigned char *)lodepng_malloc(linebytes); + if (!attempt[type]) + error = 83; /*alloc fail*/ + } + if (!error) { + for (y = 0; y != h; ++y) /*try the 5 filter types*/ { + for (type = 0; type != 5; ++type) { + unsigned testsize = (unsigned)linebytes; + /*if(testsize > 8) testsize /= 8;*/ /*it already works good + enough + by testing a part of the row*/ + + filterScanline( + attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type); + size[type] = 0; + dummy = 0; + zlib_compress(&dummy, &size[type], attempt[type], testsize, &zlibsettings); + lodepng_free(dummy); + /*check if this is smallest size (or if type == 0 it's the + * first case so always store the values)*/ + if (type == 0 || size[type] < smallest) { + bestType = type; + smallest = size[type]; + } + } + prevline = &in[y * linebytes]; + out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline + will be the filter type*/ + for (x = 0; x != linebytes; ++x) + out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x]; + } + } + for (type = 0; type != 5; ++type) + lodepng_free(attempt[type]); + } else + return 88; /* unknown filter strategy */ + + return error; +} + +static void addPaddingBits( + unsigned char *out, const unsigned char *in, size_t olinebits, size_t ilinebits, unsigned h) { + /*The opposite of the removePaddingBits function + olinebits must be >= ilinebits*/ + unsigned y; + size_t diff = olinebits - ilinebits; + size_t obp = 0, ibp = 0; /*bit pointers*/ + for (y = 0; y != h; ++y) { + size_t x; + for (x = 0; x < ilinebits; ++x) { + unsigned char bit = readBitFromReversedStream(&ibp, in); + setBitOfReversedStream(&obp, out, bit); + } + /*obp += diff; --> no, fill in some value in the padding bits too, to + avoid "Use of uninitialised value of size ###" warning from valgrind*/ + for (x = 0; x != diff; ++x) + setBitOfReversedStream(&obp, out, 0); + } } /* @@ -6116,540 +6972,622 @@ in has the following size in bits: w * h * bpp. out is possibly bigger due to padding bits between reduced images NOTE: comments about padding bits are only relevant if bpp < 8 */ -static void Adam7_interlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) { - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned i; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - if(bpp >= 8) { - for(i = 0; i != 7; ++i) { - unsigned x, y, b; - size_t bytewidth = bpp / 8u; - for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) { - size_t pixelinstart = ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth; - size_t pixeloutstart = passstart[i] + (y * passw[i] + x) * bytewidth; - for(b = 0; b < bytewidth; ++b) { - out[pixeloutstart + b] = in[pixelinstart + b]; - } - } - } - } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ { - for(i = 0; i != 7; ++i) { - unsigned x, y, b; - unsigned ilinebits = bpp * passw[i]; - unsigned olinebits = bpp * w; - size_t obp, ibp; /*bit pointers (for out and in buffer)*/ - for(y = 0; y < passh[i]; ++y) - for(x = 0; x < passw[i]; ++x) { - ibp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp; - obp = (8 * passstart[i]) + (y * ilinebits + x * bpp); - for(b = 0; b < bpp; ++b) { - unsigned char bit = readBitFromReversedStream(&ibp, in); - setBitOfReversedStream(&obp, out, bit); - } - } - } - } -} - -/*out must be buffer big enough to contain uncompressed IDAT chunk data, and in must contain the full image. -return value is error**/ -static unsigned preProcessScanlines(unsigned char** out, size_t* outsize, const unsigned char* in, - unsigned w, unsigned h, - const LodePNGInfo* info_png, const LodePNGEncoderSettings* settings) { - /* - This function converts the pure 2D image with the PNG's colortype, into filtered-padded-interlaced data. Steps: - *) if no Adam7: 1) add padding bits (= possible extra bits per scanline if bpp < 8) 2) filter - *) if adam7: 1) Adam7_interlace 2) 7x add padding bits 3) 7x filter - */ - unsigned bpp = lodepng_get_bpp(&info_png->color); - unsigned error = 0; - - if(info_png->interlace_method == 0) { - *outsize = h + (h * ((w * bpp + 7u) / 8u)); /*image size plus an extra byte per scanline + possible padding bits*/ - *out = (unsigned char*)lodepng_malloc(*outsize); - if(!(*out) && (*outsize)) error = 83; /*alloc fail*/ - - if(!error) { - /*non multiple of 8 bits per scanline, padding bits needed per scanline*/ - if(bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) { - unsigned char* padded = (unsigned char*)lodepng_malloc(h * ((w * bpp + 7u) / 8u)); - if(!padded) error = 83; /*alloc fail*/ - if(!error) { - addPaddingBits(padded, in, ((w * bpp + 7u) / 8u) * 8u, w * bpp, h); - error = filter(*out, padded, w, h, &info_png->color, settings); - } - lodepng_free(padded); - } else { - /*we can immediately filter into the out buffer, no other steps needed*/ - error = filter(*out, in, w, h, &info_png->color, settings); - } - } - } else /*interlace_method is 1 (Adam7)*/ { - unsigned passw[7], passh[7]; - size_t filter_passstart[8], padded_passstart[8], passstart[8]; - unsigned char* adam7; - - Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); - - *outsize = filter_passstart[7]; /*image size plus an extra byte per scanline + possible padding bits*/ - *out = (unsigned char*)lodepng_malloc(*outsize); - if(!(*out)) error = 83; /*alloc fail*/ - - adam7 = (unsigned char*)lodepng_malloc(passstart[7]); - if(!adam7 && passstart[7]) error = 83; /*alloc fail*/ - - if(!error) { - unsigned i; - - Adam7_interlace(adam7, in, w, h, bpp); - for(i = 0; i != 7; ++i) { - if(bpp < 8) { - unsigned char* padded = (unsigned char*)lodepng_malloc(padded_passstart[i + 1] - padded_passstart[i]); - if(!padded) ERROR_BREAK(83); /*alloc fail*/ - addPaddingBits(padded, &adam7[passstart[i]], - ((passw[i] * bpp + 7u) / 8u) * 8u, passw[i] * bpp, passh[i]); - error = filter(&(*out)[filter_passstart[i]], padded, - passw[i], passh[i], &info_png->color, settings); - lodepng_free(padded); - } else { - error = filter(&(*out)[filter_passstart[i]], &adam7[padded_passstart[i]], - passw[i], passh[i], &info_png->color, settings); - } - - if(error) break; - } - } - - lodepng_free(adam7); - } - - return error; +static void Adam7_interlace( + unsigned char *out, const unsigned char *in, unsigned w, unsigned h, unsigned bpp) { + unsigned passw[7], passh[7]; + size_t filter_passstart[8], padded_passstart[8], passstart[8]; + unsigned i; + + Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); + + if (bpp >= 8) { + for (i = 0; i != 7; ++i) { + unsigned x, y, b; + size_t bytewidth = bpp / 8u; + for (y = 0; y < passh[i]; ++y) + for (x = 0; x < passw[i]; ++x) { + size_t pixelinstart = + ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * + bytewidth; + size_t pixeloutstart = passstart[i] + (y * passw[i] + x) * bytewidth; + for (b = 0; b < bytewidth; ++b) { + out[pixeloutstart + b] = in[pixelinstart + b]; + } + } + } + } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit + pointers*/ + { + for (i = 0; i != 7; ++i) { + unsigned x, y, b; + unsigned ilinebits = bpp * passw[i]; + unsigned olinebits = bpp * w; + size_t obp, ibp; /*bit pointers (for out and in buffer)*/ + for (y = 0; y < passh[i]; ++y) + for (x = 0; x < passw[i]; ++x) { + ibp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp; + obp = (8 * passstart[i]) + (y * ilinebits + x * bpp); + for (b = 0; b < bpp; ++b) { + unsigned char bit = readBitFromReversedStream(&ibp, in); + setBitOfReversedStream(&obp, out, bit); + } + } + } + } +} + +/*out must be buffer big enough to contain uncompressed IDAT chunk data, and in +must contain the full image. return value is error**/ +static unsigned preProcessScanlines(unsigned char **out, size_t *outsize, const unsigned char *in, + unsigned w, unsigned h, const LodePNGInfo *info_png, const LodePNGEncoderSettings *settings) { + /* + This function converts the pure 2D image with the PNG's colortype, into + filtered-padded-interlaced data. Steps: + *) if no Adam7: 1) add padding bits (= possible extra bits per scanline if + bpp < 8) 2) filter + *) if adam7: 1) Adam7_interlace 2) 7x add padding bits 3) 7x filter + */ + unsigned bpp = lodepng_get_bpp(&info_png->color); + unsigned error = 0; + + if (info_png->interlace_method == 0) { + *outsize = h + (h * ((w * bpp + 7u) / 8u)); /*image size plus an extra byte per + scanline + + possible padding bits*/ + *out = (unsigned char *)lodepng_malloc(*outsize); + if (!(*out) && (*outsize)) + error = 83; /*alloc fail*/ + + if (!error) { + /*non multiple of 8 bits per scanline, padding bits needed per + * scanline*/ + if (bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) { + unsigned char *padded = (unsigned char *)lodepng_malloc(h * ((w * bpp + 7u) / 8u)); + if (!padded) + error = 83; /*alloc fail*/ + if (!error) { + addPaddingBits(padded, in, ((w * bpp + 7u) / 8u) * 8u, w * bpp, h); + error = filter(*out, padded, w, h, &info_png->color, settings); + } + lodepng_free(padded); + } else { + /*we can immediately filter into the out buffer, no other steps + * needed*/ + error = filter(*out, in, w, h, &info_png->color, settings); + } + } + } else /*interlace_method is 1 (Adam7)*/ { + unsigned passw[7], passh[7]; + size_t filter_passstart[8], padded_passstart[8], passstart[8]; + unsigned char *adam7; + + Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp); + + *outsize = filter_passstart[7]; /*image size plus an extra byte per scanline + + possible padding bits*/ + *out = (unsigned char *)lodepng_malloc(*outsize); + if (!(*out)) + error = 83; /*alloc fail*/ + + adam7 = (unsigned char *)lodepng_malloc(passstart[7]); + if (!adam7 && passstart[7]) + error = 83; /*alloc fail*/ + + if (!error) { + unsigned i; + + Adam7_interlace(adam7, in, w, h, bpp); + for (i = 0; i != 7; ++i) { + if (bpp < 8) { + unsigned char *padded = (unsigned char *)lodepng_malloc( + padded_passstart[i + 1] - padded_passstart[i]); + if (!padded) + ERROR_BREAK(83); /*alloc fail*/ + addPaddingBits(padded, &adam7[passstart[i]], ((passw[i] * bpp + 7u) / 8u) * 8u, + passw[i] * bpp, passh[i]); + error = filter(&(*out)[filter_passstart[i]], padded, passw[i], passh[i], + &info_png->color, settings); + lodepng_free(padded); + } else { + error = filter(&(*out)[filter_passstart[i]], &adam7[padded_passstart[i]], + passw[i], passh[i], &info_png->color, settings); + } + + if (error) + break; + } + } + + lodepng_free(adam7); + } + + return error; } #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -static unsigned addUnknownChunks(ucvector* out, unsigned char* data, size_t datasize) { - unsigned char* inchunk = data; - while((size_t)(inchunk - data) < datasize) { - CERROR_TRY_RETURN(lodepng_chunk_append(&out->data, &out->size, inchunk)); - out->allocsize = out->size; /*fix the allocsize again*/ - inchunk = lodepng_chunk_next(inchunk, data + datasize); - } - return 0; -} - -static unsigned isGrayICCProfile(const unsigned char* profile, unsigned size) { - /* - It is a gray profile if bytes 16-19 are "GRAY", rgb profile if bytes 16-19 - are "RGB ". We do not perform any full parsing of the ICC profile here, other - than check those 4 bytes to grayscale profile. Other than that, validity of - the profile is not checked. This is needed only because the PNG specification - requires using a non-gray color model if there is an ICC profile with "RGB " - (sadly limiting compression opportunities if the input data is grayscale RGB - data), and requires using a gray color model if it is "GRAY". - */ - if(size < 20) return 0; - return profile[16] == 'G' && profile[17] == 'R' && profile[18] == 'A' && profile[19] == 'Y'; -} - -static unsigned isRGBICCProfile(const unsigned char* profile, unsigned size) { - /* See comment in isGrayICCProfile*/ - if(size < 20) return 0; - return profile[16] == 'R' && profile[17] == 'G' && profile[18] == 'B' && profile[19] == ' '; +static unsigned addUnknownChunks(ucvector *out, unsigned char *data, size_t datasize) { + unsigned char *inchunk = data; + while ((size_t)(inchunk - data) < datasize) { + CERROR_TRY_RETURN(lodepng_chunk_append(&out->data, &out->size, inchunk)); + out->allocsize = out->size; /*fix the allocsize again*/ + inchunk = lodepng_chunk_next(inchunk, data + datasize); + } + return 0; +} + +static unsigned isGrayICCProfile(const unsigned char *profile, unsigned size) { + /* + It is a gray profile if bytes 16-19 are "GRAY", rgb profile if bytes 16-19 + are "RGB ". We do not perform any full parsing of the ICC profile here, + other than check those 4 bytes to grayscale profile. Other than that, + validity of the profile is not checked. This is needed only because the PNG + specification requires using a non-gray color model if there is an ICC + profile with "RGB " (sadly limiting compression opportunities if the input + data is grayscale RGB data), and requires using a gray color model if it is + "GRAY". + */ + if (size < 20) + return 0; + return profile[16] == 'G' && profile[17] == 'R' && profile[18] == 'A' && profile[19] == 'Y'; +} + +static unsigned isRGBICCProfile(const unsigned char *profile, unsigned size) { + /* See comment in isGrayICCProfile*/ + if (size < 20) + return 0; + return profile[16] == 'R' && profile[17] == 'G' && profile[18] == 'B' && profile[19] == ' '; } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ -unsigned lodepng_encode(unsigned char** out, size_t* outsize, - const unsigned char* image, unsigned w, unsigned h, - LodePNGState* state) { - unsigned char* data = 0; /*uncompressed version of the IDAT chunk data*/ - size_t datasize = 0; - ucvector outv = ucvector_init(NULL, 0); - LodePNGInfo info; - const LodePNGInfo* info_png = &state->info_png; - LodePNGColorMode auto_color; - - lodepng_info_init(&info); - lodepng_color_mode_init(&auto_color); - - /*provide some proper output values if error will happen*/ - *out = 0; - *outsize = 0; - state->error = 0; - - /*check input values validity*/ - if((info_png->color.colortype == LCT_PALETTE || state->encoder.force_palette) - && (info_png->color.palettesize == 0 || info_png->color.palettesize > 256)) { - /*this error is returned even if auto_convert is enabled and thus encoder could - generate the palette by itself: while allowing this could be possible in theory, - it may complicate the code or edge cases, and always requiring to give a palette - when setting this color type is a simpler contract*/ - state->error = 68; /*invalid palette size, it is only allowed to be 1-256*/ - goto cleanup; - } - if(state->encoder.zlibsettings.btype > 2) { - state->error = 61; /*error: invalid btype*/ - goto cleanup; - } - if(info_png->interlace_method > 1) { - state->error = 71; /*error: invalid interlace mode*/ - goto cleanup; - } - state->error = checkColorValidity(info_png->color.colortype, info_png->color.bitdepth); - if(state->error) goto cleanup; /*error: invalid color type given*/ - state->error = checkColorValidity(state->info_raw.colortype, state->info_raw.bitdepth); - if(state->error) goto cleanup; /*error: invalid color type given*/ - - /* color convert and compute scanline filter types */ - lodepng_info_copy(&info, &state->info_png); - if(state->encoder.auto_convert) { - LodePNGColorStats stats; - unsigned allow_convert = 1; - lodepng_color_stats_init(&stats); +unsigned lodepng_encode(unsigned char **out, size_t *outsize, const unsigned char *image, + unsigned w, unsigned h, LodePNGState *state) { + unsigned char *data = 0; /*uncompressed version of the IDAT chunk data*/ + size_t datasize = 0; + ucvector outv = ucvector_init(NULL, 0); + LodePNGInfo info; + const LodePNGInfo *info_png = &state->info_png; + LodePNGColorMode auto_color; + + lodepng_info_init(&info); + lodepng_color_mode_init(&auto_color); + + /*provide some proper output values if error will happen*/ + *out = 0; + *outsize = 0; + state->error = 0; + + /*check input values validity*/ + if ((info_png->color.colortype == LCT_PALETTE || state->encoder.force_palette) && + (info_png->color.palettesize == 0 || info_png->color.palettesize > 256)) { + /*this error is returned even if auto_convert is enabled and thus + encoder could generate the palette by itself: while allowing this could + be possible in theory, it may complicate the code or edge cases, and + always requiring to give a palette when setting this color type is a + simpler contract*/ + state->error = 68; /*invalid palette size, it is only allowed to be 1-256*/ + goto cleanup; + } + if (state->encoder.zlibsettings.btype > 2) { + state->error = 61; /*error: invalid btype*/ + goto cleanup; + } + if (info_png->interlace_method > 1) { + state->error = 71; /*error: invalid interlace mode*/ + goto cleanup; + } + state->error = checkColorValidity(info_png->color.colortype, info_png->color.bitdepth); + if (state->error) + goto cleanup; /*error: invalid color type given*/ + state->error = checkColorValidity(state->info_raw.colortype, state->info_raw.bitdepth); + if (state->error) + goto cleanup; /*error: invalid color type given*/ + + /* color convert and compute scanline filter types */ + lodepng_info_copy(&info, &state->info_png); + if (state->encoder.auto_convert) { + LodePNGColorStats stats; + unsigned allow_convert = 1; + lodepng_color_stats_init(&stats); #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(info_png->iccp_defined && - isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) { - /*the PNG specification does not allow to use palette with a GRAY ICC profile, even - if the palette has only gray colors, so disallow it.*/ - stats.allow_palette = 0; - } - if(info_png->iccp_defined && - isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) { - /*the PNG specification does not allow to use grayscale color with RGB ICC profile, so disallow gray.*/ - stats.allow_greyscale = 0; - } + if (info_png->iccp_defined && + isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) { + /*the PNG specification does not allow to use palette with a GRAY + ICC profile, even if the palette has only gray colors, so disallow + it.*/ + stats.allow_palette = 0; + } + if (info_png->iccp_defined && + isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) { + /*the PNG specification does not allow to use grayscale color with + * RGB ICC profile, so disallow gray.*/ + stats.allow_greyscale = 0; + } #endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ - state->error = lodepng_compute_color_stats(&stats, image, w, h, &state->info_raw); - if(state->error) goto cleanup; + state->error = lodepng_compute_color_stats(&stats, image, w, h, &state->info_raw); + if (state->error) + goto cleanup; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(info_png->background_defined) { - /*the background chunk's color must be taken into account as well*/ - unsigned r = 0, g = 0, b = 0; - LodePNGColorMode mode16 = lodepng_color_mode_make(LCT_RGB, 16); - lodepng_convert_rgb(&r, &g, &b, - info_png->background_r, info_png->background_g, info_png->background_b, &mode16, &info_png->color); - state->error = lodepng_color_stats_add(&stats, r, g, b, 65535); - if(state->error) goto cleanup; - } + if (info_png->background_defined) { + /*the background chunk's color must be taken into account as well*/ + unsigned r = 0, g = 0, b = 0; + LodePNGColorMode mode16 = lodepng_color_mode_make(LCT_RGB, 16); + lodepng_convert_rgb(&r, &g, &b, info_png->background_r, info_png->background_g, + info_png->background_b, &mode16, &info_png->color); + state->error = lodepng_color_stats_add(&stats, r, g, b, 65535); + if (state->error) + goto cleanup; + } #endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ - state->error = auto_choose_color(&auto_color, &state->info_raw, &stats); - if(state->error) goto cleanup; + state->error = auto_choose_color(&auto_color, &state->info_raw, &stats); + if (state->error) + goto cleanup; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(info_png->sbit_defined) { - /*if sbit is defined, due to strict requirements of which sbit values can be present for which color modes, - auto_convert can't be done in many cases. However, do support a few cases here. - TODO: more conversions may be possible, and it may also be possible to get a more appropriate color type out of - auto_choose_color if knowledge about sbit is used beforehand - */ - unsigned sbit_max = LODEPNG_MAX(LODEPNG_MAX(LODEPNG_MAX(info_png->sbit_r, info_png->sbit_g), - info_png->sbit_b), info_png->sbit_a); - unsigned equal = (!info_png->sbit_g || info_png->sbit_g == info_png->sbit_r) - && (!info_png->sbit_b || info_png->sbit_b == info_png->sbit_r) - && (!info_png->sbit_a || info_png->sbit_a == info_png->sbit_r); - allow_convert = 0; - if(info.color.colortype == LCT_PALETTE && - auto_color.colortype == LCT_PALETTE) { - /* input and output are palette, and in this case it may happen that palette data is - expected to be copied from info_raw into the info_png */ - allow_convert = 1; - } - /*going from 8-bit RGB to palette (or 16-bit as long as sbit_max <= 8) is possible - since both are 8-bit RGB for sBIT's purposes*/ - if(info.color.colortype == LCT_RGB && - auto_color.colortype == LCT_PALETTE && sbit_max <= 8) { - allow_convert = 1; - } - /*going from 8-bit RGBA to palette is also ok but only if sbit_a is exactly 8*/ - if(info.color.colortype == LCT_RGBA && auto_color.colortype == LCT_PALETTE && - info_png->sbit_a == 8 && sbit_max <= 8) { - allow_convert = 1; - } - /*going from 16-bit RGB(A) to 8-bit RGB(A) is ok if all sbit values are <= 8*/ - if((info.color.colortype == LCT_RGB || info.color.colortype == LCT_RGBA) && info.color.bitdepth == 16 && - auto_color.colortype == info.color.colortype && auto_color.bitdepth == 8 && - sbit_max <= 8) { - allow_convert = 1; - } - /*going to less channels is ok if all bit values are equal (all possible values in sbit, - as well as the chosen bitdepth of the result). Due to how auto_convert works, - we already know that auto_color.colortype has less than or equal amount of channels than - info.colortype. Palette is not used here. This conversion is not allowed if - info_png->sbit_r < auto_color.bitdepth, because specifically for alpha, non-presence of - an sbit value heavily implies that alpha's bit depth is equal to the PNG bit depth (rather - than the bit depths set in the r, g and b sbit values, by how the PNG specification describes - handling tRNS chunk case with sBIT), so be conservative here about ignoring user input.*/ - if(info.color.colortype != LCT_PALETTE && auto_color.colortype != LCT_PALETTE && - equal && info_png->sbit_r == auto_color.bitdepth) { - allow_convert = 1; - } - } + if (info_png->sbit_defined) { + /*if sbit is defined, due to strict requirements of which sbit + values can be present for which color modes, auto_convert can't be + done in many cases. However, do support a few cases here. + TODO: more conversions may be possible, and it may also be possible + to get a more appropriate color type out of auto_choose_color if + knowledge about sbit is used beforehand + */ + unsigned sbit_max = LODEPNG_MAX( + LODEPNG_MAX(LODEPNG_MAX(info_png->sbit_r, info_png->sbit_g), info_png->sbit_b), + info_png->sbit_a); + unsigned equal = (!info_png->sbit_g || info_png->sbit_g == info_png->sbit_r) && + (!info_png->sbit_b || info_png->sbit_b == info_png->sbit_r) && + (!info_png->sbit_a || info_png->sbit_a == info_png->sbit_r); + allow_convert = 0; + if (info.color.colortype == LCT_PALETTE && auto_color.colortype == LCT_PALETTE) { + /* input and output are palette, and in this case it may happen + that palette data is expected to be copied from info_raw into + the info_png */ + allow_convert = 1; + } + /*going from 8-bit RGB to palette (or 16-bit as long as sbit_max <= + 8) is possible since both are 8-bit RGB for sBIT's purposes*/ + if (info.color.colortype == LCT_RGB && auto_color.colortype == LCT_PALETTE && + sbit_max <= 8) { + allow_convert = 1; + } + /*going from 8-bit RGBA to palette is also ok but only if sbit_a is + * exactly 8*/ + if (info.color.colortype == LCT_RGBA && auto_color.colortype == LCT_PALETTE && + info_png->sbit_a == 8 && sbit_max <= 8) { + allow_convert = 1; + } + /*going from 16-bit RGB(A) to 8-bit RGB(A) is ok if all sbit values + * are <= + * 8*/ + if ((info.color.colortype == LCT_RGB || info.color.colortype == LCT_RGBA) && + info.color.bitdepth == 16 && auto_color.colortype == info.color.colortype && + auto_color.bitdepth == 8 && sbit_max <= 8) { + allow_convert = 1; + } + /*going to less channels is ok if all bit values are equal (all + possible values in sbit, as well as the chosen bitdepth of the + result). Due to how auto_convert works, we already know that + auto_color.colortype has less than or equal amount of channels + than info.colortype. Palette is not used here. This conversion is + not allowed if info_png->sbit_r < auto_color.bitdepth, because + specifically for alpha, non-presence of an sbit value heavily + implies that alpha's bit depth is equal to the PNG bit depth + (rather than the bit depths set in the r, g and b sbit values, by + how the PNG specification describes handling tRNS chunk case with + sBIT), so be conservative here about ignoring user input.*/ + if (info.color.colortype != LCT_PALETTE && auto_color.colortype != LCT_PALETTE && + equal && info_png->sbit_r == auto_color.bitdepth) { + allow_convert = 1; + } + } #endif - if(state->encoder.force_palette) { - if(info.color.colortype != LCT_GREY && info.color.colortype != LCT_GREY_ALPHA && - (auto_color.colortype == LCT_GREY || auto_color.colortype == LCT_GREY_ALPHA)) { - /*user speficially forced a PLTE palette, so cannot convert to grayscale types because - the PNG specification only allows writing a suggested palette in PLTE for truecolor types*/ - allow_convert = 0; - } - } - if(allow_convert) { - lodepng_color_mode_copy(&info.color, &auto_color); + if (state->encoder.force_palette) { + if (info.color.colortype != LCT_GREY && info.color.colortype != LCT_GREY_ALPHA && + (auto_color.colortype == LCT_GREY || auto_color.colortype == LCT_GREY_ALPHA)) { + /*user speficially forced a PLTE palette, so cannot convert to + grayscale types because the PNG specification only allows + writing a suggested palette in PLTE for truecolor types*/ + allow_convert = 0; + } + } + if (allow_convert) { + lodepng_color_mode_copy(&info.color, &auto_color); #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*also convert the background chunk*/ - if(info_png->background_defined) { - if(lodepng_convert_rgb(&info.background_r, &info.background_g, &info.background_b, - info_png->background_r, info_png->background_g, info_png->background_b, &info.color, &info_png->color)) { - state->error = 104; - goto cleanup; - } - } + /*also convert the background chunk*/ + if (info_png->background_defined) { + if (lodepng_convert_rgb(&info.background_r, &info.background_g, &info.background_b, + info_png->background_r, info_png->background_g, info_png->background_b, + &info.color, &info_png->color)) { + state->error = 104; + goto cleanup; + } + } #endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */ - } - } + } + } #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - if(info_png->iccp_defined) { - unsigned gray_icc = isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size); - unsigned rgb_icc = isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size); - unsigned gray_png = info.color.colortype == LCT_GREY || info.color.colortype == LCT_GREY_ALPHA; - if(!gray_icc && !rgb_icc) { - state->error = 100; /* Disallowed profile color type for PNG */ - goto cleanup; - } - if(gray_icc != gray_png) { - /*Not allowed to use RGB/RGBA/palette with GRAY ICC profile or vice versa, - or in case of auto_convert, it wasn't possible to find appropriate model*/ - state->error = state->encoder.auto_convert ? 102 : 101; - goto cleanup; - } - } + if (info_png->iccp_defined) { + unsigned gray_icc = isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size); + unsigned rgb_icc = isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size); + unsigned gray_png = + info.color.colortype == LCT_GREY || info.color.colortype == LCT_GREY_ALPHA; + if (!gray_icc && !rgb_icc) { + state->error = 100; /* Disallowed profile color type for PNG */ + goto cleanup; + } + if (gray_icc != gray_png) { + /*Not allowed to use RGB/RGBA/palette with GRAY ICC profile or vice + versa, or in case of auto_convert, it wasn't possible to find + appropriate model*/ + state->error = state->encoder.auto_convert ? 102 : 101; + goto cleanup; + } + } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - if(!lodepng_color_mode_equal(&state->info_raw, &info.color)) { - unsigned char* converted; - size_t size = ((size_t)w * (size_t)h * (size_t)lodepng_get_bpp(&info.color) + 7u) / 8u; - - converted = (unsigned char*)lodepng_malloc(size); - if(!converted && size) state->error = 83; /*alloc fail*/ - if(!state->error) { - state->error = lodepng_convert(converted, image, &info.color, &state->info_raw, w, h); - } - if(!state->error) { - state->error = preProcessScanlines(&data, &datasize, converted, w, h, &info, &state->encoder); - } - lodepng_free(converted); - if(state->error) goto cleanup; - } else { - state->error = preProcessScanlines(&data, &datasize, image, w, h, &info, &state->encoder); - if(state->error) goto cleanup; - } - - /* output all PNG chunks */ { + if (!lodepng_color_mode_equal(&state->info_raw, &info.color)) { + unsigned char *converted; + size_t size = ((size_t)w * (size_t)h * (size_t)lodepng_get_bpp(&info.color) + 7u) / 8u; + + converted = (unsigned char *)lodepng_malloc(size); + if (!converted && size) + state->error = 83; /*alloc fail*/ + if (!state->error) { + state->error = lodepng_convert(converted, image, &info.color, &state->info_raw, w, h); + } + if (!state->error) { + state->error = + preProcessScanlines(&data, &datasize, converted, w, h, &info, &state->encoder); + } + lodepng_free(converted); + if (state->error) + goto cleanup; + } else { + state->error = preProcessScanlines(&data, &datasize, image, w, h, &info, &state->encoder); + if (state->error) + goto cleanup; + } + + /* output all PNG chunks */ { #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - size_t i; + size_t i; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - /*write signature and chunks*/ - state->error = writeSignature(&outv); - if(state->error) goto cleanup; - /*IHDR*/ - state->error = addChunk_IHDR(&outv, w, h, info.color.colortype, info.color.bitdepth, info.interlace_method); - if(state->error) goto cleanup; + /*write signature and chunks*/ + state->error = writeSignature(&outv); + if (state->error) + goto cleanup; + /*IHDR*/ + state->error = addChunk_IHDR( + &outv, w, h, info.color.colortype, info.color.bitdepth, info.interlace_method); + if (state->error) + goto cleanup; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*unknown chunks between IHDR and PLTE*/ - if(info.unknown_chunks_data[0]) { - state->error = addUnknownChunks(&outv, info.unknown_chunks_data[0], info.unknown_chunks_size[0]); - if(state->error) goto cleanup; - } - /*color profile chunks must come before PLTE */ - if(info.iccp_defined) { - state->error = addChunk_iCCP(&outv, &info, &state->encoder.zlibsettings); - if(state->error) goto cleanup; - } - if(info.srgb_defined) { - state->error = addChunk_sRGB(&outv, &info); - if(state->error) goto cleanup; - } - if(info.gama_defined) { - state->error = addChunk_gAMA(&outv, &info); - if(state->error) goto cleanup; - } - if(info.chrm_defined) { - state->error = addChunk_cHRM(&outv, &info); - if(state->error) goto cleanup; - } - if(info_png->sbit_defined) { - state->error = addChunk_sBIT(&outv, &info); - if(state->error) goto cleanup; - } + /*unknown chunks between IHDR and PLTE*/ + if (info.unknown_chunks_data[0]) { + state->error = + addUnknownChunks(&outv, info.unknown_chunks_data[0], info.unknown_chunks_size[0]); + if (state->error) + goto cleanup; + } + /*color profile chunks must come before PLTE */ + if (info.iccp_defined) { + state->error = addChunk_iCCP(&outv, &info, &state->encoder.zlibsettings); + if (state->error) + goto cleanup; + } + if (info.srgb_defined) { + state->error = addChunk_sRGB(&outv, &info); + if (state->error) + goto cleanup; + } + if (info.gama_defined) { + state->error = addChunk_gAMA(&outv, &info); + if (state->error) + goto cleanup; + } + if (info.chrm_defined) { + state->error = addChunk_cHRM(&outv, &info); + if (state->error) + goto cleanup; + } + if (info_png->sbit_defined) { + state->error = addChunk_sBIT(&outv, &info); + if (state->error) + goto cleanup; + } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - /*PLTE*/ - if(info.color.colortype == LCT_PALETTE) { - state->error = addChunk_PLTE(&outv, &info.color); - if(state->error) goto cleanup; - } - if(state->encoder.force_palette && (info.color.colortype == LCT_RGB || info.color.colortype == LCT_RGBA)) { - /*force_palette means: write suggested palette for truecolor in PLTE chunk*/ - state->error = addChunk_PLTE(&outv, &info.color); - if(state->error) goto cleanup; - } - /*tRNS (this will only add if when necessary) */ - state->error = addChunk_tRNS(&outv, &info.color); - if(state->error) goto cleanup; + /*PLTE*/ + if (info.color.colortype == LCT_PALETTE) { + state->error = addChunk_PLTE(&outv, &info.color); + if (state->error) + goto cleanup; + } + if (state->encoder.force_palette && + (info.color.colortype == LCT_RGB || info.color.colortype == LCT_RGBA)) { + /*force_palette means: write suggested palette for truecolor in PLTE + * chunk*/ + state->error = addChunk_PLTE(&outv, &info.color); + if (state->error) + goto cleanup; + } + /*tRNS (this will only add if when necessary) */ + state->error = addChunk_tRNS(&outv, &info.color); + if (state->error) + goto cleanup; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*bKGD (must come between PLTE and the IDAt chunks*/ - if(info.background_defined) { - state->error = addChunk_bKGD(&outv, &info); - if(state->error) goto cleanup; - } - /*pHYs (must come before the IDAT chunks)*/ - if(info.phys_defined) { - state->error = addChunk_pHYs(&outv, &info); - if(state->error) goto cleanup; - } - - /*unknown chunks between PLTE and IDAT*/ - if(info.unknown_chunks_data[1]) { - state->error = addUnknownChunks(&outv, info.unknown_chunks_data[1], info.unknown_chunks_size[1]); - if(state->error) goto cleanup; - } + /*bKGD (must come between PLTE and the IDAt chunks*/ + if (info.background_defined) { + state->error = addChunk_bKGD(&outv, &info); + if (state->error) + goto cleanup; + } + /*pHYs (must come before the IDAT chunks)*/ + if (info.phys_defined) { + state->error = addChunk_pHYs(&outv, &info); + if (state->error) + goto cleanup; + } + + /*unknown chunks between PLTE and IDAT*/ + if (info.unknown_chunks_data[1]) { + state->error = + addUnknownChunks(&outv, info.unknown_chunks_data[1], info.unknown_chunks_size[1]); + if (state->error) + goto cleanup; + } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - /*IDAT (multiple IDAT chunks must be consecutive)*/ - state->error = addChunk_IDAT(&outv, data, datasize, &state->encoder.zlibsettings); - if(state->error) goto cleanup; + /*IDAT (multiple IDAT chunks must be consecutive)*/ + state->error = addChunk_IDAT(&outv, data, datasize, &state->encoder.zlibsettings); + if (state->error) + goto cleanup; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*tIME*/ - if(info.time_defined) { - state->error = addChunk_tIME(&outv, &info.time); - if(state->error) goto cleanup; - } - /*tEXt and/or zTXt*/ - for(i = 0; i != info.text_num; ++i) { - if(lodepng_strlen(info.text_keys[i]) > 79) { - state->error = 66; /*text chunk too large*/ - goto cleanup; - } - if(lodepng_strlen(info.text_keys[i]) < 1) { - state->error = 67; /*text chunk too small*/ - goto cleanup; - } - if(state->encoder.text_compression) { - state->error = addChunk_zTXt(&outv, info.text_keys[i], info.text_strings[i], &state->encoder.zlibsettings); - if(state->error) goto cleanup; - } else { - state->error = addChunk_tEXt(&outv, info.text_keys[i], info.text_strings[i]); - if(state->error) goto cleanup; - } - } - /*LodePNG version id in text chunk*/ - if(state->encoder.add_id) { - unsigned already_added_id_text = 0; - for(i = 0; i != info.text_num; ++i) { - const char* k = info.text_keys[i]; - /* Could use strcmp, but we're not calling or reimplementing this C library function for this use only */ - if(k[0] == 'L' && k[1] == 'o' && k[2] == 'd' && k[3] == 'e' && - k[4] == 'P' && k[5] == 'N' && k[6] == 'G' && k[7] == '\0') { - already_added_id_text = 1; - break; - } - } - if(already_added_id_text == 0) { - state->error = addChunk_tEXt(&outv, "LodePNG", LODEPNG_VERSION_STRING); /*it's shorter as tEXt than as zTXt chunk*/ - if(state->error) goto cleanup; - } - } - /*iTXt*/ - for(i = 0; i != info.itext_num; ++i) { - if(lodepng_strlen(info.itext_keys[i]) > 79) { - state->error = 66; /*text chunk too large*/ - goto cleanup; - } - if(lodepng_strlen(info.itext_keys[i]) < 1) { - state->error = 67; /*text chunk too small*/ - goto cleanup; - } - state->error = addChunk_iTXt( - &outv, state->encoder.text_compression, - info.itext_keys[i], info.itext_langtags[i], info.itext_transkeys[i], info.itext_strings[i], - &state->encoder.zlibsettings); - if(state->error) goto cleanup; - } - - /*unknown chunks between IDAT and IEND*/ - if(info.unknown_chunks_data[2]) { - state->error = addUnknownChunks(&outv, info.unknown_chunks_data[2], info.unknown_chunks_size[2]); - if(state->error) goto cleanup; - } + /*tIME*/ + if (info.time_defined) { + state->error = addChunk_tIME(&outv, &info.time); + if (state->error) + goto cleanup; + } + /*tEXt and/or zTXt*/ + for (i = 0; i != info.text_num; ++i) { + if (lodepng_strlen(info.text_keys[i]) > 79) { + state->error = 66; /*text chunk too large*/ + goto cleanup; + } + if (lodepng_strlen(info.text_keys[i]) < 1) { + state->error = 67; /*text chunk too small*/ + goto cleanup; + } + if (state->encoder.text_compression) { + state->error = addChunk_zTXt( + &outv, info.text_keys[i], info.text_strings[i], &state->encoder.zlibsettings); + if (state->error) + goto cleanup; + } else { + state->error = addChunk_tEXt(&outv, info.text_keys[i], info.text_strings[i]); + if (state->error) + goto cleanup; + } + } + /*LodePNG version id in text chunk*/ + if (state->encoder.add_id) { + unsigned already_added_id_text = 0; + for (i = 0; i != info.text_num; ++i) { + const char *k = info.text_keys[i]; + /* Could use strcmp, but we're not calling or reimplementing + * this C library function for this use only */ + if (k[0] == 'L' && k[1] == 'o' && k[2] == 'd' && k[3] == 'e' && k[4] == 'P' && + k[5] == 'N' && k[6] == 'G' && k[7] == '\0') { + already_added_id_text = 1; + break; + } + } + if (already_added_id_text == 0) { + state->error = + addChunk_tEXt(&outv, "LodePNG", LODEPNG_VERSION_STRING); /*it's shorter as tEXt + than as zTXt chunk*/ + if (state->error) + goto cleanup; + } + } + /*iTXt*/ + for (i = 0; i != info.itext_num; ++i) { + if (lodepng_strlen(info.itext_keys[i]) > 79) { + state->error = 66; /*text chunk too large*/ + goto cleanup; + } + if (lodepng_strlen(info.itext_keys[i]) < 1) { + state->error = 67; /*text chunk too small*/ + goto cleanup; + } + state->error = addChunk_iTXt(&outv, state->encoder.text_compression, info.itext_keys[i], + info.itext_langtags[i], info.itext_transkeys[i], info.itext_strings[i], + &state->encoder.zlibsettings); + if (state->error) + goto cleanup; + } + + /*unknown chunks between IDAT and IEND*/ + if (info.unknown_chunks_data[2]) { + state->error = + addUnknownChunks(&outv, info.unknown_chunks_data[2], info.unknown_chunks_size[2]); + if (state->error) + goto cleanup; + } #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ - state->error = addChunk_IEND(&outv); - if(state->error) goto cleanup; - } + state->error = addChunk_IEND(&outv); + if (state->error) + goto cleanup; + } cleanup: - lodepng_info_cleanup(&info); - lodepng_free(data); - lodepng_color_mode_cleanup(&auto_color); + lodepng_info_cleanup(&info); + lodepng_free(data); + lodepng_color_mode_cleanup(&auto_color); - /*instead of cleaning the vector up, give it to the output*/ - *out = outv.data; - *outsize = outv.size; + /*instead of cleaning the vector up, give it to the output*/ + *out = outv.data; + *outsize = outv.size; - return state->error; + return state->error; } -unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize, const unsigned char* image, - unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { - unsigned error; - LodePNGState state; - lodepng_state_init(&state); - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; - state.info_png.color.colortype = colortype; - state.info_png.color.bitdepth = bitdepth; - lodepng_encode(out, outsize, image, w, h, &state); - error = state.error; - lodepng_state_cleanup(&state); - return error; +unsigned lodepng_encode_memory(unsigned char **out, size_t *outsize, const unsigned char *image, + unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) { + unsigned error; + LodePNGState state; + lodepng_state_init(&state); + state.info_raw.colortype = colortype; + state.info_raw.bitdepth = bitdepth; + state.info_png.color.colortype = colortype; + state.info_png.color.bitdepth = bitdepth; + lodepng_encode(out, outsize, image, w, h, &state); + error = state.error; + lodepng_state_cleanup(&state); + return error; } -unsigned lodepng_encode32(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) { - return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGBA, 8); +unsigned lodepng_encode32( + unsigned char **out, size_t *outsize, const unsigned char *image, unsigned w, unsigned h) { + return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGBA, 8); } -unsigned lodepng_encode24(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) { - return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGB, 8); +unsigned lodepng_encode24( + unsigned char **out, size_t *outsize, const unsigned char *image, unsigned w, unsigned h) { + return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGB, 8); } #ifdef LODEPNG_COMPILE_DISK -unsigned lodepng_encode_file(const char* filename, const unsigned char* image, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - unsigned char* buffer; - size_t buffersize; - unsigned error = lodepng_encode_memory(&buffer, &buffersize, image, w, h, colortype, bitdepth); - if(!error) error = lodepng_save_file(buffer, buffersize, filename); - lodepng_free(buffer); - return error; +unsigned lodepng_encode_file(const char *filename, const unsigned char *image, unsigned w, + unsigned h, LodePNGColorType colortype, unsigned bitdepth) { + unsigned char *buffer; + size_t buffersize; + unsigned error = lodepng_encode_memory(&buffer, &buffersize, image, w, h, colortype, bitdepth); + if (!error) + error = lodepng_save_file(buffer, buffersize, filename); + lodepng_free(buffer); + return error; } -unsigned lodepng_encode32_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) { - return lodepng_encode_file(filename, image, w, h, LCT_RGBA, 8); +unsigned lodepng_encode32_file( + const char *filename, const unsigned char *image, unsigned w, unsigned h) { + return lodepng_encode_file(filename, image, w, h, LCT_RGBA, 8); } -unsigned lodepng_encode24_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) { - return lodepng_encode_file(filename, image, w, h, LCT_RGB, 8); +unsigned lodepng_encode24_file( + const char *filename, const unsigned char *image, unsigned w, unsigned h) { + return lodepng_encode_file(filename, image, w, h, LCT_RGB, 8); } #endif /*LODEPNG_COMPILE_DISK*/ -void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings) { - lodepng_compress_settings_init(&settings->zlibsettings); - settings->filter_palette_zero = 1; - settings->filter_strategy = LFS_MINSUM; - settings->auto_convert = 1; - settings->force_palette = 0; - settings->predefined_filters = 0; +void lodepng_encoder_settings_init(LodePNGEncoderSettings *settings) { + lodepng_compress_settings_init(&settings->zlibsettings); + settings->filter_palette_zero = 1; + settings->filter_strategy = LFS_MINSUM; + settings->auto_convert = 1; + settings->force_palette = 0; + settings->predefined_filters = 0; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - settings->add_id = 0; - settings->text_compression = 1; + settings->add_id = 0; + settings->text_compression = 1; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ } @@ -6661,132 +7599,283 @@ void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings) { This returns the description of a numerical error code in English. This is also the documentation of all the error codes. */ -const char* lodepng_error_text(unsigned code) { - switch(code) { - case 0: return "no error, everything went ok"; - case 1: return "nothing done yet"; /*the Encoder/Decoder has done nothing yet, error checking makes no sense yet*/ - case 10: return "end of input memory reached without huffman end code"; /*while huffman decoding*/ - case 11: return "error in code tree made it jump outside of huffman tree"; /*while huffman decoding*/ - case 13: return "problem while processing dynamic deflate block"; - case 14: return "problem while processing dynamic deflate block"; - case 15: return "problem while processing dynamic deflate block"; - /*this error could happen if there are only 0 or 1 symbols present in the huffman code:*/ - case 16: return "invalid code while processing dynamic deflate block"; - case 17: return "end of out buffer memory reached while inflating"; - case 18: return "invalid distance code while inflating"; - case 19: return "end of out buffer memory reached while inflating"; - case 20: return "invalid deflate block BTYPE encountered while decoding"; - case 21: return "NLEN is not ones complement of LEN in a deflate block"; - - /*end of out buffer memory reached while inflating: - This can happen if the inflated deflate data is longer than the amount of bytes required to fill up - all the pixels of the image, given the color depth and image dimensions. Something that doesn't - happen in a normal, well encoded, PNG image.*/ - case 22: return "end of out buffer memory reached while inflating"; - case 23: return "end of in buffer memory reached while inflating"; - case 24: return "invalid FCHECK in zlib header"; - case 25: return "invalid compression method in zlib header"; - case 26: return "FDICT encountered in zlib header while it's not used for PNG"; - case 27: return "PNG file is smaller than a PNG header"; - /*Checks the magic file header, the first 8 bytes of the PNG file*/ - case 28: return "incorrect PNG signature, it's no PNG or corrupted"; - case 29: return "first chunk is not the header chunk"; - case 30: return "chunk length too large, chunk broken off at end of file"; - case 31: return "illegal PNG color type or bpp"; - case 32: return "illegal PNG compression method"; - case 33: return "illegal PNG filter method"; - case 34: return "illegal PNG interlace method"; - case 35: return "chunk length of a chunk is too large or the chunk too small"; - case 36: return "illegal PNG filter type encountered"; - case 37: return "illegal bit depth for this color type given"; - case 38: return "the palette is too small or too big"; /*0, or more than 256 colors*/ - case 39: return "tRNS chunk before PLTE or has more entries than palette size"; - case 40: return "tRNS chunk has wrong size for grayscale image"; - case 41: return "tRNS chunk has wrong size for RGB image"; - case 42: return "tRNS chunk appeared while it was not allowed for this color type"; - case 43: return "bKGD chunk has wrong size for palette image"; - case 44: return "bKGD chunk has wrong size for grayscale image"; - case 45: return "bKGD chunk has wrong size for RGB image"; - case 48: return "empty input buffer given to decoder. Maybe caused by non-existing file?"; - case 49: return "jumped past memory while generating dynamic huffman tree"; - case 50: return "jumped past memory while generating dynamic huffman tree"; - case 51: return "jumped past memory while inflating huffman block"; - case 52: return "jumped past memory while inflating"; - case 53: return "size of zlib data too small"; - case 54: return "repeat symbol in tree while there was no value symbol yet"; - /*jumped past tree while generating huffman tree, this could be when the - tree will have more leaves than symbols after generating it out of the - given lengths. They call this an oversubscribed dynamic bit lengths tree in zlib.*/ - case 55: return "jumped past tree while generating huffman tree"; - case 56: return "given output image colortype or bitdepth not supported for color conversion"; - case 57: return "invalid CRC encountered (checking CRC can be disabled)"; - case 58: return "invalid ADLER32 encountered (checking ADLER32 can be disabled)"; - case 59: return "requested color conversion not supported"; - case 60: return "invalid window size given in the settings of the encoder (must be 0-32768)"; - case 61: return "invalid BTYPE given in the settings of the encoder (only 0, 1 and 2 are allowed)"; - /*LodePNG leaves the choice of RGB to grayscale conversion formula to the user.*/ - case 62: return "conversion from color to grayscale not supported"; - /*(2^31-1)*/ - case 63: return "length of a chunk too long, max allowed for PNG is 2147483647 bytes per chunk"; - /*this would result in the inability of a deflated block to ever contain an end code. It must be at least 1.*/ - case 64: return "the length of the END symbol 256 in the Huffman tree is 0"; - case 66: return "the length of a text chunk keyword given to the encoder is longer than the maximum of 79 bytes"; - case 67: return "the length of a text chunk keyword given to the encoder is smaller than the minimum of 1 byte"; - case 68: return "tried to encode a PLTE chunk with a palette that has less than 1 or more than 256 colors"; - case 69: return "unknown chunk type with 'critical' flag encountered by the decoder"; - case 71: return "invalid interlace mode given to encoder (must be 0 or 1)"; - case 72: return "while decoding, invalid compression method encountering in zTXt or iTXt chunk (it must be 0)"; - case 73: return "invalid tIME chunk size"; - case 74: return "invalid pHYs chunk size"; - /*length could be wrong, or data chopped off*/ - case 75: return "no null termination char found while decoding text chunk"; - case 76: return "iTXt chunk too short to contain required bytes"; - case 77: return "integer overflow in buffer size"; - case 78: return "failed to open file for reading"; /*file doesn't exist or couldn't be opened for reading*/ - case 79: return "failed to open file for writing"; - case 80: return "tried creating a tree of 0 symbols"; - case 81: return "lazy matching at pos 0 is impossible"; - case 82: return "color conversion to palette requested while a color isn't in palette, or index out of bounds"; - case 83: return "memory allocation failed"; - case 84: return "given image too small to contain all pixels to be encoded"; - case 86: return "impossible offset in lz77 encoding (internal bug)"; - case 87: return "must provide custom zlib function pointer if LODEPNG_COMPILE_ZLIB is not defined"; - case 88: return "invalid filter strategy given for LodePNGEncoderSettings.filter_strategy"; - case 89: return "text chunk keyword too short or long: must have size 1-79"; - /*the windowsize in the LodePNGCompressSettings. Requiring POT(==> & instead of %) makes encoding 12% faster.*/ - case 90: return "windowsize must be a power of two"; - case 91: return "invalid decompressed idat size"; - case 92: return "integer overflow due to too many pixels"; - case 93: return "zero width or height is invalid"; - case 94: return "header chunk must have a size of 13 bytes"; - case 95: return "integer overflow with combined idat chunk size"; - case 96: return "invalid gAMA chunk size"; - case 97: return "invalid cHRM chunk size"; - case 98: return "invalid sRGB chunk size"; - case 99: return "invalid sRGB rendering intent"; - case 100: return "invalid ICC profile color type, the PNG specification only allows RGB or GRAY"; - case 101: return "PNG specification does not allow RGB ICC profile on gray color types and vice versa"; - case 102: return "not allowed to set grayscale ICC profile with colored pixels by PNG specification"; - case 103: return "invalid palette index in bKGD chunk. Maybe it came before PLTE chunk?"; - case 104: return "invalid bKGD color while encoding (e.g. palette index out of range)"; - case 105: return "integer overflow of bitsize"; - case 106: return "PNG file must have PLTE chunk if color type is palette"; - case 107: return "color convert from palette mode requested without setting the palette data in it"; - case 108: return "tried to add more than 256 values to a palette"; - /*this limit can be configured in LodePNGDecompressSettings*/ - case 109: return "tried to decompress zlib or deflate data larger than desired max_output_size"; - case 110: return "custom zlib or inflate decompression failed"; - case 111: return "custom zlib or deflate compression failed"; - /*max text size limit can be configured in LodePNGDecoderSettings. This error prevents - unreasonable memory consumption when decoding due to impossibly large text sizes.*/ - case 112: return "compressed text unreasonably large"; - /*max ICC size limit can be configured in LodePNGDecoderSettings. This error prevents - unreasonable memory consumption when decoding due to impossibly large ICC profile*/ - case 113: return "ICC profile unreasonably large"; - case 114: return "sBIT chunk has wrong size for the color type of the image"; - case 115: return "sBIT value out of range"; - } - return "unknown error code"; +const char *lodepng_error_text(unsigned code) { + switch (code) { + case 0: + return "no error, everything went ok"; + case 1: + return "nothing done yet"; /*the Encoder/Decoder has done nothing yet, + error checking makes no sense + yet*/ + case 10: + return "end of input memory reached without huffman end code"; /*while + huffman + decoding*/ + case 11: + return "error in code tree made it jump outside of huffman tree"; /*while + huffman + decoding*/ + case 13: + return "problem while processing dynamic deflate block"; + case 14: + return "problem while processing dynamic deflate block"; + case 15: + return "problem while processing dynamic deflate block"; + /*this error could happen if there are only 0 or 1 symbols present in the + * huffman code:*/ + case 16: + return "invalid code while processing dynamic deflate block"; + case 17: + return "end of out buffer memory reached while inflating"; + case 18: + return "invalid distance code while inflating"; + case 19: + return "end of out buffer memory reached while inflating"; + case 20: + return "invalid deflate block BTYPE encountered while decoding"; + case 21: + return "NLEN is not ones complement of LEN in a deflate block"; + + /*end of out buffer memory reached while inflating: + This can happen if the inflated deflate data is longer than the amount of + bytes required to fill up all the pixels of the image, given the color depth + and image dimensions. Something that doesn't happen in a normal, well + encoded, PNG image.*/ + case 22: + return "end of out buffer memory reached while inflating"; + case 23: + return "end of in buffer memory reached while inflating"; + case 24: + return "invalid FCHECK in zlib header"; + case 25: + return "invalid compression method in zlib header"; + case 26: + return "FDICT encountered in zlib header while it's not used for PNG"; + case 27: + return "PNG file is smaller than a PNG header"; + /*Checks the magic file header, the first 8 bytes of the PNG file*/ + case 28: + return "incorrect PNG signature, it's no PNG or corrupted"; + case 29: + return "first chunk is not the header chunk"; + case 30: + return "chunk length too large, chunk broken off at end of file"; + case 31: + return "illegal PNG color type or bpp"; + case 32: + return "illegal PNG compression method"; + case 33: + return "illegal PNG filter method"; + case 34: + return "illegal PNG interlace method"; + case 35: + return "chunk length of a chunk is too large or the chunk too small"; + case 36: + return "illegal PNG filter type encountered"; + case 37: + return "illegal bit depth for this color type given"; + case 38: + return "the palette is too small or too big"; /*0, or more than 256 + colors*/ + case 39: + return "tRNS chunk before PLTE or has more entries than palette size"; + case 40: + return "tRNS chunk has wrong size for grayscale image"; + case 41: + return "tRNS chunk has wrong size for RGB image"; + case 42: + return "tRNS chunk appeared while it was not allowed for this color " + "type"; + case 43: + return "bKGD chunk has wrong size for palette image"; + case 44: + return "bKGD chunk has wrong size for grayscale image"; + case 45: + return "bKGD chunk has wrong size for RGB image"; + case 48: + return "empty input buffer given to decoder. Maybe caused by " + "non-existing " + "file?"; + case 49: + return "jumped past memory while generating dynamic huffman tree"; + case 50: + return "jumped past memory while generating dynamic huffman tree"; + case 51: + return "jumped past memory while inflating huffman block"; + case 52: + return "jumped past memory while inflating"; + case 53: + return "size of zlib data too small"; + case 54: + return "repeat symbol in tree while there was no value symbol yet"; + /*jumped past tree while generating huffman tree, this could be when the + tree will have more leaves than symbols after generating it out of the + given lengths. They call this an oversubscribed dynamic bit lengths tree in + zlib.*/ + case 55: + return "jumped past tree while generating huffman tree"; + case 56: + return "given output image colortype or bitdepth not supported for " + "color " + "conversion"; + case 57: + return "invalid CRC encountered (checking CRC can be disabled)"; + case 58: + return "invalid ADLER32 encountered (checking ADLER32 can be disabled)"; + case 59: + return "requested color conversion not supported"; + case 60: + return "invalid window size given in the settings of the encoder (must " + "be " + "0-32768)"; + case 61: + return "invalid BTYPE given in the settings of the encoder (only 0, 1 " + "and " + "2 are allowed)"; + /*LodePNG leaves the choice of RGB to grayscale conversion formula to the + * user.*/ + case 62: + return "conversion from color to grayscale not supported"; + /*(2^31-1)*/ + case 63: + return "length of a chunk too long, max allowed for PNG is 2147483647 " + "bytes per chunk"; + /*this would result in the inability of a deflated block to ever contain an + * end code. It must be at least 1.*/ + case 64: + return "the length of the END symbol 256 in the Huffman tree is 0"; + case 66: + return "the length of a text chunk keyword given to the encoder is " + "longer " + "than the maximum of 79 bytes"; + case 67: + return "the length of a text chunk keyword given to the encoder is " + "smaller " + "than the minimum of 1 byte"; + case 68: + return "tried to encode a PLTE chunk with a palette that has less than " + "1 " + "or more than 256 colors"; + case 69: + return "unknown chunk type with 'critical' flag encountered by the " + "decoder"; + case 71: + return "invalid interlace mode given to encoder (must be 0 or 1)"; + case 72: + return "while decoding, invalid compression method encountering in " + "zTXt or " + "iTXt chunk (it must be 0)"; + case 73: + return "invalid tIME chunk size"; + case 74: + return "invalid pHYs chunk size"; + /*length could be wrong, or data chopped off*/ + case 75: + return "no null termination char found while decoding text chunk"; + case 76: + return "iTXt chunk too short to contain required bytes"; + case 77: + return "integer overflow in buffer size"; + case 78: + return "failed to open file for reading"; /*file doesn't exist or + couldn't + be opened for reading*/ + case 79: + return "failed to open file for writing"; + case 80: + return "tried creating a tree of 0 symbols"; + case 81: + return "lazy matching at pos 0 is impossible"; + case 82: + return "color conversion to palette requested while a color isn't in " + "palette, or index out of bounds"; + case 83: + return "memory allocation failed"; + case 84: + return "given image too small to contain all pixels to be encoded"; + case 86: + return "impossible offset in lz77 encoding (internal bug)"; + case 87: + return "must provide custom zlib function pointer if " + "LODEPNG_COMPILE_ZLIB " + "is not defined"; + case 88: + return "invalid filter strategy given for " + "LodePNGEncoderSettings.filter_strategy"; + case 89: + return "text chunk keyword too short or long: must have size 1-79"; + /*the windowsize in the LodePNGCompressSettings. Requiring POT(==> & instead + * of %) makes encoding 12% faster.*/ + case 90: + return "windowsize must be a power of two"; + case 91: + return "invalid decompressed idat size"; + case 92: + return "integer overflow due to too many pixels"; + case 93: + return "zero width or height is invalid"; + case 94: + return "header chunk must have a size of 13 bytes"; + case 95: + return "integer overflow with combined idat chunk size"; + case 96: + return "invalid gAMA chunk size"; + case 97: + return "invalid cHRM chunk size"; + case 98: + return "invalid sRGB chunk size"; + case 99: + return "invalid sRGB rendering intent"; + case 100: + return "invalid ICC profile color type, the PNG specification only " + "allows " + "RGB or GRAY"; + case 101: + return "PNG specification does not allow RGB ICC profile on gray color " + "types and vice versa"; + case 102: + return "not allowed to set grayscale ICC profile with colored pixels " + "by " + "PNG specification"; + case 103: + return "invalid palette index in bKGD chunk. Maybe it came before PLTE " + "chunk?"; + case 104: + return "invalid bKGD color while encoding (e.g. palette index out of " + "range)"; + case 105: + return "integer overflow of bitsize"; + case 106: + return "PNG file must have PLTE chunk if color type is palette"; + case 107: + return "color convert from palette mode requested without setting the " + "palette data in it"; + case 108: + return "tried to add more than 256 values to a palette"; + /*this limit can be configured in LodePNGDecompressSettings*/ + case 109: + return "tried to decompress zlib or deflate data larger than desired " + "max_output_size"; + case 110: + return "custom zlib or inflate decompression failed"; + case 111: + return "custom zlib or deflate compression failed"; + /*max text size limit can be configured in LodePNGDecoderSettings. This + error prevents unreasonable memory consumption when decoding due to + impossibly large text sizes.*/ + case 112: + return "compressed text unreasonably large"; + /*max ICC size limit can be configured in LodePNGDecoderSettings. This error + prevents unreasonable memory consumption when decoding due to impossibly + large ICC profile*/ + case 113: + return "ICC profile unreasonably large"; + case 114: + return "sBIT chunk has wrong size for the color type of the image"; + case 115: + return "sBIT value out of range"; + } + return "unknown error code"; } #endif /*LODEPNG_COMPILE_ERROR_TEXT*/ @@ -6800,189 +7889,184 @@ const char* lodepng_error_text(unsigned code) { namespace lodepng { #ifdef LODEPNG_COMPILE_DISK -unsigned load_file(std::vector& buffer, const std::string& filename) { - long size = lodepng_filesize(filename.c_str()); - if(size < 0) return 78; - buffer.resize((size_t)size); - return size == 0 ? 0 : lodepng_buffer_file(&buffer[0], (size_t)size, filename.c_str()); +unsigned load_file(std::vector &buffer, const std::string &filename) { + long size = lodepng_filesize(filename.c_str()); + if (size < 0) + return 78; + buffer.resize((size_t)size); + return size == 0 ? 0 : lodepng_buffer_file(&buffer[0], (size_t)size, filename.c_str()); } -/*write given buffer to the file, overwriting the file, it doesn't append to it.*/ -unsigned save_file(const std::vector& buffer, const std::string& filename) { - return lodepng_save_file(buffer.empty() ? 0 : &buffer[0], buffer.size(), filename.c_str()); +/*write given buffer to the file, overwriting the file, it doesn't append to + * it.*/ +unsigned save_file(const std::vector &buffer, const std::string &filename) { + return lodepng_save_file(buffer.empty() ? 0 : &buffer[0], buffer.size(), filename.c_str()); } #endif /* LODEPNG_COMPILE_DISK */ #ifdef LODEPNG_COMPILE_ZLIB #ifdef LODEPNG_COMPILE_DECODER -unsigned decompress(std::vector& out, const unsigned char* in, size_t insize, - const LodePNGDecompressSettings& settings) { - unsigned char* buffer = 0; - size_t buffersize = 0; - unsigned error = zlib_decompress(&buffer, &buffersize, 0, in, insize, &settings); - if(buffer) { - out.insert(out.end(), buffer, &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned decompress(std::vector& out, const std::vector& in, - const LodePNGDecompressSettings& settings) { - return decompress(out, in.empty() ? 0 : &in[0], in.size(), settings); +unsigned decompress(std::vector &out, const unsigned char *in, size_t insize, + const LodePNGDecompressSettings &settings) { + unsigned char *buffer = 0; + size_t buffersize = 0; + unsigned error = zlib_decompress(&buffer, &buffersize, 0, in, insize, &settings); + if (buffer) { + out.insert(out.end(), buffer, &buffer[buffersize]); + lodepng_free(buffer); + } + return error; +} + +unsigned decompress(std::vector &out, const std::vector &in, + const LodePNGDecompressSettings &settings) { + return decompress(out, in.empty() ? 0 : &in[0], in.size(), settings); } #endif /* LODEPNG_COMPILE_DECODER */ #ifdef LODEPNG_COMPILE_ENCODER -unsigned compress(std::vector& out, const unsigned char* in, size_t insize, - const LodePNGCompressSettings& settings) { - unsigned char* buffer = 0; - size_t buffersize = 0; - unsigned error = zlib_compress(&buffer, &buffersize, in, insize, &settings); - if(buffer) { - out.insert(out.end(), buffer, &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned compress(std::vector& out, const std::vector& in, - const LodePNGCompressSettings& settings) { - return compress(out, in.empty() ? 0 : &in[0], in.size(), settings); +unsigned compress(std::vector &out, const unsigned char *in, size_t insize, + const LodePNGCompressSettings &settings) { + unsigned char *buffer = 0; + size_t buffersize = 0; + unsigned error = zlib_compress(&buffer, &buffersize, in, insize, &settings); + if (buffer) { + out.insert(out.end(), buffer, &buffer[buffersize]); + lodepng_free(buffer); + } + return error; +} + +unsigned compress(std::vector &out, const std::vector &in, + const LodePNGCompressSettings &settings) { + return compress(out, in.empty() ? 0 : &in[0], in.size(), settings); } #endif /* LODEPNG_COMPILE_ENCODER */ #endif /* LODEPNG_COMPILE_ZLIB */ - #ifdef LODEPNG_COMPILE_PNG -State::State() { - lodepng_state_init(this); -} +State::State() { lodepng_state_init(this); } -State::State(const State& other) { - lodepng_state_init(this); - lodepng_state_copy(this, &other); +State::State(const State &other) { + lodepng_state_init(this); + lodepng_state_copy(this, &other); } -State::~State() { - lodepng_state_cleanup(this); -} +State::~State() { lodepng_state_cleanup(this); } -State& State::operator=(const State& other) { - lodepng_state_copy(this, &other); - return *this; +State &State::operator=(const State &other) { + lodepng_state_copy(this, &other); + return *this; } #ifdef LODEPNG_COMPILE_DECODER -unsigned decode(std::vector& out, unsigned& w, unsigned& h, const unsigned char* in, - size_t insize, LodePNGColorType colortype, unsigned bitdepth) { - unsigned char* buffer = 0; - unsigned error = lodepng_decode_memory(&buffer, &w, &h, in, insize, colortype, bitdepth); - if(buffer && !error) { - State state; - state.info_raw.colortype = colortype; - state.info_raw.bitdepth = bitdepth; - size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); - out.insert(out.end(), buffer, &buffer[buffersize]); - } - lodepng_free(buffer); - return error; +unsigned decode(std::vector &out, unsigned &w, unsigned &h, const unsigned char *in, + size_t insize, LodePNGColorType colortype, unsigned bitdepth) { + unsigned char *buffer = 0; + unsigned error = lodepng_decode_memory(&buffer, &w, &h, in, insize, colortype, bitdepth); + if (buffer && !error) { + State state; + state.info_raw.colortype = colortype; + state.info_raw.bitdepth = bitdepth; + size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); + out.insert(out.end(), buffer, &buffer[buffersize]); + } + lodepng_free(buffer); + return error; } -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const std::vector& in, LodePNGColorType colortype, unsigned bitdepth) { - return decode(out, w, h, in.empty() ? 0 : &in[0], (unsigned)in.size(), colortype, bitdepth); +unsigned decode(std::vector &out, unsigned &w, unsigned &h, + const std::vector &in, LodePNGColorType colortype, unsigned bitdepth) { + return decode(out, w, h, in.empty() ? 0 : &in[0], (unsigned)in.size(), colortype, bitdepth); } -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - State& state, - const unsigned char* in, size_t insize) { - unsigned char* buffer = NULL; - unsigned error = lodepng_decode(&buffer, &w, &h, &state, in, insize); - if(buffer && !error) { - size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); - out.insert(out.end(), buffer, &buffer[buffersize]); - } - lodepng_free(buffer); - return error; +unsigned decode(std::vector &out, unsigned &w, unsigned &h, State &state, + const unsigned char *in, size_t insize) { + unsigned char *buffer = NULL; + unsigned error = lodepng_decode(&buffer, &w, &h, &state, in, insize); + if (buffer && !error) { + size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw); + out.insert(out.end(), buffer, &buffer[buffersize]); + } + lodepng_free(buffer); + return error; } -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - State& state, - const std::vector& in) { - return decode(out, w, h, state, in.empty() ? 0 : &in[0], in.size()); +unsigned decode(std::vector &out, unsigned &w, unsigned &h, State &state, + const std::vector &in) { + return decode(out, w, h, state, in.empty() ? 0 : &in[0], in.size()); } #ifdef LODEPNG_COMPILE_DISK -unsigned decode(std::vector& out, unsigned& w, unsigned& h, const std::string& filename, - LodePNGColorType colortype, unsigned bitdepth) { - std::vector buffer; - /* safe output values in case error happens */ - w = h = 0; - unsigned error = load_file(buffer, filename); - if(error) return error; - return decode(out, w, h, buffer, colortype, bitdepth); +unsigned decode(std::vector &out, unsigned &w, unsigned &h, + const std::string &filename, LodePNGColorType colortype, unsigned bitdepth) { + std::vector buffer; + /* safe output values in case error happens */ + w = h = 0; + unsigned error = load_file(buffer, filename); + if (error) + return error; + return decode(out, w, h, buffer, colortype, bitdepth); } #endif /* LODEPNG_COMPILE_DECODER */ #endif /* LODEPNG_COMPILE_DISK */ #ifdef LODEPNG_COMPILE_ENCODER -unsigned encode(std::vector& out, const unsigned char* in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - unsigned char* buffer; - size_t buffersize; - unsigned error = lodepng_encode_memory(&buffer, &buffersize, in, w, h, colortype, bitdepth); - if(buffer) { - out.insert(out.end(), buffer, &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned encode(std::vector& out, - const std::vector& in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84; - return encode(out, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); -} - -unsigned encode(std::vector& out, - const unsigned char* in, unsigned w, unsigned h, - State& state) { - unsigned char* buffer; - size_t buffersize; - unsigned error = lodepng_encode(&buffer, &buffersize, in, w, h, &state); - if(buffer) { - out.insert(out.end(), buffer, &buffer[buffersize]); - lodepng_free(buffer); - } - return error; -} - -unsigned encode(std::vector& out, - const std::vector& in, unsigned w, unsigned h, - State& state) { - if(lodepng_get_raw_size(w, h, &state.info_raw) > in.size()) return 84; - return encode(out, in.empty() ? 0 : &in[0], w, h, state); +unsigned encode(std::vector &out, const unsigned char *in, unsigned w, unsigned h, + LodePNGColorType colortype, unsigned bitdepth) { + unsigned char *buffer; + size_t buffersize; + unsigned error = lodepng_encode_memory(&buffer, &buffersize, in, w, h, colortype, bitdepth); + if (buffer) { + out.insert(out.end(), buffer, &buffer[buffersize]); + lodepng_free(buffer); + } + return error; +} + +unsigned encode(std::vector &out, const std::vector &in, unsigned w, + unsigned h, LodePNGColorType colortype, unsigned bitdepth) { + if (lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) + return 84; + return encode(out, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); +} + +unsigned encode(std::vector &out, const unsigned char *in, unsigned w, unsigned h, + State &state) { + unsigned char *buffer; + size_t buffersize; + unsigned error = lodepng_encode(&buffer, &buffersize, in, w, h, &state); + if (buffer) { + out.insert(out.end(), buffer, &buffer[buffersize]); + lodepng_free(buffer); + } + return error; +} + +unsigned encode(std::vector &out, const std::vector &in, unsigned w, + unsigned h, State &state) { + if (lodepng_get_raw_size(w, h, &state.info_raw) > in.size()) + return 84; + return encode(out, in.empty() ? 0 : &in[0], w, h, state); } #ifdef LODEPNG_COMPILE_DISK -unsigned encode(const std::string& filename, - const unsigned char* in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - std::vector buffer; - unsigned error = encode(buffer, in, w, h, colortype, bitdepth); - if(!error) error = save_file(buffer, filename); - return error; -} - -unsigned encode(const std::string& filename, - const std::vector& in, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth) { - if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84; - return encode(filename, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); +unsigned encode(const std::string &filename, const unsigned char *in, unsigned w, unsigned h, + LodePNGColorType colortype, unsigned bitdepth) { + std::vector buffer; + unsigned error = encode(buffer, in, w, h, colortype, bitdepth); + if (!error) + error = save_file(buffer, filename); + return error; +} + +unsigned encode(const std::string &filename, const std::vector &in, unsigned w, + unsigned h, LodePNGColorType colortype, unsigned bitdepth) { + if (lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) + return 84; + return encode(filename, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth); } #endif /* LODEPNG_COMPILE_DISK */ #endif /* LODEPNG_COMPILE_ENCODER */ diff --git a/libpng/lodepng.h b/libpng/lodepng.h index 3f3649d..01dbc0f 100644 --- a/libpng/lodepng.h +++ b/libpng/lodepng.h @@ -11,16 +11,16 @@ Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. - 3. This notice may not be removed or altered from any source - distribution. + 3. This notice may not be removed or altered from any source + distribution. */ #ifndef LODEPNG_H @@ -28,7 +28,7 @@ freely, subject to the following restrictions: #include /*for size_t*/ -extern const char* LODEPNG_VERSION_STRING; +extern const char *LODEPNG_VERSION_STRING; /* The following #defines are used to create code sections. They can be disabled @@ -40,35 +40,41 @@ compiler command to disable them without modifying this header, e.g. /*deflate & zlib. If disabled, you must specify alternative zlib functions in the custom_zlib field of the compress and decompress settings*/ #ifndef LODEPNG_NO_COMPILE_ZLIB -/*pass -DLODEPNG_NO_COMPILE_ZLIB to the compiler to disable this, or comment out LODEPNG_COMPILE_ZLIB below*/ +/*pass -DLODEPNG_NO_COMPILE_ZLIB to the compiler to disable this, or comment out + * LODEPNG_COMPILE_ZLIB below*/ #define LODEPNG_COMPILE_ZLIB #endif /*png encoder and png decoder*/ #ifndef LODEPNG_NO_COMPILE_PNG -/*pass -DLODEPNG_NO_COMPILE_PNG to the compiler to disable this, or comment out LODEPNG_COMPILE_PNG below*/ +/*pass -DLODEPNG_NO_COMPILE_PNG to the compiler to disable this, or comment out + * LODEPNG_COMPILE_PNG below*/ #define LODEPNG_COMPILE_PNG #endif /*deflate&zlib decoder and png decoder*/ #ifndef LODEPNG_NO_COMPILE_DECODER -/*pass -DLODEPNG_NO_COMPILE_DECODER to the compiler to disable this, or comment out LODEPNG_COMPILE_DECODER below*/ +/*pass -DLODEPNG_NO_COMPILE_DECODER to the compiler to disable this, or comment + * out LODEPNG_COMPILE_DECODER below*/ #define LODEPNG_COMPILE_DECODER #endif /*deflate&zlib encoder and png encoder*/ #ifndef LODEPNG_NO_COMPILE_ENCODER -/*pass -DLODEPNG_NO_COMPILE_ENCODER to the compiler to disable this, or comment out LODEPNG_COMPILE_ENCODER below*/ +/*pass -DLODEPNG_NO_COMPILE_ENCODER to the compiler to disable this, or comment + * out LODEPNG_COMPILE_ENCODER below*/ #define LODEPNG_COMPILE_ENCODER #endif /*the optional built in harddisk file loading and saving functions*/ #ifndef LODEPNG_NO_COMPILE_DISK -/*pass -DLODEPNG_NO_COMPILE_DISK to the compiler to disable this, or comment out LODEPNG_COMPILE_DISK below*/ +/*pass -DLODEPNG_NO_COMPILE_DISK to the compiler to disable this, or comment out + * LODEPNG_COMPILE_DISK below*/ #define LODEPNG_COMPILE_DISK #endif -/*support for chunks other than IHDR, IDAT, PLTE, tRNS, IEND: ancillary and unknown chunks*/ +/*support for chunks other than IHDR, IDAT, PLTE, tRNS, IEND: ancillary and + * unknown chunks*/ #ifndef LODEPNG_NO_COMPILE_ANCILLARY_CHUNKS /*pass -DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS to the compiler to disable this, or comment out LODEPNG_COMPILE_ANCILLARY_CHUNKS below*/ @@ -82,83 +88,87 @@ or comment out LODEPNG_COMPILE_ERROR_TEXT below*/ #define LODEPNG_COMPILE_ERROR_TEXT #endif -/*Compile the default allocators (C's free, malloc and realloc). If you disable this, -you can define the functions lodepng_free, lodepng_malloc and lodepng_realloc in your -source files with custom allocators.*/ +/*Compile the default allocators (C's free, malloc and realloc). If you disable +this, you can define the functions lodepng_free, lodepng_malloc and +lodepng_realloc in your source files with custom allocators.*/ #ifndef LODEPNG_NO_COMPILE_ALLOCATORS -/*pass -DLODEPNG_NO_COMPILE_ALLOCATORS to the compiler to disable the built-in ones, -or comment out LODEPNG_COMPILE_ALLOCATORS below*/ +/*pass -DLODEPNG_NO_COMPILE_ALLOCATORS to the compiler to disable the built-in +ones, or comment out LODEPNG_COMPILE_ALLOCATORS below*/ #define LODEPNG_COMPILE_ALLOCATORS #endif /*Disable built-in CRC function, in that case a custom implementation of lodepng_crc32 must be defined externally so that it can be linked in. -The default built-in CRC code comes with 8KB of lookup tables, so for memory constrained environment you may want it -disabled and provide a much smaller implementation externally as said above. You can find such an example implementation -in a comment in the lodepng.c(pp) file in the 'else' case of the searchable LODEPNG_COMPILE_CRC section.*/ +The default built-in CRC code comes with 8KB of lookup tables, so for memory +constrained environment you may want it disabled and provide a much smaller +implementation externally as said above. You can find such an example +implementation in a comment in the lodepng.c(pp) file in the 'else' case of the +searchable LODEPNG_COMPILE_CRC section.*/ #ifndef LODEPNG_NO_COMPILE_CRC /*pass -DLODEPNG_NO_COMPILE_CRC to the compiler to disable the built-in one, or comment out LODEPNG_COMPILE_CRC below*/ #define LODEPNG_COMPILE_CRC #endif -/*compile the C++ version (you can disable the C++ wrapper here even when compiling for C++)*/ +/*compile the C++ version (you can disable the C++ wrapper here even when + * compiling for C++)*/ #ifdef __cplusplus #ifndef LODEPNG_NO_COMPILE_CPP -/*pass -DLODEPNG_NO_COMPILE_CPP to the compiler to disable C++ (not needed if a C-only compiler), -or comment out LODEPNG_COMPILE_CPP below*/ +/*pass -DLODEPNG_NO_COMPILE_CPP to the compiler to disable C++ (not needed if a +C-only compiler), or comment out LODEPNG_COMPILE_CPP below*/ #define LODEPNG_COMPILE_CPP #endif #endif #ifdef LODEPNG_COMPILE_CPP -#include #include +#include #endif /*LODEPNG_COMPILE_CPP*/ #ifdef LODEPNG_COMPILE_PNG /*The PNG color types (also used for raw image).*/ typedef enum LodePNGColorType { - LCT_GREY = 0, /*grayscale: 1,2,4,8,16 bit*/ - LCT_RGB = 2, /*RGB: 8,16 bit*/ - LCT_PALETTE = 3, /*palette: 1,2,4,8 bit*/ - LCT_GREY_ALPHA = 4, /*grayscale with alpha: 8,16 bit*/ - LCT_RGBA = 6, /*RGB with alpha: 8,16 bit*/ - /*LCT_MAX_OCTET_VALUE lets the compiler allow this enum to represent any invalid - byte value from 0 to 255 that could be present in an invalid PNG file header. Do - not use, compare with or set the name LCT_MAX_OCTET_VALUE, instead either use - the valid color type names above, or numeric values like 1 or 7 when checking for - particular disallowed color type byte values, or cast to integer to print it.*/ - LCT_MAX_OCTET_VALUE = 255 + LCT_GREY = 0, /*grayscale: 1,2,4,8,16 bit*/ + LCT_RGB = 2, /*RGB: 8,16 bit*/ + LCT_PALETTE = 3, /*palette: 1,2,4,8 bit*/ + LCT_GREY_ALPHA = 4, /*grayscale with alpha: 8,16 bit*/ + LCT_RGBA = 6, /*RGB with alpha: 8,16 bit*/ + /*LCT_MAX_OCTET_VALUE lets the compiler allow this enum to represent any + invalid byte value from 0 to 255 that could be present in an invalid PNG + file header. Do not use, compare with or set the name LCT_MAX_OCTET_VALUE, + instead either use the valid color type names above, or numeric values like + 1 or 7 when checking for particular disallowed color type byte values, or + cast to integer to print it.*/ + LCT_MAX_OCTET_VALUE = 255 } LodePNGColorType; #ifdef LODEPNG_COMPILE_DECODER /* Converts PNG data in memory to raw pixel data. out: Output parameter. Pointer to buffer that will contain the raw pixel data. - After decoding, its size is w * h * (bytes per pixel) bytes larger than - initially. Bytes per pixel depends on colortype and bitdepth. - Must be freed after usage with free(*out). - Note: for 16-bit per channel colors, uses big endian format like PNG does. + After decoding, its size is w * h * (bytes per pixel) bytes larger than + initially. Bytes per pixel depends on colortype and bitdepth. + Must be freed after usage with free(*out). + Note: for 16-bit per channel colors, uses big endian format like PNG does. w: Output parameter. Pointer to width of pixel data. h: Output parameter. Pointer to height of pixel data. in: Memory buffer with the PNG file. insize: size of the in buffer. -colortype: the desired color type for the raw output image. See explanation on PNG color types. -bitdepth: the desired bit depth for the raw output image. See explanation on PNG color types. -Return value: LodePNG error code (0 means no error). +colortype: the desired color type for the raw output image. See explanation on +PNG color types. bitdepth: the desired bit depth for the raw output image. See +explanation on PNG color types. Return value: LodePNG error code (0 means no +error). */ -unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, - const unsigned char* in, size_t insize, - LodePNGColorType colortype, unsigned bitdepth); +unsigned lodepng_decode_memory(unsigned char **out, unsigned *w, unsigned *h, + const unsigned char *in, size_t insize, LodePNGColorType colortype, unsigned bitdepth); /*Same as lodepng_decode_memory, but always decodes to 32-bit RGBA raw image*/ -unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h, - const unsigned char* in, size_t insize); +unsigned lodepng_decode32( + unsigned char **out, unsigned *w, unsigned *h, const unsigned char *in, size_t insize); /*Same as lodepng_decode_memory, but always decodes to 24-bit RGB raw image*/ -unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h, - const unsigned char* in, size_t insize); +unsigned lodepng_decode24( + unsigned char **out, unsigned *w, unsigned *h, const unsigned char *in, size_t insize); #ifdef LODEPNG_COMPILE_DISK /* @@ -167,27 +177,23 @@ Same as the other decode functions, but instead takes a filename as input. NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and decode in-memory.*/ -unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h, - const char* filename, - LodePNGColorType colortype, unsigned bitdepth); +unsigned lodepng_decode_file(unsigned char **out, unsigned *w, unsigned *h, const char *filename, + LodePNGColorType colortype, unsigned bitdepth); /*Same as lodepng_decode_file, but always decodes to 32-bit RGBA raw image. NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and decode in-memory.*/ -unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h, - const char* filename); +unsigned lodepng_decode32_file(unsigned char **out, unsigned *w, unsigned *h, const char *filename); /*Same as lodepng_decode_file, but always decodes to 24-bit RGB raw image. NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and decode in-memory.*/ -unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h, - const char* filename); +unsigned lodepng_decode24_file(unsigned char **out, unsigned *w, unsigned *h, const char *filename); #endif /*LODEPNG_COMPILE_DISK*/ #endif /*LODEPNG_COMPILE_DECODER*/ - #ifdef LODEPNG_COMPILE_ENCODER /* Converts raw pixel data into a PNG image in memory. The colortype and bitdepth @@ -195,27 +201,27 @@ Converts raw pixel data into a PNG image in memory. The colortype and bitdepth by the colortype, bitdepth and content of the input pixel data. Note: for 16-bit per channel colors, needs big endian format like PNG does. out: Output parameter. Pointer to buffer that will contain the PNG image data. - Must be freed after usage with free(*out). + Must be freed after usage with free(*out). outsize: Output parameter. Pointer to the size in bytes of the out buffer. image: The raw pixel data to encode. The size of this buffer should be - w * h * (bytes per pixel), bytes per pixel depends on colortype and bitdepth. -w: width of the raw pixel data in pixels. -h: height of the raw pixel data in pixels. -colortype: the color type of the raw input image. See explanation on PNG color types. -bitdepth: the bit depth of the raw input image. See explanation on PNG color types. -Return value: LodePNG error code (0 means no error). + w * h * (bytes per pixel), bytes per pixel depends on colortype and +bitdepth. w: width of the raw pixel data in pixels. h: height of the raw pixel +data in pixels. colortype: the color type of the raw input image. See +explanation on PNG color types. bitdepth: the bit depth of the raw input image. +See explanation on PNG color types. Return value: LodePNG error code (0 means no +error). */ -unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize, - const unsigned char* image, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth); +unsigned lodepng_encode_memory(unsigned char **out, size_t *outsize, const unsigned char *image, + unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth); -/*Same as lodepng_encode_memory, but always encodes from 32-bit RGBA raw image.*/ -unsigned lodepng_encode32(unsigned char** out, size_t* outsize, - const unsigned char* image, unsigned w, unsigned h); +/*Same as lodepng_encode_memory, but always encodes from 32-bit RGBA raw + * image.*/ +unsigned lodepng_encode32( + unsigned char **out, size_t *outsize, const unsigned char *image, unsigned w, unsigned h); /*Same as lodepng_encode_memory, but always encodes from 24-bit RGB raw image.*/ -unsigned lodepng_encode24(unsigned char** out, size_t* outsize, - const unsigned char* image, unsigned w, unsigned h); +unsigned lodepng_encode24( + unsigned char **out, size_t *outsize, const unsigned char *image, unsigned w, unsigned h); #ifdef LODEPNG_COMPILE_DISK /* @@ -226,38 +232,35 @@ NOTE: This overwrites existing files without warning! NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and encode in-memory.*/ -unsigned lodepng_encode_file(const char* filename, - const unsigned char* image, unsigned w, unsigned h, - LodePNGColorType colortype, unsigned bitdepth); +unsigned lodepng_encode_file(const char *filename, const unsigned char *image, unsigned w, + unsigned h, LodePNGColorType colortype, unsigned bitdepth); /*Same as lodepng_encode_file, but always encodes from 32-bit RGBA raw image. NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and encode in-memory.*/ -unsigned lodepng_encode32_file(const char* filename, - const unsigned char* image, unsigned w, unsigned h); +unsigned lodepng_encode32_file( + const char *filename, const unsigned char *image, unsigned w, unsigned h); /*Same as lodepng_encode_file, but always encodes from 24-bit RGB raw image. NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and encode in-memory.*/ -unsigned lodepng_encode24_file(const char* filename, - const unsigned char* image, unsigned w, unsigned h); +unsigned lodepng_encode24_file( + const char *filename, const unsigned char *image, unsigned w, unsigned h); #endif /*LODEPNG_COMPILE_DISK*/ #endif /*LODEPNG_COMPILE_ENCODER*/ - #ifdef LODEPNG_COMPILE_CPP namespace lodepng { #ifdef LODEPNG_COMPILE_DECODER /*Same as lodepng_decode_memory, but decodes to an std::vector. The colortype is the format to output the pixels to. Default is RGBA 8-bit per channel.*/ -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const unsigned char* in, size_t insize, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const std::vector& in, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +unsigned decode(std::vector &out, unsigned &w, unsigned &h, const unsigned char *in, + size_t insize, LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +unsigned decode(std::vector &out, unsigned &w, unsigned &h, + const std::vector &in, LodePNGColorType colortype = LCT_RGBA, + unsigned bitdepth = 8); #ifdef LODEPNG_COMPILE_DISK /* Converts PNG file from disk to raw pixel data in memory. @@ -266,21 +269,18 @@ Same as the other decode functions, but instead takes a filename as input. NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and decode in-memory. */ -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - const std::string& filename, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +unsigned decode(std::vector &out, unsigned &w, unsigned &h, + const std::string &filename, LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); #endif /* LODEPNG_COMPILE_DISK */ #endif /* LODEPNG_COMPILE_DECODER */ #ifdef LODEPNG_COMPILE_ENCODER /*Same as lodepng_encode_memory, but encodes to an std::vector. colortype is that of the raw input data. The output PNG color type will be auto chosen.*/ -unsigned encode(std::vector& out, - const unsigned char* in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -unsigned encode(std::vector& out, - const std::vector& in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +unsigned encode(std::vector &out, const unsigned char *in, unsigned w, unsigned h, + LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +unsigned encode(std::vector &out, const std::vector &in, unsigned w, + unsigned h, LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); #ifdef LODEPNG_COMPILE_DISK /* Converts 32-bit RGBA raw pixel data into a PNG file on disk. @@ -291,12 +291,10 @@ NOTE: This overwrites existing files without warning! NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and decode in-memory. */ -unsigned encode(const std::string& filename, - const unsigned char* in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); -unsigned encode(const std::string& filename, - const std::vector& in, unsigned w, unsigned h, - LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +unsigned encode(const std::string &filename, const unsigned char *in, unsigned w, unsigned h, + LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); +unsigned encode(const std::string &filename, const std::vector &in, unsigned w, + unsigned h, LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8); #endif /* LODEPNG_COMPILE_DISK */ #endif /* LODEPNG_COMPILE_ENCODER */ } /* namespace lodepng */ @@ -305,41 +303,46 @@ unsigned encode(const std::string& filename, #ifdef LODEPNG_COMPILE_ERROR_TEXT /*Returns an English description of the numerical error code.*/ -const char* lodepng_error_text(unsigned code); +const char *lodepng_error_text(unsigned code); #endif /*LODEPNG_COMPILE_ERROR_TEXT*/ #ifdef LODEPNG_COMPILE_DECODER /*Settings for zlib decompression*/ typedef struct LodePNGDecompressSettings LodePNGDecompressSettings; + struct LodePNGDecompressSettings { - /* Check LodePNGDecoderSettings for more ignorable errors such as ignore_crc */ - unsigned ignore_adler32; /*if 1, continue and don't give an error message if the Adler32 checksum is corrupted*/ - unsigned ignore_nlen; /*ignore complement of len checksum in uncompressed blocks*/ - - /*Maximum decompressed size, beyond this the decoder may (and is encouraged to) stop decoding, - return an error, output a data size > max_output_size and all the data up to that point. This is - not hard limit nor a guarantee, but can prevent excessive memory usage. This setting is - ignored by the PNG decoder, but is used by the deflate/zlib decoder and can be used by custom ones. - Set to 0 to impose no limit (the default).*/ - size_t max_output_size; - - /*use custom zlib decoder instead of built in one (default: null). - Should return 0 if success, any non-0 if error (numeric value not exposed).*/ - unsigned (*custom_zlib)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGDecompressSettings*); - /*use custom deflate decoder instead of built in one (default: null) - if custom_zlib is not null, custom_inflate is ignored (the zlib format uses deflate). - Should return 0 if success, any non-0 if error (numeric value not exposed).*/ - unsigned (*custom_inflate)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGDecompressSettings*); - - const void* custom_context; /*optional custom settings for custom functions*/ + /* Check LodePNGDecoderSettings for more ignorable errors such as ignore_crc + */ + unsigned ignore_adler32; /*if 1, continue and don't give an error message if + the Adler32 checksum is corrupted*/ + unsigned ignore_nlen; /*ignore complement of len checksum in uncompressed + blocks*/ + + /*Maximum decompressed size, beyond this the decoder may (and is encouraged + to) stop decoding, return an error, output a data size > max_output_size and + all the data up to that point. This is not hard limit nor a guarantee, but + can prevent excessive memory usage. This setting is ignored by the PNG + decoder, but is used by the deflate/zlib decoder and can be used by custom + ones. Set to 0 to impose no limit (the default).*/ + size_t max_output_size; + + /*use custom zlib decoder instead of built in one (default: null). + Should return 0 if success, any non-0 if error (numeric value not + exposed).*/ + unsigned (*custom_zlib)(unsigned char **, size_t *, const unsigned char *, size_t, + const LodePNGDecompressSettings *); + /*use custom deflate decoder instead of built in one (default: null) + if custom_zlib is not null, custom_inflate is ignored (the zlib format uses + deflate). Should return 0 if success, any non-0 if error (numeric value not + exposed).*/ + unsigned (*custom_inflate)(unsigned char **, size_t *, const unsigned char *, size_t, + const LodePNGDecompressSettings *); + + const void *custom_context; /*optional custom settings for custom functions*/ }; extern const LodePNGDecompressSettings lodepng_default_decompress_settings; -void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings); +void lodepng_decompress_settings_init(LodePNGDecompressSettings *settings); #endif /*LODEPNG_COMPILE_DECODER*/ #ifdef LODEPNG_COMPILE_ENCODER @@ -348,31 +351,36 @@ Settings for zlib compression. Tweaking these settings tweaks the balance between speed and compression ratio. */ typedef struct LodePNGCompressSettings LodePNGCompressSettings; + struct LodePNGCompressSettings /*deflate = compress*/ { - /*LZ77 related settings*/ - unsigned btype; /*the block type for LZ (0, 1, 2 or 3, see zlib standard). Should be 2 for proper compression.*/ - unsigned use_lz77; /*whether or not to use LZ77. Should be 1 for proper compression.*/ - unsigned windowsize; /*must be a power of two <= 32768. higher compresses more but is slower. Default value: 2048.*/ - unsigned minmatch; /*minimum lz77 length. 3 is normally best, 6 can be better for some PNGs. Default: 0*/ - unsigned nicematch; /*stop searching if >= this length found. Set to 258 for best compression. Default: 128*/ - unsigned lazymatching; /*use lazy matching: better compression but a bit slower. Default: true*/ - - /*use custom zlib encoder instead of built in one (default: null)*/ - unsigned (*custom_zlib)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGCompressSettings*); - /*use custom deflate encoder instead of built in one (default: null) - if custom_zlib is used, custom_deflate is ignored since only the built in - zlib function will call custom_deflate*/ - unsigned (*custom_deflate)(unsigned char**, size_t*, - const unsigned char*, size_t, - const LodePNGCompressSettings*); - - const void* custom_context; /*optional custom settings for custom functions*/ + /*LZ77 related settings*/ + unsigned btype; /*the block type for LZ (0, 1, 2 or 3, see zlib standard). + Should be 2 for proper compression.*/ + unsigned use_lz77; /*whether or not to use LZ77. Should be 1 for proper + compression.*/ + unsigned windowsize; /*must be a power of two <= 32768. higher compresses + more but is slower. Default value: 2048.*/ + unsigned minmatch; /*minimum lz77 length. 3 is normally best, 6 can be + better for some PNGs. Default: 0*/ + unsigned nicematch; /*stop searching if >= this length found. Set to 258 for + best compression. Default: 128*/ + unsigned lazymatching; /*use lazy matching: better compression but a bit + slower. Default: true*/ + + /*use custom zlib encoder instead of built in one (default: null)*/ + unsigned (*custom_zlib)( + unsigned char **, size_t *, const unsigned char *, size_t, const LodePNGCompressSettings *); + /*use custom deflate encoder instead of built in one (default: null) + if custom_zlib is used, custom_deflate is ignored since only the built in + zlib function will call custom_deflate*/ + unsigned (*custom_deflate)( + unsigned char **, size_t *, const unsigned char *, size_t, const LodePNGCompressSettings *); + + const void *custom_context; /*optional custom settings for custom functions*/ }; extern const LodePNGCompressSettings lodepng_default_compress_settings; -void lodepng_compress_settings_init(LodePNGCompressSettings* settings); +void lodepng_compress_settings_init(LodePNGCompressSettings *settings); #endif /*LODEPNG_COMPILE_ENCODER*/ #ifdef LODEPNG_COMPILE_PNG @@ -382,345 +390,393 @@ bits to RGBA colors. This information is the same as used in the PNG file format, and is used both for PNG and raw image data in LodePNG. */ typedef struct LodePNGColorMode { - /*header (IHDR)*/ - LodePNGColorType colortype; /*color type, see PNG standard or documentation further in this header file*/ - unsigned bitdepth; /*bits per sample, see PNG standard or documentation further in this header file*/ - - /* - palette (PLTE and tRNS) - - Dynamically allocated with the colors of the palette, including alpha. - This field may not be allocated directly, use lodepng_color_mode_init first, - then lodepng_palette_add per color to correctly initialize it (to ensure size - of exactly 1024 bytes). - - The alpha channels must be set as well, set them to 255 for opaque images. - - When decoding, with the default settings you can ignore this palette, since - LodePNG already fills the palette colors in the pixels of the raw RGBA output, - but when decoding to the original PNG color mode it is needed to reconstruct - the colors. - - The palette is only supported for color type 3. - */ - unsigned char* palette; /*palette in RGBARGBA... order. Must be either 0, or when allocated must have 1024 bytes*/ - size_t palettesize; /*palette size in number of colors (amount of used bytes is 4 * palettesize)*/ - - /* - transparent color key (tRNS) - - This color uses the same bit depth as the bitdepth value in this struct, which can be 1-bit to 16-bit. - For grayscale PNGs, r, g and b will all 3 be set to the same. - - When decoding, by default you can ignore this information, since LodePNG sets - pixels with this key to transparent already in the raw RGBA output. - - The color key is only supported for color types 0 and 2. - */ - unsigned key_defined; /*is a transparent color key given? 0 = false, 1 = true*/ - unsigned key_r; /*red/grayscale component of color key*/ - unsigned key_g; /*green component of color key*/ - unsigned key_b; /*blue component of color key*/ + /*header (IHDR)*/ + LodePNGColorType colortype; /*color type, see PNG standard or documentation + further in this header file*/ + unsigned bitdepth; /*bits per sample, see PNG standard or documentation + further in this header file*/ + + /* + palette (PLTE and tRNS) + + Dynamically allocated with the colors of the palette, including alpha. + This field may not be allocated directly, use lodepng_color_mode_init first, + then lodepng_palette_add per color to correctly initialize it (to ensure + size of exactly 1024 bytes). + + The alpha channels must be set as well, set them to 255 for opaque images. + + When decoding, with the default settings you can ignore this palette, since + LodePNG already fills the palette colors in the pixels of the raw RGBA + output, but when decoding to the original PNG color mode it is needed to + reconstruct the colors. + + The palette is only supported for color type 3. + */ + unsigned char *palette; /*palette in RGBARGBA... order. Must be either 0, or + when allocated must have 1024 bytes*/ + size_t palettesize; /*palette size in number of colors (amount of used bytes + is 4 * palettesize)*/ + + /* + transparent color key (tRNS) + + This color uses the same bit depth as the bitdepth value in this struct, + which can be 1-bit to 16-bit. For grayscale PNGs, r, g and b will all 3 be + set to the same. + + When decoding, by default you can ignore this information, since LodePNG + sets pixels with this key to transparent already in the raw RGBA output. + + The color key is only supported for color types 0 and 2. + */ + unsigned key_defined; /*is a transparent color key given? 0 = false, 1 = true*/ + unsigned key_r; /*red/grayscale component of color key*/ + unsigned key_g; /*green component of color key*/ + unsigned key_b; /*blue component of color key*/ } LodePNGColorMode; /*init, cleanup and copy functions to use with this struct*/ -void lodepng_color_mode_init(LodePNGColorMode* info); -void lodepng_color_mode_cleanup(LodePNGColorMode* info); +void lodepng_color_mode_init(LodePNGColorMode *info); +void lodepng_color_mode_cleanup(LodePNGColorMode *info); /*return value is error code (0 means no error)*/ -unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source); +unsigned lodepng_color_mode_copy(LodePNGColorMode *dest, const LodePNGColorMode *source); /* Makes a temporary LodePNGColorMode that does not need cleanup (no palette) */ LodePNGColorMode lodepng_color_mode_make(LodePNGColorType colortype, unsigned bitdepth); -void lodepng_palette_clear(LodePNGColorMode* info); +void lodepng_palette_clear(LodePNGColorMode *info); /*add 1 color to the palette*/ -unsigned lodepng_palette_add(LodePNGColorMode* info, - unsigned char r, unsigned char g, unsigned char b, unsigned char a); +unsigned lodepng_palette_add( + LodePNGColorMode *info, unsigned char r, unsigned char g, unsigned char b, unsigned char a); -/*get the total amount of bits per pixel, based on colortype and bitdepth in the struct*/ -unsigned lodepng_get_bpp(const LodePNGColorMode* info); +/*get the total amount of bits per pixel, based on colortype and bitdepth in the + * struct*/ +unsigned lodepng_get_bpp(const LodePNGColorMode *info); /*get the amount of color channels used, based on colortype in the struct. If a palette is used, it counts as 1 channel.*/ -unsigned lodepng_get_channels(const LodePNGColorMode* info); +unsigned lodepng_get_channels(const LodePNGColorMode *info); /*is it a grayscale type? (only colortype 0 or 4)*/ -unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info); +unsigned lodepng_is_greyscale_type(const LodePNGColorMode *info); /*has it got an alpha channel? (only colortype 2 or 6)*/ -unsigned lodepng_is_alpha_type(const LodePNGColorMode* info); +unsigned lodepng_is_alpha_type(const LodePNGColorMode *info); /*has it got a palette? (only colortype 3)*/ -unsigned lodepng_is_palette_type(const LodePNGColorMode* info); -/*only returns true if there is a palette and there is a value in the palette with alpha < 255. -Loops through the palette to check this.*/ -unsigned lodepng_has_palette_alpha(const LodePNGColorMode* info); +unsigned lodepng_is_palette_type(const LodePNGColorMode *info); +/*only returns true if there is a palette and there is a value in the palette +with alpha < 255. Loops through the palette to check this.*/ +unsigned lodepng_has_palette_alpha(const LodePNGColorMode *info); /* -Check if the given color info indicates the possibility of having non-opaque pixels in the PNG image. -Returns true if the image can have translucent or invisible pixels (it still be opaque if it doesn't use such pixels). -Returns false if the image can only have opaque pixels. -In detail, it returns true only if it's a color type with alpha, or has a palette with non-opaque values, -or if "key_defined" is true. +Check if the given color info indicates the possibility of having non-opaque +pixels in the PNG image. Returns true if the image can have translucent or +invisible pixels (it still be opaque if it doesn't use such pixels). Returns +false if the image can only have opaque pixels. In detail, it returns true only +if it's a color type with alpha, or has a palette with non-opaque values, or if +"key_defined" is true. */ -unsigned lodepng_can_have_alpha(const LodePNGColorMode* info); -/*Returns the byte size of a raw image buffer with given width, height and color mode*/ -size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color); +unsigned lodepng_can_have_alpha(const LodePNGColorMode *info); +/*Returns the byte size of a raw image buffer with given width, height and color + * mode*/ +size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode *color); #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS /*The information of a Time chunk in PNG.*/ typedef struct LodePNGTime { - unsigned year; /*2 bytes used (0-65535)*/ - unsigned month; /*1-12*/ - unsigned day; /*1-31*/ - unsigned hour; /*0-23*/ - unsigned minute; /*0-59*/ - unsigned second; /*0-60 (to allow for leap seconds)*/ + unsigned year; /*2 bytes used (0-65535)*/ + unsigned month; /*1-12*/ + unsigned day; /*1-31*/ + unsigned hour; /*0-23*/ + unsigned minute; /*0-59*/ + unsigned second; /*0-60 (to allow for leap seconds)*/ } LodePNGTime; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ /*Information about the PNG image, except pixels, width and height.*/ typedef struct LodePNGInfo { - /*header (IHDR), palette (PLTE) and transparency (tRNS) chunks*/ - unsigned compression_method;/*compression method of the original file. Always 0.*/ - unsigned filter_method; /*filter method of the original file*/ - unsigned interlace_method; /*interlace method of the original file: 0=none, 1=Adam7*/ - LodePNGColorMode color; /*color type and bits, palette and transparency of the PNG file*/ + /*header (IHDR), palette (PLTE) and transparency (tRNS) chunks*/ + unsigned compression_method; /*compression method of the original file. + Always 0.*/ + unsigned filter_method; /*filter method of the original file*/ + unsigned interlace_method; /*interlace method of the original file: 0=none, + 1=Adam7*/ + LodePNGColorMode color; /*color type and bits, palette and transparency of the PNG file*/ #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /* - Suggested background color chunk (bKGD) - - This uses the same color mode and bit depth as the PNG (except no alpha channel), - with values truncated to the bit depth in the unsigned integer. - - For grayscale and palette PNGs, the value is stored in background_r. The values - in background_g and background_b are then unused. The decoder will set them - equal to background_r, the encoder ignores them in this case. - - When decoding, you may get these in a different color mode than the one you requested - for the raw pixels: the colortype and bitdepth defined by info_png.color, that is the - ones defined in the header of the PNG image, are used. - - When encoding with auto_convert, you must use the color model defined in info_png.color for - these values. The encoder normally ignores info_png.color when auto_convert is on, but will - use it to interpret these values (and convert copies of them to its chosen color model). - - When encoding, avoid setting this to an expensive color, such as a non-gray value - when the image is gray, or the compression will be worse since it will be forced to - write the PNG with a more expensive color mode (when auto_convert is on). - - The decoder does not use this background color to edit the color of pixels. This is a - completely optional metadata feature. - */ - unsigned background_defined; /*is a suggested background color given?*/ - unsigned background_r; /*red/gray/palette component of suggested background color*/ - unsigned background_g; /*green component of suggested background color*/ - unsigned background_b; /*blue component of suggested background color*/ - - /* - Non-international text chunks (tEXt and zTXt) - - The char** arrays each contain num strings. The actual messages are in - text_strings, while text_keys are keywords that give a short description what - the actual text represents, e.g. Title, Author, Description, or anything else. - - All the string fields below including strings, keys, names and language tags are null terminated. - The PNG specification uses null characters for the keys, names and tags, and forbids null - characters to appear in the main text which is why we can use null termination everywhere here. - - A keyword is minimum 1 character and maximum 79 characters long (plus the - additional null terminator). It's discouraged to use a single line length - longer than 79 characters for texts. - - Don't allocate these text buffers yourself. Use the init/cleanup functions - correctly and use lodepng_add_text and lodepng_clear_text. - - Standard text chunk keywords and strings are encoded using Latin-1. - */ - size_t text_num; /*the amount of texts in these char** buffers (there may be more texts in itext)*/ - char** text_keys; /*the keyword of a text chunk (e.g. "Comment")*/ - char** text_strings; /*the actual text*/ - - /* - International text chunks (iTXt) - Similar to the non-international text chunks, but with additional strings - "langtags" and "transkeys", and the following text encodings are used: - keys: Latin-1, langtags: ASCII, transkeys and strings: UTF-8. - keys must be 1-79 characters (plus the additional null terminator), the other - strings are any length. - */ - size_t itext_num; /*the amount of international texts in this PNG*/ - char** itext_keys; /*the English keyword of the text chunk (e.g. "Comment")*/ - char** itext_langtags; /*language tag for this text's language, ISO/IEC 646 string, e.g. ISO 639 language tag*/ - char** itext_transkeys; /*keyword translated to the international language - UTF-8 string*/ - char** itext_strings; /*the actual international text - UTF-8 string*/ - - /*time chunk (tIME)*/ - unsigned time_defined; /*set to 1 to make the encoder generate a tIME chunk*/ - LodePNGTime time; - - /*phys chunk (pHYs)*/ - unsigned phys_defined; /*if 0, there is no pHYs chunk and the values below are undefined, if 1 else there is one*/ - unsigned phys_x; /*pixels per unit in x direction*/ - unsigned phys_y; /*pixels per unit in y direction*/ - unsigned phys_unit; /*may be 0 (unknown unit) or 1 (metre)*/ - - /* - Color profile related chunks: gAMA, cHRM, sRGB, iCPP, sBIT - - LodePNG does not apply any color conversions on pixels in the encoder or decoder and does not interpret these color - profile values. It merely passes on the information. If you wish to use color profiles and convert colors, please - use these values with a color management library. - - See the PNG, ICC and sRGB specifications for more information about the meaning of these values. - */ - - /* gAMA chunk: optional, overridden by sRGB or iCCP if those are present. */ - unsigned gama_defined; /* Whether a gAMA chunk is present (0 = not present, 1 = present). */ - unsigned gama_gamma; /* Gamma exponent times 100000 */ - - /* cHRM chunk: optional, overridden by sRGB or iCCP if those are present. */ - unsigned chrm_defined; /* Whether a cHRM chunk is present (0 = not present, 1 = present). */ - unsigned chrm_white_x; /* White Point x times 100000 */ - unsigned chrm_white_y; /* White Point y times 100000 */ - unsigned chrm_red_x; /* Red x times 100000 */ - unsigned chrm_red_y; /* Red y times 100000 */ - unsigned chrm_green_x; /* Green x times 100000 */ - unsigned chrm_green_y; /* Green y times 100000 */ - unsigned chrm_blue_x; /* Blue x times 100000 */ - unsigned chrm_blue_y; /* Blue y times 100000 */ - - /* - sRGB chunk: optional. May not appear at the same time as iCCP. - If gAMA is also present gAMA must contain value 45455. - If cHRM is also present cHRM must contain respectively 31270,32900,64000,33000,30000,60000,15000,6000. - */ - unsigned srgb_defined; /* Whether an sRGB chunk is present (0 = not present, 1 = present). */ - unsigned srgb_intent; /* Rendering intent: 0=perceptual, 1=rel. colorimetric, 2=saturation, 3=abs. colorimetric */ - - /* - iCCP chunk: optional. May not appear at the same time as sRGB. - - LodePNG does not parse or use the ICC profile (except its color space header field for an edge case), a - separate library to handle the ICC data (not included in LodePNG) format is needed to use it for color - management and conversions. - - For encoding, if iCCP is present, gAMA and cHRM are recommended to be added as well with values that match the ICC - profile as closely as possible, if you wish to do this you should provide the correct values for gAMA and cHRM and - enable their '_defined' flags since LodePNG will not automatically compute them from the ICC profile. - - For encoding, the ICC profile is required by the PNG specification to be an "RGB" profile for non-gray - PNG color types and a "GRAY" profile for gray PNG color types. If you disable auto_convert, you must ensure - the ICC profile type matches your requested color type, else the encoder gives an error. If auto_convert is - enabled (the default), and the ICC profile is not a good match for the pixel data, this will result in an encoder - error if the pixel data has non-gray pixels for a GRAY profile, or a silent less-optimal compression of the pixel - data if the pixels could be encoded as grayscale but the ICC profile is RGB. - - To avoid this do not set an ICC profile in the image unless there is a good reason for it, and when doing so - make sure you compute it carefully to avoid the above problems. - */ - unsigned iccp_defined; /* Whether an iCCP chunk is present (0 = not present, 1 = present). */ - char* iccp_name; /* Null terminated string with profile name, 1-79 bytes */ - /* - The ICC profile in iccp_profile_size bytes. - Don't allocate this buffer yourself. Use the init/cleanup functions - correctly and use lodepng_set_icc and lodepng_clear_icc. - */ - unsigned char* iccp_profile; - unsigned iccp_profile_size; /* The size of iccp_profile in bytes */ - - /* - sBIT chunk: significant bits. Optional metadata, only set this if needed. - - If defined, these values give the bit depth of the original data. Since PNG only stores 1, 2, 4, 8 or 16-bit - per channel data, the significant bits value can be used to indicate the original encoded data has another - sample depth, such as 10 or 12. - - Encoders using this value, when storing the pixel data, should use the most significant bits - of the data to store the original bits, and use a good sample depth scaling method such as - "left bit replication" to fill in the least significant bits, rather than fill zeroes. - - Decoders using this value, if able to work with data that's e.g. 10-bit or 12-bit, should right - shift the data to go back to the original bit depth, but decoders are also allowed to ignore - sbit and work e.g. with the 8-bit or 16-bit data from the PNG directly, since thanks - to the encoder contract, the values encoded in PNG are in valid range for the PNG bit depth. - - For grayscale images, sbit_g and sbit_b are not used, and for images that don't use color - type RGBA or grayscale+alpha, sbit_a is not used (it's not used even for palette images with - translucent palette values, or images with color key). The values that are used must be - greater than zero and smaller than or equal to the PNG bit depth. - - The color type from the header in the PNG image defines these used and unused fields: if - decoding with a color mode conversion, such as always decoding to RGBA, this metadata still - only uses the color type of the original PNG, and may e.g. lack the alpha channel info - if the PNG was RGB. When encoding with auto_convert (as well as without), also always the - color model defined in info_png.color determines this. - - NOTE: enabling sbit can hurt compression, because the encoder can then not always use - auto_convert to choose a more optimal color mode for the data, because the PNG format has - strict requirements for the allowed sbit values in combination with color modes. - For example, setting these fields to 10-bit will force the encoder to keep using a 16-bit per channel - color mode, even if the pixel data would in fact fit in a more efficient 8-bit mode. - */ - unsigned sbit_defined; /*is significant bits given? if not, the values below are unused*/ - unsigned sbit_r; /*red or gray component of significant bits*/ - unsigned sbit_g; /*green component of significant bits*/ - unsigned sbit_b; /*blue component of significant bits*/ - unsigned sbit_a; /*alpha component of significant bits*/ - - /* End of color profile related chunks */ - - - /* - unknown chunks: chunks not known by LodePNG, passed on byte for byte. - - There are 3 buffers, one for each position in the PNG where unknown chunks can appear. - Each buffer contains all unknown chunks for that position consecutively. - The 3 positions are: - 0: between IHDR and PLTE, 1: between PLTE and IDAT, 2: between IDAT and IEND. - - For encoding, do not store critical chunks or known chunks that are enabled with a "_defined" flag - above in here, since the encoder will blindly follow this and could then encode an invalid PNG file - (such as one with two IHDR chunks or the disallowed combination of sRGB with iCCP). But do use - this if you wish to store an ancillary chunk that is not supported by LodePNG (such as sPLT or hIST), - or any non-standard PNG chunk. - - Do not allocate or traverse this data yourself. Use the chunk traversing functions declared - later, such as lodepng_chunk_next and lodepng_chunk_append, to read/write this struct. - */ - unsigned char* unknown_chunks_data[3]; - size_t unknown_chunks_size[3]; /*size in bytes of the unknown chunks, given for protection*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ + /* + Suggested background color chunk (bKGD) + + This uses the same color mode and bit depth as the PNG (except no alpha + channel), with values truncated to the bit depth in the unsigned integer. + + For grayscale and palette PNGs, the value is stored in background_r. The + values in background_g and background_b are then unused. The decoder will + set them equal to background_r, the encoder ignores them in this case. + + When decoding, you may get these in a different color mode than the one you + requested for the raw pixels: the colortype and bitdepth defined by + info_png.color, that is the ones defined in the header of the PNG image, are + used. + + When encoding with auto_convert, you must use the color model defined in + info_png.color for these values. The encoder normally ignores info_png.color + when auto_convert is on, but will use it to interpret these values (and + convert copies of them to its chosen color model). + + When encoding, avoid setting this to an expensive color, such as a non-gray + value when the image is gray, or the compression will be worse since it will + be forced to write the PNG with a more expensive color mode (when + auto_convert is on). + + The decoder does not use this background color to edit the color of pixels. + This is a completely optional metadata feature. + */ + unsigned background_defined; /*is a suggested background color given?*/ + unsigned background_r; /*red/gray/palette component of suggested background + color*/ + unsigned background_g; /*green component of suggested background color*/ + unsigned background_b; /*blue component of suggested background color*/ + + /* + Non-international text chunks (tEXt and zTXt) + + The char** arrays each contain num strings. The actual messages are in + text_strings, while text_keys are keywords that give a short description + what the actual text represents, e.g. Title, Author, Description, or + anything else. + + All the string fields below including strings, keys, names and language tags + are null terminated. The PNG specification uses null characters for the + keys, names and tags, and forbids null characters to appear in the main text + which is why we can use null termination everywhere here. + + A keyword is minimum 1 character and maximum 79 characters long (plus the + additional null terminator). It's discouraged to use a single line length + longer than 79 characters for texts. + + Don't allocate these text buffers yourself. Use the init/cleanup functions + correctly and use lodepng_add_text and lodepng_clear_text. + + Standard text chunk keywords and strings are encoded using Latin-1. + */ + size_t text_num; /*the amount of texts in these char** buffers (there may be + more texts in itext)*/ + char **text_keys; /*the keyword of a text chunk (e.g. "Comment")*/ + char **text_strings; /*the actual text*/ + + /* + International text chunks (iTXt) + Similar to the non-international text chunks, but with additional strings + "langtags" and "transkeys", and the following text encodings are used: + keys: Latin-1, langtags: ASCII, transkeys and strings: UTF-8. + keys must be 1-79 characters (plus the additional null terminator), the + other strings are any length. + */ + size_t itext_num; /*the amount of international texts in this PNG*/ + char **itext_keys; /*the English keyword of the text chunk (e.g. "Comment")*/ + char **itext_langtags; /*language tag for this text's language, ISO/IEC 646 + string, e.g. ISO 639 language tag*/ + char **itext_transkeys; /*keyword translated to the international language - + UTF-8 string*/ + char **itext_strings; /*the actual international text - UTF-8 string*/ + + /*time chunk (tIME)*/ + unsigned time_defined; /*set to 1 to make the encoder generate a tIME chunk*/ + LodePNGTime time; + + /*phys chunk (pHYs)*/ + unsigned phys_defined; /*if 0, there is no pHYs chunk and the values below + are undefined, if 1 else there is one*/ + unsigned phys_x; /*pixels per unit in x direction*/ + unsigned phys_y; /*pixels per unit in y direction*/ + unsigned phys_unit; /*may be 0 (unknown unit) or 1 (metre)*/ + + /* + Color profile related chunks: gAMA, cHRM, sRGB, iCPP, sBIT + + LodePNG does not apply any color conversions on pixels in the encoder or + decoder and does not interpret these color profile values. It merely passes + on the information. If you wish to use color profiles and convert colors, + please use these values with a color management library. + + See the PNG, ICC and sRGB specifications for more information about the + meaning of these values. + */ + + /* gAMA chunk: optional, overridden by sRGB or iCCP if those are present. */ + unsigned gama_defined; /* Whether a gAMA chunk is present (0 = not present, + 1 = present). */ + unsigned gama_gamma; /* Gamma exponent times 100000 */ + + /* cHRM chunk: optional, overridden by sRGB or iCCP if those are present. */ + unsigned chrm_defined; /* Whether a cHRM chunk is present (0 = not present, + 1 = present). */ + unsigned chrm_white_x; /* White Point x times 100000 */ + unsigned chrm_white_y; /* White Point y times 100000 */ + unsigned chrm_red_x; /* Red x times 100000 */ + unsigned chrm_red_y; /* Red y times 100000 */ + unsigned chrm_green_x; /* Green x times 100000 */ + unsigned chrm_green_y; /* Green y times 100000 */ + unsigned chrm_blue_x; /* Blue x times 100000 */ + unsigned chrm_blue_y; /* Blue y times 100000 */ + + /* + sRGB chunk: optional. May not appear at the same time as iCCP. + If gAMA is also present gAMA must contain value 45455. + If cHRM is also present cHRM must contain respectively + 31270,32900,64000,33000,30000,60000,15000,6000. + */ + unsigned srgb_defined; /* Whether an sRGB chunk is present (0 = not present, + 1 = present). */ + unsigned srgb_intent; /* Rendering intent: 0=perceptual, 1=rel. + colorimetric, 2=saturation, 3=abs. colorimetric */ + + /* + iCCP chunk: optional. May not appear at the same time as sRGB. + + LodePNG does not parse or use the ICC profile (except its color space header + field for an edge case), a separate library to handle the ICC data (not + included in LodePNG) format is needed to use it for color management and + conversions. + + For encoding, if iCCP is present, gAMA and cHRM are recommended to be added + as well with values that match the ICC profile as closely as possible, if + you wish to do this you should provide the correct values for gAMA and cHRM + and enable their '_defined' flags since LodePNG will not automatically + compute them from the ICC profile. + + For encoding, the ICC profile is required by the PNG specification to be an + "RGB" profile for non-gray PNG color types and a "GRAY" profile for gray PNG + color types. If you disable auto_convert, you must ensure the ICC profile + type matches your requested color type, else the encoder gives an error. If + auto_convert is enabled (the default), and the ICC profile is not a good + match for the pixel data, this will result in an encoder error if the pixel + data has non-gray pixels for a GRAY profile, or a silent less-optimal + compression of the pixel data if the pixels could be encoded as grayscale + but the ICC profile is RGB. + + To avoid this do not set an ICC profile in the image unless there is a good + reason for it, and when doing so make sure you compute it carefully to avoid + the above problems. + */ + unsigned iccp_defined; /* Whether an iCCP chunk is present (0 = not present, + 1 = present). */ + char *iccp_name; /* Null terminated string with profile name, 1-79 bytes */ + /* + The ICC profile in iccp_profile_size bytes. + Don't allocate this buffer yourself. Use the init/cleanup functions + correctly and use lodepng_set_icc and lodepng_clear_icc. + */ + unsigned char *iccp_profile; + unsigned iccp_profile_size; /* The size of iccp_profile in bytes */ + + /* + sBIT chunk: significant bits. Optional metadata, only set this if needed. + + If defined, these values give the bit depth of the original data. Since PNG + only stores 1, 2, 4, 8 or 16-bit per channel data, the significant bits + value can be used to indicate the original encoded data has another sample + depth, such as 10 or 12. + + Encoders using this value, when storing the pixel data, should use the most + significant bits of the data to store the original bits, and use a good + sample depth scaling method such as "left bit replication" to fill in the + least significant bits, rather than fill zeroes. + + Decoders using this value, if able to work with data that's e.g. 10-bit or + 12-bit, should right shift the data to go back to the original bit depth, + but decoders are also allowed to ignore sbit and work e.g. with the 8-bit or + 16-bit data from the PNG directly, since thanks to the encoder contract, the + values encoded in PNG are in valid range for the PNG bit depth. + + For grayscale images, sbit_g and sbit_b are not used, and for images that + don't use color type RGBA or grayscale+alpha, sbit_a is not used (it's not + used even for palette images with translucent palette values, or images with + color key). The values that are used must be greater than zero and smaller + than or equal to the PNG bit depth. + + The color type from the header in the PNG image defines these used and + unused fields: if decoding with a color mode conversion, such as always + decoding to RGBA, this metadata still only uses the color type of the + original PNG, and may e.g. lack the alpha channel info if the PNG was RGB. + When encoding with auto_convert (as well as without), also always the color + model defined in info_png.color determines this. + + NOTE: enabling sbit can hurt compression, because the encoder can then not + always use auto_convert to choose a more optimal color mode for the data, + because the PNG format has strict requirements for the allowed sbit values + in combination with color modes. For example, setting these fields to 10-bit + will force the encoder to keep using a 16-bit per channel color mode, even + if the pixel data would in fact fit in a more efficient 8-bit mode. + */ + unsigned sbit_defined; /*is significant bits given? if not, the values below + are unused*/ + unsigned sbit_r; /*red or gray component of significant bits*/ + unsigned sbit_g; /*green component of significant bits*/ + unsigned sbit_b; /*blue component of significant bits*/ + unsigned sbit_a; /*alpha component of significant bits*/ + + /* End of color profile related chunks */ + + /* + unknown chunks: chunks not known by LodePNG, passed on byte for byte. + + There are 3 buffers, one for each position in the PNG where unknown chunks + can appear. Each buffer contains all unknown chunks for that position + consecutively. The 3 positions are: 0: between IHDR and PLTE, 1: between + PLTE and IDAT, 2: between IDAT and IEND. + + For encoding, do not store critical chunks or known chunks that are enabled + with a "_defined" flag above in here, since the encoder will blindly follow + this and could then encode an invalid PNG file (such as one with two IHDR + chunks or the disallowed combination of sRGB with iCCP). But do use this if + you wish to store an ancillary chunk that is not supported by LodePNG (such + as sPLT or hIST), or any non-standard PNG chunk. + + Do not allocate or traverse this data yourself. Use the chunk traversing + functions declared later, such as lodepng_chunk_next and + lodepng_chunk_append, to read/write this struct. + */ + unsigned char *unknown_chunks_data[3]; + size_t unknown_chunks_size[3]; /*size in bytes of the unknown chunks, given + for protection*/ +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ } LodePNGInfo; /*init, cleanup and copy functions to use with this struct*/ -void lodepng_info_init(LodePNGInfo* info); -void lodepng_info_cleanup(LodePNGInfo* info); +void lodepng_info_init(LodePNGInfo *info); +void lodepng_info_cleanup(LodePNGInfo *info); /*return value is error code (0 means no error)*/ -unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source); +unsigned lodepng_info_copy(LodePNGInfo *dest, const LodePNGInfo *source); #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS -unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str); /*push back both texts at once*/ -void lodepng_clear_text(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/ +unsigned lodepng_add_text( + LodePNGInfo *info, const char *key, const char *str); /*push back both texts at once*/ +void lodepng_clear_text(LodePNGInfo *info); /*use this to clear the texts again + after you filled them in*/ -unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag, - const char* transkey, const char* str); /*push back the 4 texts of 1 chunk at once*/ -void lodepng_clear_itext(LodePNGInfo* info); /*use this to clear the itexts again after you filled them in*/ +unsigned lodepng_add_itext(LodePNGInfo *info, const char *key, const char *langtag, + const char *transkey, const char *str); /*push back the 4 texts of 1 chunk at once*/ +void lodepng_clear_itext(LodePNGInfo *info); /*use this to clear the itexts + again after you filled them in*/ /*replaces if exists*/ -unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size); -void lodepng_clear_icc(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/ -#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ +unsigned lodepng_set_icc( + LodePNGInfo *info, const char *name, const unsigned char *profile, unsigned profile_size); +void lodepng_clear_icc(LodePNGInfo *info); /*use this to clear the texts again + after you filled them in*/ +#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ /* Converts raw buffer from one color type to another color type, based on LodePNGColorMode structs to describe the input and output color type. -See the reference manual at the end of this header file to see which color conversions are supported. -return value = LodePNG error code (0 if all went ok, an error if the conversion isn't supported) -The out buffer must have size (w * h * bpp + 7) / 8, where bpp is the bits per pixel -of the output color type (lodepng_get_bpp). -For < 8 bpp images, there should not be padding bits at the end of scanlines. -For 16-bit per channel colors, uses big endian format like PNG does. -Return value is LodePNG error code +See the reference manual at the end of this header file to see which color +conversions are supported. return value = LodePNG error code (0 if all went ok, +an error if the conversion isn't supported) The out buffer must have size (w * h +* bpp + 7) / 8, where bpp is the bits per pixel of the output color type +(lodepng_get_bpp). For < 8 bpp images, there should not be padding bits at the +end of scanlines. For 16-bit per channel colors, uses big endian format like PNG +does. Return value is LodePNG error code */ -unsigned lodepng_convert(unsigned char* out, const unsigned char* in, - const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in, - unsigned w, unsigned h); +unsigned lodepng_convert(unsigned char *out, const unsigned char *in, + const LodePNGColorMode *mode_out, const LodePNGColorMode *mode_in, unsigned w, unsigned h); #ifdef LODEPNG_COMPILE_DECODER /* @@ -728,190 +784,217 @@ Settings for the decoder. This contains settings for the PNG and the Zlib decoder, but not the Info settings from the Info structs. */ typedef struct LodePNGDecoderSettings { - LodePNGDecompressSettings zlibsettings; /*in here is the setting to ignore Adler32 checksums*/ - - /* Check LodePNGDecompressSettings for more ignorable errors such as ignore_adler32 */ - unsigned ignore_crc; /*ignore CRC checksums*/ - unsigned ignore_critical; /*ignore unknown critical chunks*/ - unsigned ignore_end; /*ignore issues at end of file if possible (missing IEND chunk, too large chunk, ...)*/ - /* TODO: make a system involving warnings with levels and a strict mode instead. Other potentially recoverable - errors: srgb rendering intent value, size of content of ancillary chunks, more than 79 characters for some - strings, placement/combination rules for ancillary chunks, crc of unknown chunks, allowed characters - in string keys, etc... */ - - unsigned color_convert; /*whether to convert the PNG to the color type you want. Default: yes*/ + LodePNGDecompressSettings zlibsettings; /*in here is the setting to ignore Adler32 checksums*/ + + /* Check LodePNGDecompressSettings for more ignorable errors such as + * ignore_adler32 */ + unsigned ignore_crc; /*ignore CRC checksums*/ + unsigned ignore_critical; /*ignore unknown critical chunks*/ + unsigned ignore_end; /*ignore issues at end of file if possible (missing + IEND chunk, too large chunk, ...)*/ + /* TODO: make a system involving warnings with levels and a strict mode + instead. Other potentially recoverable errors: srgb rendering intent + value, size of content of ancillary chunks, more than 79 characters for + some strings, placement/combination rules for ancillary chunks, crc of + unknown chunks, allowed characters in string keys, etc... */ + + unsigned color_convert; /*whether to convert the PNG to the color type you + want. Default: yes*/ #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - unsigned read_text_chunks; /*if false but remember_unknown_chunks is true, they're stored in the unknown chunks*/ - - /*store all bytes from unknown chunks in the LodePNGInfo (off by default, useful for a png editor)*/ - unsigned remember_unknown_chunks; - - /* maximum size for decompressed text chunks. If a text chunk's text is larger than this, an error is returned, - unless reading text chunks is disabled or this limit is set higher or disabled. Set to 0 to allow any size. - By default it is a value that prevents unreasonably large strings from hogging memory. */ - size_t max_text_size; - - /* maximum size for compressed ICC chunks. If the ICC profile is larger than this, an error will be returned. Set to - 0 to allow any size. By default this is a value that prevents ICC profiles that would be much larger than any - legitimate profile could be to hog memory. */ - size_t max_icc_size; + unsigned read_text_chunks; /*if false but remember_unknown_chunks is true, + they're stored in the unknown chunks*/ + + /*store all bytes from unknown chunks in the LodePNGInfo (off by default, + * useful for a png editor)*/ + unsigned remember_unknown_chunks; + + /* maximum size for decompressed text chunks. If a text chunk's text is + larger than this, an error is returned, unless reading text chunks is + disabled or this limit is set higher or disabled. Set to 0 to allow any + size. By default it is a value that prevents unreasonably large strings from + hogging memory. */ + size_t max_text_size; + + /* maximum size for compressed ICC chunks. If the ICC profile is larger than + this, an error will be returned. Set to 0 to allow any size. By default this + is a value that prevents ICC profiles that would be much larger than any + legitimate profile could be to hog memory. */ + size_t max_icc_size; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ } LodePNGDecoderSettings; -void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings); +void lodepng_decoder_settings_init(LodePNGDecoderSettings *settings); #endif /*LODEPNG_COMPILE_DECODER*/ #ifdef LODEPNG_COMPILE_ENCODER -/*automatically use color type with less bits per pixel if losslessly possible. Default: AUTO*/ +/*automatically use color type with less bits per pixel if losslessly possible. + * Default: AUTO*/ typedef enum LodePNGFilterStrategy { - /*every filter at zero*/ - LFS_ZERO = 0, - /*every filter at 1, 2, 3 or 4 (paeth), unlike LFS_ZERO not a good choice, but for testing*/ - LFS_ONE = 1, - LFS_TWO = 2, - LFS_THREE = 3, - LFS_FOUR = 4, - /*Use filter that gives minimum sum, as described in the official PNG filter heuristic.*/ - LFS_MINSUM, - /*Use the filter type that gives smallest Shannon entropy for this scanline. Depending - on the image, this is better or worse than minsum.*/ - LFS_ENTROPY, - /* - Brute-force-search PNG filters by compressing each filter for each scanline. - Experimental, very slow, and only rarely gives better compression than MINSUM. - */ - LFS_BRUTE_FORCE, - /*use predefined_filters buffer: you specify the filter type for each scanline*/ - LFS_PREDEFINED + /*every filter at zero*/ + LFS_ZERO = 0, + /*every filter at 1, 2, 3 or 4 (paeth), unlike LFS_ZERO not a good choice, + but for testing*/ + LFS_ONE = 1, + LFS_TWO = 2, + LFS_THREE = 3, + LFS_FOUR = 4, + /*Use filter that gives minimum sum, as described in the official PNG filter + heuristic.*/ + LFS_MINSUM, + /*Use the filter type that gives smallest Shannon entropy for this scanline. + Depending on the image, this is better or worse than minsum.*/ + LFS_ENTROPY, + /* + Brute-force-search PNG filters by compressing each filter for each scanline. + Experimental, very slow, and only rarely gives better compression than + MINSUM. + */ + LFS_BRUTE_FORCE, + /*use predefined_filters buffer: you specify the filter type for each + scanline*/ + LFS_PREDEFINED } LodePNGFilterStrategy; -/*Gives characteristics about the integer RGBA colors of the image (count, alpha channel usage, bit depth, ...), -which helps decide which color model to use for encoding. -Used internally by default if "auto_convert" is enabled. Public because it's useful for custom algorithms.*/ +/*Gives characteristics about the integer RGBA colors of the image (count, alpha +channel usage, bit depth, ...), which helps decide which color model to use for +encoding. Used internally by default if "auto_convert" is enabled. Public +because it's useful for custom algorithms.*/ typedef struct LodePNGColorStats { - unsigned colored; /*not grayscale*/ - unsigned key; /*image is not opaque and color key is possible instead of full alpha*/ - unsigned short key_r; /*key values, always as 16-bit, in 8-bit case the byte is duplicated, e.g. 65535 means 255*/ - unsigned short key_g; - unsigned short key_b; - unsigned alpha; /*image is not opaque and alpha channel or alpha palette required*/ - unsigned numcolors; /*amount of colors, up to 257. Not valid if bits == 16 or allow_palette is disabled.*/ - unsigned char palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order, only valid when numcolors is valid*/ - unsigned bits; /*bits per channel (not for palette). 1,2 or 4 for grayscale only. 16 if 16-bit per channel required.*/ - size_t numpixels; - - /*user settings for computing/using the stats*/ - unsigned allow_palette; /*default 1. if 0, disallow choosing palette colortype in auto_choose_color, and don't count numcolors*/ - unsigned allow_greyscale; /*default 1. if 0, choose RGB or RGBA even if the image only has gray colors*/ + unsigned colored; /*not grayscale*/ + unsigned key; /*image is not opaque and color key is possible instead of + full alpha*/ + unsigned short key_r; /*key values, always as 16-bit, in 8-bit case the byte + is duplicated, e.g. 65535 means 255*/ + unsigned short key_g; + unsigned short key_b; + unsigned alpha; /*image is not opaque and alpha channel or alpha palette + required*/ + unsigned numcolors; /*amount of colors, up to 257. Not valid if bits == 16 + or allow_palette is disabled.*/ + unsigned char palette[1024]; /*Remembers up to the first 256 RGBA colors, in no + particular order, only valid when numcolors is valid*/ + unsigned bits; /*bits per channel (not for palette). 1,2 or 4 for grayscale + only. 16 if 16-bit per channel required.*/ + size_t numpixels; + + /*user settings for computing/using the stats*/ + unsigned allow_palette; /*default 1. if 0, disallow choosing palette colortype + in auto_choose_color, and don't count numcolors*/ + unsigned allow_greyscale; /*default 1. if 0, choose RGB or RGBA even if the + image only has gray colors*/ } LodePNGColorStats; -void lodepng_color_stats_init(LodePNGColorStats* stats); +void lodepng_color_stats_init(LodePNGColorStats *stats); /*Get a LodePNGColorStats of the image. The stats must already have been inited. Returns error code (e.g. alloc fail) or 0 if ok.*/ -unsigned lodepng_compute_color_stats(LodePNGColorStats* stats, - const unsigned char* image, unsigned w, unsigned h, - const LodePNGColorMode* mode_in); +unsigned lodepng_compute_color_stats(LodePNGColorStats *stats, const unsigned char *image, + unsigned w, unsigned h, const LodePNGColorMode *mode_in); /*Settings for the encoder.*/ typedef struct LodePNGEncoderSettings { - LodePNGCompressSettings zlibsettings; /*settings for the zlib encoder, such as window size, ...*/ - - unsigned auto_convert; /*automatically choose output PNG color type. Default: true*/ - - /*If true, follows the official PNG heuristic: if the PNG uses a palette or lower than - 8 bit depth, set all filters to zero. Otherwise use the filter_strategy. Note that to - completely follow the official PNG heuristic, filter_palette_zero must be true and - filter_strategy must be LFS_MINSUM*/ - unsigned filter_palette_zero; - /*Which filter strategy to use when not using zeroes due to filter_palette_zero. - Set filter_palette_zero to 0 to ensure always using your chosen strategy. Default: LFS_MINSUM*/ - LodePNGFilterStrategy filter_strategy; - /*used if filter_strategy is LFS_PREDEFINED. In that case, this must point to a buffer with - the same length as the amount of scanlines in the image, and each value must <= 5. You - have to cleanup this buffer, LodePNG will never free it. Don't forget that filter_palette_zero - must be set to 0 to ensure this is also used on palette or low bitdepth images.*/ - const unsigned char* predefined_filters; - - /*force creating a PLTE chunk if colortype is 2 or 6 (= a suggested palette). - If colortype is 3, PLTE is always created. If color type is explicitely set - to a grayscale type (1 or 4), this is not done and is ignored. If enabling this, - a palette must be present in the info_png. - NOTE: enabling this may worsen compression if auto_convert is used to choose - optimal color mode, because it cannot use grayscale color modes in this case*/ - unsigned force_palette; + LodePNGCompressSettings zlibsettings; /*settings for the zlib encoder, such + as window size, ...*/ + + unsigned auto_convert; /*automatically choose output PNG color type. + Default: true*/ + + /*If true, follows the official PNG heuristic: if the PNG uses a palette or + lower than 8 bit depth, set all filters to zero. Otherwise use the + filter_strategy. Note that to completely follow the official PNG heuristic, + filter_palette_zero must be true and filter_strategy must be LFS_MINSUM*/ + unsigned filter_palette_zero; + /*Which filter strategy to use when not using zeroes due to + filter_palette_zero. Set filter_palette_zero to 0 to ensure always using + your chosen strategy. Default: LFS_MINSUM*/ + LodePNGFilterStrategy filter_strategy; + /*used if filter_strategy is LFS_PREDEFINED. In that case, this must point + to a buffer with the same length as the amount of scanlines in the image, + and each value must <= 5. You have to cleanup this buffer, LodePNG will + never free it. Don't forget that filter_palette_zero must be set to 0 to + ensure this is also used on palette or low bitdepth images.*/ + const unsigned char *predefined_filters; + + /*force creating a PLTE chunk if colortype is 2 or 6 (= a suggested + palette). If colortype is 3, PLTE is always created. If color type is + explicitely set to a grayscale type (1 or 4), this is not done and is + ignored. If enabling this, a palette must be present in the info_png. NOTE: + enabling this may worsen compression if auto_convert is used to choose + optimal color mode, because it cannot use grayscale color modes in this + case*/ + unsigned force_palette; #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS - /*add LodePNG identifier and version as a text chunk, for debugging*/ - unsigned add_id; - /*encode text chunks as zTXt chunks instead of tEXt chunks, and use compression in iTXt chunks*/ - unsigned text_compression; + /*add LodePNG identifier and version as a text chunk, for debugging*/ + unsigned add_id; + /*encode text chunks as zTXt chunks instead of tEXt chunks, and use + * compression in iTXt chunks*/ + unsigned text_compression; #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/ } LodePNGEncoderSettings; -void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings); +void lodepng_encoder_settings_init(LodePNGEncoderSettings *settings); #endif /*LODEPNG_COMPILE_ENCODER*/ - #if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) /*The settings, state and information for extended encoding and decoding.*/ typedef struct LodePNGState { #ifdef LODEPNG_COMPILE_DECODER - LodePNGDecoderSettings decoder; /*the decoding settings*/ -#endif /*LODEPNG_COMPILE_DECODER*/ + LodePNGDecoderSettings decoder; /*the decoding settings*/ +#endif /*LODEPNG_COMPILE_DECODER*/ #ifdef LODEPNG_COMPILE_ENCODER - LodePNGEncoderSettings encoder; /*the encoding settings*/ -#endif /*LODEPNG_COMPILE_ENCODER*/ - LodePNGColorMode info_raw; /*specifies the format in which you would like to get the raw pixel buffer*/ - LodePNGInfo info_png; /*info of the PNG image obtained after decoding*/ - unsigned error; + LodePNGEncoderSettings encoder; /*the encoding settings*/ +#endif /*LODEPNG_COMPILE_ENCODER*/ + LodePNGColorMode info_raw; /*specifies the format in which you would like to + get the raw pixel buffer*/ + LodePNGInfo info_png; /*info of the PNG image obtained after decoding*/ + unsigned error; } LodePNGState; /*init, cleanup and copy functions to use with this struct*/ -void lodepng_state_init(LodePNGState* state); -void lodepng_state_cleanup(LodePNGState* state); -void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source); -#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */ +void lodepng_state_init(LodePNGState *state); +void lodepng_state_cleanup(LodePNGState *state); +void lodepng_state_copy(LodePNGState *dest, const LodePNGState *source); +#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) \ + */ #ifdef LODEPNG_COMPILE_DECODER /* -Same as lodepng_decode_memory, but uses a LodePNGState to allow custom settings and -getting much more information about the PNG image and color mode. +Same as lodepng_decode_memory, but uses a LodePNGState to allow custom settings +and getting much more information about the PNG image and color mode. */ -unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize); +unsigned lodepng_decode(unsigned char **out, unsigned *w, unsigned *h, LodePNGState *state, + const unsigned char *in, size_t insize); /* Read the PNG header, but not the actual data. This returns only the information that is in the IHDR chunk of the PNG, such as width, height and color type. The information is placed in the info_png field of the LodePNGState. */ -unsigned lodepng_inspect(unsigned* w, unsigned* h, - LodePNGState* state, - const unsigned char* in, size_t insize); +unsigned lodepng_inspect( + unsigned *w, unsigned *h, LodePNGState *state, const unsigned char *in, size_t insize); #endif /*LODEPNG_COMPILE_DECODER*/ /* Reads one metadata chunk (other than IHDR, which is handled by lodepng_inspect) -of the PNG file and outputs what it read in the state. Returns error code on failure. -Use lodepng_inspect first with a new state, then e.g. lodepng_chunk_find_const -to find the desired chunk type, and if non null use lodepng_inspect_chunk (with -chunk_pointer - start_of_file as pos). -Supports most metadata chunks from the PNG standard (gAMA, bKGD, tEXt, ...). -Ignores unsupported, unknown, non-metadata or IHDR chunks (without error). -Requirements: &in[pos] must point to start of a chunk, must use regular -lodepng_inspect first since format of most other chunks depends on IHDR, and if -there is a PLTE chunk, that one must be inspected before tRNS or bKGD. +of the PNG file and outputs what it read in the state. Returns error code on +failure. Use lodepng_inspect first with a new state, then e.g. +lodepng_chunk_find_const to find the desired chunk type, and if non null use +lodepng_inspect_chunk (with chunk_pointer - start_of_file as pos). Supports most +metadata chunks from the PNG standard (gAMA, bKGD, tEXt, ...). Ignores +unsupported, unknown, non-metadata or IHDR chunks (without error). Requirements: +&in[pos] must point to start of a chunk, must use regular lodepng_inspect first +since format of most other chunks depends on IHDR, and if there is a PLTE chunk, +that one must be inspected before tRNS or bKGD. */ -unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos, - const unsigned char* in, size_t insize); +unsigned lodepng_inspect_chunk( + LodePNGState *state, size_t pos, const unsigned char *in, size_t insize); #ifdef LODEPNG_COMPILE_ENCODER -/*This function allocates the out buffer with standard malloc and stores the size in *outsize.*/ -unsigned lodepng_encode(unsigned char** out, size_t* outsize, - const unsigned char* image, unsigned w, unsigned h, - LodePNGState* state); +/*This function allocates the out buffer with standard malloc and stores the + * size in *outsize.*/ +unsigned lodepng_encode(unsigned char **out, size_t *outsize, const unsigned char *image, + unsigned w, unsigned h, LodePNGState *state); #endif /*LODEPNG_COMPILE_ENCODER*/ /* @@ -923,13 +1006,13 @@ The chunk pointer always points to the beginning of the chunk itself, that is the first byte of the 4 length bytes. In the PNG file format, chunks have the following format: --4 bytes length: length of the data of the chunk in bytes (chunk itself is 12 bytes longer) --4 bytes chunk type (ASCII a-z,A-Z only, see below) --length bytes of data (may be 0 bytes if length was 0) --4 bytes of CRC, computed on chunk name + data +-4 bytes length: length of the data of the chunk in bytes (chunk itself is 12 +bytes longer) -4 bytes chunk type (ASCII a-z,A-Z only, see below) -length bytes +of data (may be 0 bytes if length was 0) -4 bytes of CRC, computed on chunk name ++ data -The first chunk starts at the 8th byte of the PNG file, the entire rest of the file -exists out of concatenated chunks with the above format. +The first chunk starts at the 8th byte of the PNG file, the entire rest of the +file exists out of concatenated chunks with the above format. PNG standard chunk ASCII naming conventions: -First byte: uppercase = critical, lowercase = ancillary @@ -943,73 +1026,77 @@ Gets the length of the data of the chunk. Total chunk length has 12 bytes more. There must be at least 4 bytes to read from. If the result value is too large, it may be corrupt data. */ -unsigned lodepng_chunk_length(const unsigned char* chunk); +unsigned lodepng_chunk_length(const unsigned char *chunk); /*puts the 4-byte type in null terminated string*/ -void lodepng_chunk_type(char type[5], const unsigned char* chunk); +void lodepng_chunk_type(char type[5], const unsigned char *chunk); /*check if the type is the given type*/ -unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type); +unsigned char lodepng_chunk_type_equals(const unsigned char *chunk, const char *type); -/*0: it's one of the critical chunk types, 1: it's an ancillary chunk (see PNG standard)*/ -unsigned char lodepng_chunk_ancillary(const unsigned char* chunk); +/*0: it's one of the critical chunk types, 1: it's an ancillary chunk (see PNG + * standard)*/ +unsigned char lodepng_chunk_ancillary(const unsigned char *chunk); /*0: public, 1: private (see PNG standard)*/ -unsigned char lodepng_chunk_private(const unsigned char* chunk); +unsigned char lodepng_chunk_private(const unsigned char *chunk); -/*0: the chunk is unsafe to copy, 1: the chunk is safe to copy (see PNG standard)*/ -unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk); +/*0: the chunk is unsafe to copy, 1: the chunk is safe to copy (see PNG + * standard)*/ +unsigned char lodepng_chunk_safetocopy(const unsigned char *chunk); -/*get pointer to the data of the chunk, where the input points to the header of the chunk*/ -unsigned char* lodepng_chunk_data(unsigned char* chunk); -const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk); +/*get pointer to the data of the chunk, where the input points to the header of + * the chunk*/ +unsigned char *lodepng_chunk_data(unsigned char *chunk); +const unsigned char *lodepng_chunk_data_const(const unsigned char *chunk); /*returns 0 if the crc is correct, 1 if it's incorrect (0 for OK as usual!)*/ -unsigned lodepng_chunk_check_crc(const unsigned char* chunk); +unsigned lodepng_chunk_check_crc(const unsigned char *chunk); -/*generates the correct CRC from the data and puts it in the last 4 bytes of the chunk*/ -void lodepng_chunk_generate_crc(unsigned char* chunk); +/*generates the correct CRC from the data and puts it in the last 4 bytes of the + * chunk*/ +void lodepng_chunk_generate_crc(unsigned char *chunk); /* Iterate to next chunks, allows iterating through all chunks of the PNG file. -Input must be at the beginning of a chunk (result of a previous lodepng_chunk_next call, -or the 8th byte of a PNG file which always has the first chunk), or alternatively may -point to the first byte of the PNG file (which is not a chunk but the magic header, the -function will then skip over it and return the first real chunk). -Will output pointer to the start of the next chunk, or at or beyond end of the file if there -is no more chunk after this or possibly if the chunk is corrupt. -Start this process at the 8th byte of the PNG file. -In a non-corrupt PNG file, the last chunk should have name "IEND". +Input must be at the beginning of a chunk (result of a previous +lodepng_chunk_next call, or the 8th byte of a PNG file which always has the +first chunk), or alternatively may point to the first byte of the PNG file +(which is not a chunk but the magic header, the function will then skip over it +and return the first real chunk). Will output pointer to the start of the next +chunk, or at or beyond end of the file if there is no more chunk after this or +possibly if the chunk is corrupt. Start this process at the 8th byte of the PNG +file. In a non-corrupt PNG file, the last chunk should have name "IEND". */ -unsigned char* lodepng_chunk_next(unsigned char* chunk, unsigned char* end); -const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const unsigned char* end); +unsigned char *lodepng_chunk_next(unsigned char *chunk, unsigned char *end); +const unsigned char *lodepng_chunk_next_const(const unsigned char *chunk, const unsigned char *end); -/*Finds the first chunk with the given type in the range [chunk, end), or returns NULL if not found.*/ -unsigned char* lodepng_chunk_find(unsigned char* chunk, unsigned char* end, const char type[5]); -const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]); +/*Finds the first chunk with the given type in the range [chunk, end), or + * returns NULL if not found.*/ +unsigned char *lodepng_chunk_find(unsigned char *chunk, unsigned char *end, const char type[5]); +const unsigned char *lodepng_chunk_find_const( + const unsigned char *chunk, const unsigned char *end, const char type[5]); /* -Appends chunk to the data in out. The given chunk should already have its chunk header. -The out variable and outsize are updated to reflect the new reallocated buffer. -Returns error code (0 if it went ok) +Appends chunk to the data in out. The given chunk should already have its chunk +header. The out variable and outsize are updated to reflect the new reallocated +buffer. Returns error code (0 if it went ok) */ -unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk); +unsigned lodepng_chunk_append(unsigned char **out, size_t *outsize, const unsigned char *chunk); /* -Appends new chunk to out. The chunk to append is given by giving its length, type -and data separately. The type is a 4-letter string. -The out variable and outsize are updated to reflect the new reallocated buffer. -Returne error code (0 if it went ok) +Appends new chunk to out. The chunk to append is given by giving its length, +type and data separately. The type is a 4-letter string. The out variable and +outsize are updated to reflect the new reallocated buffer. Returne error code (0 +if it went ok) */ -unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, size_t length, - const char* type, const unsigned char* data); - +unsigned lodepng_chunk_create(unsigned char **out, size_t *outsize, size_t length, const char *type, + const unsigned char *data); /*Calculate CRC32 of buffer*/ -unsigned lodepng_crc32(const unsigned char* buf, size_t len); +unsigned lodepng_crc32(const unsigned char *buf, size_t len); #endif /*LODEPNG_COMPILE_PNG*/ - #ifdef LODEPNG_COMPILE_ZLIB /* This zlib part can be used independently to zlib compress and decompress a @@ -1018,10 +1105,10 @@ part of zlib that is required for PNG, it does not support dictionaries. */ #ifdef LODEPNG_COMPILE_DECODER -/*Inflate a buffer. Inflate is the decompression step of deflate. Out buffer must be freed after use.*/ -unsigned lodepng_inflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings); +/*Inflate a buffer. Inflate is the decompression step of deflate. Out buffer + * must be freed after use.*/ +unsigned lodepng_inflate(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGDecompressSettings *settings); /* Decompresses Zlib data. Reallocates the out buffer and appends the data. The @@ -1029,9 +1116,8 @@ data must be according to the zlib specification. Either, *out must be NULL and *outsize must be 0, or, *out must be a valid buffer and *outsize its size in bytes. out must be freed by user after usage. */ -unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGDecompressSettings* settings); +unsigned lodepng_zlib_decompress(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGDecompressSettings *settings); #endif /*LODEPNG_COMPILE_DECODER*/ #ifdef LODEPNG_COMPILE_ENCODER @@ -1042,21 +1128,20 @@ The data is output in the format of the zlib specification. Either, *out must be NULL and *outsize must be 0, or, *out must be a valid buffer and *outsize its size in bytes. out must be freed by user after usage. */ -unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings); +unsigned lodepng_zlib_compress(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGCompressSettings *settings); /* Find length-limited Huffman code for given frequencies. This function is in the public interface only for tests, it's used internally by lodepng_deflate. */ -unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequencies, - size_t numcodes, unsigned maxbitlen); +unsigned lodepng_huffman_code_lengths( + unsigned *lengths, const unsigned *frequencies, size_t numcodes, unsigned maxbitlen); -/*Compress a buffer with deflate. See RFC 1951. Out buffer must be freed after use.*/ -unsigned lodepng_deflate(unsigned char** out, size_t* outsize, - const unsigned char* in, size_t insize, - const LodePNGCompressSettings* settings); +/*Compress a buffer with deflate. See RFC 1951. Out buffer must be freed after + * use.*/ +unsigned lodepng_deflate(unsigned char **out, size_t *outsize, const unsigned char *in, + size_t insize, const LodePNGCompressSettings *settings); #endif /*LODEPNG_COMPILE_ENCODER*/ #endif /*LODEPNG_COMPILE_ZLIB*/ @@ -1073,7 +1158,7 @@ return value: error code (0 means ok) NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and decode in-memory. */ -unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* filename); +unsigned lodepng_load_file(unsigned char **out, size_t *outsize, const char *filename); /* Save a file from buffer to disk. Warning, if it exists, this function overwrites @@ -1086,39 +1171,38 @@ return value: error code (0 means ok) NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and encode in-memory */ -unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename); +unsigned lodepng_save_file(const unsigned char *buffer, size_t buffersize, const char *filename); #endif /*LODEPNG_COMPILE_DISK*/ #ifdef LODEPNG_COMPILE_CPP -/* The LodePNG C++ wrapper uses std::vectors instead of manually allocated memory buffers. */ +/* The LodePNG C++ wrapper uses std::vectors instead of manually allocated + * memory buffers. */ namespace lodepng { #ifdef LODEPNG_COMPILE_PNG class State : public LodePNGState { public: - State(); - State(const State& other); - ~State(); - State& operator=(const State& other); + State(); + State(const State &other); + ~State(); + State &operator=(const State &other); }; #ifdef LODEPNG_COMPILE_DECODER -/* Same as other lodepng::decode, but using a State for more settings and information. */ -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - State& state, - const unsigned char* in, size_t insize); -unsigned decode(std::vector& out, unsigned& w, unsigned& h, - State& state, - const std::vector& in); +/* Same as other lodepng::decode, but using a State for more settings and + * information. */ +unsigned decode(std::vector &out, unsigned &w, unsigned &h, State &state, + const unsigned char *in, size_t insize); +unsigned decode(std::vector &out, unsigned &w, unsigned &h, State &state, + const std::vector &in); #endif /*LODEPNG_COMPILE_DECODER*/ #ifdef LODEPNG_COMPILE_ENCODER -/* Same as other lodepng::encode, but using a State for more settings and information. */ -unsigned encode(std::vector& out, - const unsigned char* in, unsigned w, unsigned h, - State& state); -unsigned encode(std::vector& out, - const std::vector& in, unsigned w, unsigned h, - State& state); +/* Same as other lodepng::encode, but using a State for more settings and + * information. */ +unsigned encode( + std::vector &out, const unsigned char *in, unsigned w, unsigned h, State &state); +unsigned encode(std::vector &out, const std::vector &in, unsigned w, + unsigned h, State &state); #endif /*LODEPNG_COMPILE_ENCODER*/ #ifdef LODEPNG_COMPILE_DISK @@ -1129,38 +1213,38 @@ return value: error code (0 means ok) NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and decode in-memory */ -unsigned load_file(std::vector& buffer, const std::string& filename); +unsigned load_file(std::vector &buffer, const std::string &filename); /* -Save the binary data in an std::vector to a file on disk. The file is overwritten -without warning. +Save the binary data in an std::vector to a file on disk. The file is +overwritten without warning. NOTE: Wide-character filenames are not supported, you can use an external method to handle such files and encode in-memory */ -unsigned save_file(const std::vector& buffer, const std::string& filename); +unsigned save_file(const std::vector &buffer, const std::string &filename); #endif /* LODEPNG_COMPILE_DISK */ #endif /* LODEPNG_COMPILE_PNG */ #ifdef LODEPNG_COMPILE_ZLIB #ifdef LODEPNG_COMPILE_DECODER /* Zlib-decompress an unsigned char buffer */ -unsigned decompress(std::vector& out, const unsigned char* in, size_t insize, - const LodePNGDecompressSettings& settings = lodepng_default_decompress_settings); +unsigned decompress(std::vector &out, const unsigned char *in, size_t insize, + const LodePNGDecompressSettings &settings = lodepng_default_decompress_settings); /* Zlib-decompress an std::vector */ -unsigned decompress(std::vector& out, const std::vector& in, - const LodePNGDecompressSettings& settings = lodepng_default_decompress_settings); +unsigned decompress(std::vector &out, const std::vector &in, + const LodePNGDecompressSettings &settings = lodepng_default_decompress_settings); #endif /* LODEPNG_COMPILE_DECODER */ #ifdef LODEPNG_COMPILE_ENCODER /* Zlib-compress an unsigned char buffer */ -unsigned compress(std::vector& out, const unsigned char* in, size_t insize, - const LodePNGCompressSettings& settings = lodepng_default_compress_settings); +unsigned compress(std::vector &out, const unsigned char *in, size_t insize, + const LodePNGCompressSettings &settings = lodepng_default_compress_settings); /* Zlib-compress an std::vector */ -unsigned compress(std::vector& out, const std::vector& in, - const LodePNGCompressSettings& settings = lodepng_default_compress_settings); +unsigned compress(std::vector &out, const std::vector &in, + const LodePNGCompressSettings &settings = lodepng_default_compress_settings); #endif /* LODEPNG_COMPILE_ENCODER */ #endif /* LODEPNG_COMPILE_ZLIB */ } /* namespace lodepng */ @@ -1168,24 +1252,26 @@ unsigned compress(std::vector& out, const std::vector (2^31)-1 -[ ] partial decoding (stream processing) -[X] let the "isFullyOpaque" function check color keys and transparent palettes too -[X] better name for the variables "codes", "codesD", "codelengthcodes", "clcl" and "lldl" -[ ] allow treating some errors like warnings, when image is recoverable (e.g. 69, 57, 58) -[ ] make warnings like: oob palette, checksum fail, data after iend, wrong/unknown crit chunk, no null terminator in text, ... -[ ] error messages with line numbers (and version) +[.] test if there are no memory leaks or security exploits - done a lot but +needs to be checked often +[.] check compatibility with various compilers - done but needs to be redone +for every newer version [X] converting color to 16-bit per channel types [X] +support color profile chunk types (but never let them touch RGB values by +default) [ ] support all public PNG chunk types (almost done except sPLT and +hIST) [ ] make sure encoder generates no chunks with size > (2^31)-1 [ ] partial +decoding (stream processing) [X] let the "isFullyOpaque" function check color +keys and transparent palettes too [X] better name for the variables "codes", +"codesD", "codelengthcodes", "clcl" and "lldl" [ ] allow treating some errors +like warnings, when image is recoverable (e.g. 69, 57, 58) [ ] make warnings +like: oob palette, checksum fail, data after iend, wrong/unknown crit chunk, no +null terminator in text, ... [ ] error messages with line numbers (and version) [ ] errors in state instead of as return code? [ ] new errors/warnings like suspiciously big decompressed ztxt or iccp chunk -[ ] let the C++ wrapper catch exceptions coming from the standard library and return LodePNG error codes -[ ] allow user to provide custom color conversion functions, e.g. for premultiplied alpha, padding bits or not, ... -[ ] allow user to give data (void*) to custom allocator -[X] provide alternatives for C library functions not present on some platforms (memcpy, ...) +[ ] let the C++ wrapper catch exceptions coming from the standard library and +return LodePNG error codes [ ] allow user to provide custom color conversion +functions, e.g. for premultiplied alpha, padding bits or not, ... [ ] allow user +to give data (void*) to custom allocator [X] provide alternatives for C library +functions not present on some platforms (memcpy, ...) */ #endif /*LODEPNG_H inclusion guard*/ @@ -1205,10 +1291,10 @@ LodePNG Documentation 4. decoding 5. encoding 6. color conversions - 6.1. PNG color types - 6.2. color conversions - 6.3. padding bits - 6.4. A note about 16-bits per channel and endianness + 6.1. PNG color types + 6.2. color conversions + 6.3. padding bits + 6.4. A note about 16-bits per channel and endianness 7. error values 8. chunks and PNG editing 9. compiler support @@ -1232,11 +1318,11 @@ Specification (Second Edition) - W3C Recommendation 10 November 2003. The specifications used are: *) Portable Network Graphics (PNG) Specification (Second Edition): - http://www.w3.org/TR/2003/REC-PNG-20031110 + http://www.w3.org/TR/2003/REC-PNG-20031110 *) RFC 1950 ZLIB Compressed Data Format version 3.3: - http://www.gzip.org/zlib/rfc-zlib.html + http://www.gzip.org/zlib/rfc-zlib.html *) RFC 1951 DEFLATE Compressed Data Format Specification ver 1.3: - http://www.gzip.org/zlib/rfc-deflate.html + http://www.gzip.org/zlib/rfc-deflate.html The most recent version of LodePNG can currently be found at http://lodev.org/lodepng/ @@ -1246,7 +1332,8 @@ extra functionality. LodePNG exists out of two files: -lodepng.h: the header file for both C and C++ --lodepng.c(pp): give it the name lodepng.c or lodepng.cpp (or .cc) depending on your usage +-lodepng.c(pp): give it the name lodepng.c or lodepng.cpp (or .cc) depending on +your usage If you want to start using LodePNG right away without reading this doc, get the examples from the LodePNG website to see how to use it in code, or check the @@ -1271,35 +1358,40 @@ begin), life-critical systems, ... The following features are supported by the decoder: -*) decoding of PNGs with any color type, bit depth and interlace mode, to a 24- or 32-bit color raw image, - or the same color type as the PNG -*) encoding of PNGs, from any raw image to 24- or 32-bit color, or the same color type as the raw image +*) decoding of PNGs with any color type, bit depth and interlace mode, to a 24- +or 32-bit color raw image, or the same color type as the PNG +*) encoding of PNGs, from any raw image to 24- or 32-bit color, or the same +color type as the raw image *) Adam7 interlace and deinterlace for any color type -*) loading the image from harddisk or decoding it from a buffer from other sources than harddisk -*) support for alpha channels, including RGBA color model, translucent palettes and color keying +*) loading the image from harddisk or decoding it from a buffer from other +sources than harddisk +*) support for alpha channels, including RGBA color model, translucent palettes +and color keying *) zlib decompression (inflate) *) zlib compression (deflate) *) CRC32 and ADLER32 checksums -*) colorimetric color profile conversions: currently experimentally available in lodepng_util.cpp only, - plus alternatively ability to pass on chroma/gamma/ICC profile information to other color management system. -*) handling of unknown chunks, allowing making a PNG editor that stores custom and unknown chunks. +*) colorimetric color profile conversions: currently experimentally available in +lodepng_util.cpp only, plus alternatively ability to pass on chroma/gamma/ICC +profile information to other color management system. +*) handling of unknown chunks, allowing making a PNG editor that stores custom +and unknown chunks. *) the following chunks are supported by both encoder and decoder: - IHDR: header information - PLTE: color palette - IDAT: pixel data - IEND: the final chunk - tRNS: transparency for palettized images - tEXt: textual information - zTXt: compressed textual information - iTXt: international textual information - bKGD: suggested background color - pHYs: physical dimensions - tIME: modification time - cHRM: RGB chromaticities - gAMA: RGB gamma correction - iCCP: ICC color profile - sRGB: rendering intent - sBIT: significant bits + IHDR: header information + PLTE: color palette + IDAT: pixel data + IEND: the final chunk + tRNS: transparency for palettized images + tEXt: textual information + zTXt: compressed textual information + iTXt: international textual information + bKGD: suggested background color + pHYs: physical dimensions + tIME: modification time + cHRM: RGB chromaticities + gAMA: RGB gamma correction + iCCP: ICC color profile + sRGB: rendering intent + sBIT: significant bits 1.2. features not supported --------------------------- @@ -1307,8 +1399,10 @@ The following features are supported by the decoder: The following features are not (yet) supported: *) some features needed to make a conformant PNG-Editor might be still missing. -*) partial loading/stream processing. All data must be available and is processed in one call. -*) The hIST and sPLT public chunks are not (yet) supported but treated as unknown chunks +*) partial loading/stream processing. All data must be available and is +processed in one call. +*) The hIST and sPLT public chunks are not (yet) supported but treated as +unknown chunks 2. C and C++ version @@ -1342,10 +1436,11 @@ When using LodePNG, care has to be taken with the C version of LodePNG, as well as the C-style structs when working with C++. The following conventions are used for all C-style structs: --if a struct has a corresponding init function, always call the init function when making a new one --if a struct has a corresponding cleanup function, call it before the struct disappears to avoid memory leaks --if a struct has a corresponding copy function, use the copy function instead of "=". - The destination must also be inited already. +-if a struct has a corresponding init function, always call the init function +when making a new one -if a struct has a corresponding cleanup function, call it +before the struct disappears to avoid memory leaks -if a struct has a +corresponding copy function, use the copy function instead of "=". The +destination must also be inited already. 4. Decoding @@ -1361,16 +1456,19 @@ various lodepng::decode functions, and lodepng::State can be used for advanced features. When using the LodePNGState, it uses the following fields for decoding: -*) LodePNGInfo info_png: it stores extra information about the PNG (the input) in here -*) LodePNGColorMode info_raw: here you can say what color mode of the raw image (the output) you want to get -*) LodePNGDecoderSettings decoder: you can specify a few extra settings for the decoder to use +*) LodePNGInfo info_png: it stores extra information about the PNG (the input) +in here +*) LodePNGColorMode info_raw: here you can say what color mode of the raw image +(the output) you want to get +*) LodePNGDecoderSettings decoder: you can specify a few extra settings for the +decoder to use LodePNGInfo info_png -------------------- -After decoding, this contains extra information of the PNG image, except the actual -pixels, width and height because these are already gotten directly from the decoder -functions. +After decoding, this contains extra information of the PNG image, except the +actual pixels, width and height because these are already gotten directly from +the decoder functions. It contains for example the original color type of the PNG image, text comments, suggested background color, etc... More details about the LodePNGInfo struct are @@ -1416,9 +1514,12 @@ since the encoder input is trusted, the decoder input (a PNG image that could be forged by anyone) is not trusted. When using the LodePNGState, it uses the following fields for encoding: -*) LodePNGInfo info_png: here you specify how you want the PNG (the output) to be. -*) LodePNGColorMode info_raw: here you say what color type of the raw image (the input) has -*) LodePNGEncoderSettings encoder: you can specify a few settings for the encoder to use +*) LodePNGInfo info_png: here you specify how you want the PNG (the output) to +be. +*) LodePNGColorMode info_raw: here you say what color type of the raw image (the +input) has +*) LodePNGEncoderSettings encoder: you can specify a few settings for the +encoder to use LodePNGInfo info_png -------------------- @@ -1466,10 +1567,11 @@ can encode the colors of all pixels without information loss. chunk if force_palette is true. This can used as suggested palette to convert to by viewers that don't support more than 256 colors (if those still exist) *) add_id: add text chunk "Encoder: LodePNG " to the image. -*) text_compression: default 1. If 1, it'll store texts as zTXt instead of tEXt chunks. - zTXt chunks use zlib compression on the text. This gives a smaller result on - large texts but a larger result on small texts (such as a single program name). - It's all tEXt or all zTXt though, there's no separate setting per text yet. +*) text_compression: default 1. If 1, it'll store texts as zTXt instead of tEXt +chunks. zTXt chunks use zlib compression on the text. This gives a smaller +result on large texts but a larger result on small texts (such as a single +program name). It's all tEXt or all zTXt though, there's no separate setting per +text yet. 6. color conversions @@ -1548,19 +1650,19 @@ sometimes result in an error. To avoid some confusion: -the decoder converts from PNG to raw image -the encoder converts from raw image to PNG --the colortype and bitdepth in LodePNGColorMode info_raw, are those of the raw image --the colortype and bitdepth in the color field of LodePNGInfo info_png, are those of the PNG --when encoding, the color type in LodePNGInfo is ignored if auto_convert - is enabled, it is automatically generated instead --when decoding, the color type in LodePNGInfo is set by the decoder to that of the original - PNG image, but it can be ignored since the raw image has the color type you requested instead --if the color type of the LodePNGColorMode and PNG image aren't the same, a conversion - between the color types is done if the color types are supported. If it is not - supported, an error is returned. If the types are the same, no conversion is done. --even though some conversions aren't supported, LodePNG supports loading PNGs from any - colortype and saving PNGs to any colortype, sometimes it just requires preparing - the raw image correctly before encoding. --both encoder and decoder use the same color converter. +-the colortype and bitdepth in LodePNGColorMode info_raw, are those of the raw +image -the colortype and bitdepth in the color field of LodePNGInfo info_png, +are those of the PNG -when encoding, the color type in LodePNGInfo is ignored if +auto_convert is enabled, it is automatically generated instead -when decoding, +the color type in LodePNGInfo is set by the decoder to that of the original PNG +image, but it can be ignored since the raw image has the color type you +requested instead -if the color type of the LodePNGColorMode and PNG image +aren't the same, a conversion between the color types is done if the color types +are supported. If it is not supported, an error is returned. If the types are +the same, no conversion is done. -even though some conversions aren't supported, +LodePNG supports loading PNGs from any colortype and saving PNGs to any +colortype, sometimes it just requires preparing the raw image correctly before +encoding. -both encoder and decoder use the same color converter. The function lodepng_convert does the color conversion. It is available in the interface but normally isn't needed since the encoder and decoder already call @@ -1572,8 +1674,8 @@ the result will look ugly because only the red channel is taken (it assumes all three channels are the same in this case so ignores green and blue). The reason no error is given is to allow converting from three-channel grayscale images to one-channel even if there are numerical imprecisions. --anything to palette when the palette does not have an exact match for a from-color -in it: in this case an error is thrown +-anything to palette when the palette does not have an exact match for a +from-color in it: in this case an error is thrown Supported color conversions: -anything to 8-bit RGB, 8-bit RGBA, 16-bit RGB, 16-bit RGBA @@ -1593,13 +1695,14 @@ info_raw are then ignored. 6.3. padding bits ----------------- -In the PNG file format, if a less than 8-bit per pixel color type is used and the scanlines -have a bit amount that isn't a multiple of 8, then padding bits are used so that each -scanline starts at a fresh byte. But that is NOT true for the LodePNG raw input and output. -The raw input image you give to the encoder, and the raw output image you get from the decoder -will NOT have these padding bits, e.g. in the case of a 1-bit image with a width -of 7 pixels, the first pixel of the second scanline will the 8th bit of the first byte, -not the first bit of a new byte. +In the PNG file format, if a less than 8-bit per pixel color type is used and +the scanlines have a bit amount that isn't a multiple of 8, then padding bits +are used so that each scanline starts at a fresh byte. But that is NOT true for +the LodePNG raw input and output. The raw input image you give to the encoder, +and the raw output image you get from the decoder will NOT have these padding +bits, e.g. in the case of a 1-bit image with a width of 7 pixels, the first +pixel of the second scanline will the 8th bit of the first byte, not the first +bit of a new byte. 6.4. A note about 16-bits per channel and endianness ---------------------------------------------------- @@ -1673,7 +1776,8 @@ unsigned lodepng_chunk_length(const unsigned char* chunk): Get the length of the chunk's data. The total chunk length is this length + 12. void lodepng_chunk_type(char type[5], const unsigned char* chunk): -unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type): +unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* +type): Get the type of the chunk or compare if it's a certain type @@ -1681,11 +1785,12 @@ unsigned char lodepng_chunk_critical(const unsigned char* chunk): unsigned char lodepng_chunk_private(const unsigned char* chunk): unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk): -Check if the chunk is critical in the PNG standard (only IHDR, PLTE, IDAT and IEND are). -Check if the chunk is private (public chunks are part of the standard, private ones not). -Check if the chunk is safe to copy. If it's not, then, when modifying data in a critical -chunk, unsafe to copy chunks of the old image may NOT be saved in the new one if your -program doesn't handle that type of unknown chunk. +Check if the chunk is critical in the PNG standard (only IHDR, PLTE, IDAT and +IEND are). Check if the chunk is private (public chunks are part of the +standard, private ones not). Check if the chunk is safe to copy. If it's not, +then, when modifying data in a critical chunk, unsafe to copy chunks of the old +image may NOT be saved in the new one if your program doesn't handle that type +of unknown chunk. unsigned char* lodepng_chunk_data(unsigned char* chunk): const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk): @@ -1700,18 +1805,19 @@ Check if the crc is correct or generate a correct one. unsigned char* lodepng_chunk_next(unsigned char* chunk): const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk): -Iterate to the next chunk. This works if you have a buffer with consecutive chunks. Note that these -functions do no boundary checking of the allocated data whatsoever, so make sure there is enough -data available in the buffer to be able to go to the next chunk. +Iterate to the next chunk. This works if you have a buffer with consecutive +chunks. Note that these functions do no boundary checking of the allocated data +whatsoever, so make sure there is enough data available in the buffer to be able +to go to the next chunk. -unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk): -unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, unsigned length, - const char* type, const unsigned char* data): +unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const +unsigned char* chunk): unsigned lodepng_chunk_create(unsigned char** out, +size_t* outsize, unsigned length, const char* type, const unsigned char* data): -These functions are used to create new chunks that are appended to the data in *out that has -length *outsize. The append function appends an existing chunk to the new data. The create -function creates a new chunk with the given parameters and appends it. Type is the 4-letter -name of the chunk. +These functions are used to create new chunks that are appended to the data in +*out that has length *outsize. The append function appends an existing chunk to +the new data. The create function creates a new chunk with the given parameters +and appends it. Type is the 4-letter name of the chunk. 8.2. chunks in info_png ----------------------- @@ -1830,9 +1936,11 @@ int main(int argc, char *argv[]) { unsigned error = lodepng::decode(image, width, height, filename); //if there's an error, display it - if(error) std::cout << "decoder error " << error << ": " << lodepng_error_text(error) << std::endl; + if(error) std::cout << "decoder error " << error << ": " << +lodepng_error_text(error) << std::endl; - //the pixels are now in the vector "image", 4 bytes per pixel, ordered RGBARGBA..., use it as texture, draw it, ... + //the pixels are now in the vector "image", 4 bytes per pixel, ordered +RGBARGBA..., use it as texture, draw it, ... } 10.2. decoder C example @@ -1867,10 +1975,10 @@ state.decoder.zlibsettings.ignore_adler32: ignore ADLER32 checksums state.decoder.zlibsettings.custom_...: use custom inflate function state.decoder.ignore_crc: ignore CRC checksums state.decoder.ignore_critical: ignore unknown critical chunks -state.decoder.ignore_end: ignore missing IEND chunk. May fail if this corruption causes other errors -state.decoder.color_convert: convert internal PNG color to chosen one -state.decoder.read_text_chunks: whether to read in text metadata chunks -state.decoder.remember_unknown_chunks: whether to read in unknown chunks +state.decoder.ignore_end: ignore missing IEND chunk. May fail if this corruption +causes other errors state.decoder.color_convert: convert internal PNG color to +chosen one state.decoder.read_text_chunks: whether to read in text metadata +chunks state.decoder.remember_unknown_chunks: whether to read in unknown chunks state.info_raw.colortype: desired color type for decoded image state.info_raw.bitdepth: desired bit depth for decoded image state.info_raw....: more color settings, see struct LodePNGColorMode @@ -1945,55 +2053,55 @@ Not all changes are listed here, the commit history in github lists more: *) 24 aug 2014: Moved to github *) 23 aug 2014: Reduced needless memory usage of decoder. *) 28 jun 2014: Removed fix_png setting, always support palette OOB for - simplicity. Made ColorProfile public. + simplicity. Made ColorProfile public. *) 09 jun 2014: Faster encoder by fixing hash bug and more zeros optimization. *) 22 dec 2013: Power of two windowsize required for optimization. *) 15 apr 2013: Fixed bug with LAC_ALPHA and color key. *) 25 mar 2013: Added an optional feature to ignore some PNG errors (fix_png). *) 11 mar 2013: (!) Bugfix with custom free. Changed from "my" to "lodepng_" - prefix for the custom allocators and made it possible with a new #define to - use custom ones in your project without needing to change lodepng's code. + prefix for the custom allocators and made it possible with a new #define to + use custom ones in your project without needing to change lodepng's code. *) 28 jan 2013: Bugfix with color key. *) 27 okt 2012: Tweaks in text chunk keyword length error handling. *) 8 okt 2012: (!) Added new filter strategy (entropy) and new auto color mode. - (no palette). Better deflate tree encoding. New compression tweak settings. - Faster color conversions while decoding. Some internal cleanups. + (no palette). Better deflate tree encoding. New compression tweak settings. + Faster color conversions while decoding. Some internal cleanups. *) 23 sep 2012: Reduced warnings in Visual Studio a little bit. *) 1 sep 2012: (!) Removed #define's for giving custom (de)compression functions - and made it work with function pointers instead. + and made it work with function pointers instead. *) 23 jun 2012: Added more filter strategies. Made it easier to use custom alloc - and free functions and toggle #defines from compiler flags. Small fixes. + and free functions and toggle #defines from compiler flags. Small fixes. *) 6 may 2012: (!) Made plugging in custom zlib/deflate functions more flexible. *) 22 apr 2012: (!) Made interface more consistent, renaming a lot. Removed - redundant C++ codec classes. Reduced amount of structs. Everything changed, - but it is cleaner now imho and functionality remains the same. Also fixed - several bugs and shrunk the implementation code. Made new samples. + redundant C++ codec classes. Reduced amount of structs. Everything changed, + but it is cleaner now imho and functionality remains the same. Also fixed + several bugs and shrunk the implementation code. Made new samples. *) 6 nov 2011: (!) By default, the encoder now automatically chooses the best - PNG color model and bit depth, based on the amount and type of colors of the - raw image. For this, autoLeaveOutAlphaChannel replaced by auto_choose_color. + PNG color model and bit depth, based on the amount and type of colors of the + raw image. For this, autoLeaveOutAlphaChannel replaced by auto_choose_color. *) 9 okt 2011: simpler hash chain implementation for the encoder. *) 8 sep 2011: lz77 encoder lazy matching instead of greedy matching. *) 23 aug 2011: tweaked the zlib compression parameters after benchmarking. - A bug with the PNG filtertype heuristic was fixed, so that it chooses much - better ones (it's quite significant). A setting to do an experimental, slow, - brute force search for PNG filter types is added. + A bug with the PNG filtertype heuristic was fixed, so that it chooses much + better ones (it's quite significant). A setting to do an experimental, slow, + brute force search for PNG filter types is added. *) 17 aug 2011: (!) changed some C zlib related function names. *) 16 aug 2011: made the code less wide (max 120 characters per line). *) 17 apr 2011: code cleanup. Bugfixes. Convert low to 16-bit per sample colors. *) 21 feb 2011: fixed compiling for C90. Fixed compiling with sections disabled. *) 11 dec 2010: encoding is made faster, based on suggestion by Peter Eastman - to optimize long sequences of zeros. + to optimize long sequences of zeros. *) 13 nov 2010: added LodePNG_InfoColor_hasPaletteAlpha and - LodePNG_InfoColor_canHaveAlpha functions for convenience. + LodePNG_InfoColor_canHaveAlpha functions for convenience. *) 7 nov 2010: added LodePNG_error_text function to get error code description. *) 30 okt 2010: made decoding slightly faster *) 26 okt 2010: (!) changed some C function and struct names (more consistent). - Reorganized the documentation and the declaration order in the header. + Reorganized the documentation and the declaration order in the header. *) 08 aug 2010: only changed some comments and external samples. *) 05 jul 2010: fixed bug thanks to warnings in the new gcc version. *) 14 mar 2010: fixed bug where too much memory was allocated for char buffers. *) 02 sep 2008: fixed bug where it could create empty tree that linux apps could - read by ignoring the problem but windows apps couldn't. + read by ignoring the problem but windows apps couldn't. *) 06 jun 2008: added more error checks for out of memory cases. *) 26 apr 2008: added a few more checks here and there to ensure more safety. *) 06 mar 2008: crash with encoding of strings fixed @@ -2002,72 +2110,74 @@ Not all changes are listed here, the commit history in github lists more: *) 20 jan 2008: support for unknown chunks allowing using LodePNG for an editor. *) 18 jan 2008: support for tIME and pHYs chunks added to encoder and decoder. *) 17 jan 2008: ability to encode and decode compressed zTXt chunks added - Also various fixes, such as in the deflate and the padding bits code. + Also various fixes, such as in the deflate and the padding bits code. *) 13 jan 2008: Added ability to encode Adam7-interlaced images. Improved - filtering code of encoder. + filtering code of encoder. *) 07 jan 2008: (!) changed LodePNG to use ISO C90 instead of C++. A - C++ wrapper around this provides an interface almost identical to before. - Having LodePNG be pure ISO C90 makes it more portable. The C and C++ code - are together in these files but it works both for C and C++ compilers. + C++ wrapper around this provides an interface almost identical to before. + Having LodePNG be pure ISO C90 makes it more portable. The C and C++ code + are together in these files but it works both for C and C++ compilers. *) 29 dec 2007: (!) changed most integer types to unsigned int + other tweaks *) 30 aug 2007: bug fixed which makes this Borland C++ compatible *) 09 aug 2007: some VS2005 warnings removed again *) 21 jul 2007: deflate code placed in new namespace separate from zlib code *) 08 jun 2007: fixed bug with 2- and 4-bit color, and small interlaced images *) 04 jun 2007: improved support for Visual Studio 2005: crash with accessing - invalid std::vector element [0] fixed, and level 3 and 4 warnings removed + invalid std::vector element [0] fixed, and level 3 and 4 warnings removed *) 02 jun 2007: made the encoder add a tag with version by default *) 27 may 2007: zlib and png code separated (but still in the same file), - simple encoder/decoder functions added for more simple usage cases + simple encoder/decoder functions added for more simple usage cases *) 19 may 2007: minor fixes, some code cleaning, new error added (error 69), - moved some examples from here to lodepng_examples.cpp + moved some examples from here to lodepng_examples.cpp *) 12 may 2007: palette decoding bug fixed *) 24 apr 2007: changed the license from BSD to the zlib license *) 11 mar 2007: very simple addition: ability to encode bKGD chunks. *) 04 mar 2007: (!) tEXt chunk related fixes, and support for encoding - palettized PNG images. Plus little interface change with palette and texts. + palettized PNG images. Plus little interface change with palette and texts. *) 03 mar 2007: Made it encode dynamic Huffman shorter with repeat codes. - Fixed a bug where the end code of a block had length 0 in the Huffman tree. + Fixed a bug where the end code of a block had length 0 in the Huffman tree. *) 26 feb 2007: Huffman compression with dynamic trees (BTYPE 2) now implemented - and supported by the encoder, resulting in smaller PNGs at the output. + and supported by the encoder, resulting in smaller PNGs at the output. *) 27 jan 2007: Made the Adler-32 test faster so that a timewaste is gone. *) 24 jan 2007: gave encoder an error interface. Added color conversion from any - greyscale type to 8-bit greyscale with or without alpha. + greyscale type to 8-bit greyscale with or without alpha. *) 21 jan 2007: (!) Totally changed the interface. It allows more color types - to convert to and is more uniform. See the manual for how it works now. + to convert to and is more uniform. See the manual for how it works now. *) 07 jan 2007: Some cleanup & fixes, and a few changes over the last days: - encode/decode custom tEXt chunks, separate classes for zlib & deflate, and - at last made the decoder give errors for incorrect Adler32 or Crc. + encode/decode custom tEXt chunks, separate classes for zlib & deflate, and + at last made the decoder give errors for incorrect Adler32 or Crc. *) 01 jan 2007: Fixed bug with encoding PNGs with less than 8 bits per channel. *) 29 dec 2006: Added support for encoding images without alpha channel, and - cleaned out code as well as making certain parts faster. + cleaned out code as well as making certain parts faster. *) 28 dec 2006: Added "Settings" to the encoder. -*) 26 dec 2006: The encoder now does LZ77 encoding and produces much smaller files now. - Removed some code duplication in the decoder. Fixed little bug in an example. -*) 09 dec 2006: (!) Placed output parameters of public functions as first parameter. - Fixed a bug of the decoder with 16-bit per color. +*) 26 dec 2006: The encoder now does LZ77 encoding and produces much smaller +files now. Removed some code duplication in the decoder. Fixed little bug in an +example. +*) 09 dec 2006: (!) Placed output parameters of public functions as first +parameter. Fixed a bug of the decoder with 16-bit per color. *) 15 okt 2006: Changed documentation structure *) 09 okt 2006: Encoder class added. It encodes a valid PNG image from the - given image buffer, however for now it's not compressed. + given image buffer, however for now it's not compressed. *) 08 sep 2006: (!) Changed to interface with a Decoder class -*) 30 jul 2006: (!) LodePNG_InfoPng , width and height are now retrieved in different - way. Renamed decodePNG to decodePNGGeneric. +*) 30 jul 2006: (!) LodePNG_InfoPng , width and height are now retrieved in +different way. Renamed decodePNG to decodePNGGeneric. *) 29 jul 2006: (!) Changed the interface: image info is now returned as a - struct of type LodePNG::LodePNG_Info, instead of a vector, which was a bit clumsy. + struct of type LodePNG::LodePNG_Info, instead of a vector, which was a bit +clumsy. *) 28 jul 2006: Cleaned the code and added new error checks. - Corrected terminology "deflate" into "inflate". + Corrected terminology "deflate" into "inflate". *) 23 jun 2006: Added SDL example in the documentation in the header, this - example allows easy debugging by displaying the PNG and its transparency. + example allows easy debugging by displaying the PNG and its transparency. *) 22 jun 2006: (!) Changed way to obtain error value. Added - loadFile function for convenience. Made decodePNG32 faster. + loadFile function for convenience. Made decodePNG32 faster. *) 21 jun 2006: (!) Changed type of info vector to unsigned. - Changed position of palette in info vector. Fixed an important bug that - happened on PNGs with an uncompressed block. + Changed position of palette in info vector. Fixed an important bug that + happened on PNGs with an uncompressed block. *) 16 jun 2006: Internally changed unsigned into unsigned where - needed, and performed some optimizations. + needed, and performed some optimizations. *) 07 jun 2006: (!) Renamed functions to decodePNG and placed them - in LodePNG namespace. Changed the order of the parameters. Rewrote the - documentation in the header. Renamed files to lodepng.cpp and lodepng.h + in LodePNG namespace. Changed the order of the parameters. Rewrote the + documentation in the header. Renamed files to lodepng.cpp and lodepng.h *) 22 apr 2006: Optimized and improved some code *) 07 sep 2005: (!) Changed to std::vector interface *) 12 aug 2005: Initial release (C++, decoder only) diff --git a/msposd.c b/msposd.c index c9b067f..d11ea9a 100644 --- a/msposd.c +++ b/msposd.c @@ -1,27 +1,26 @@ +#include "version.h" +#include +#include +#include +#include #include -#include #include +#include +#include +#include +#include #include -#include -#include #include -#include -#include -#include -#include #include -#include -#include +#include #include -#include #include -#include "version.h" +#include -#include -#include #include #include - +#include +#include #include "mavlink/common/mavlink.h" @@ -37,93 +36,100 @@ #define MAX_MTU 9000 #include "osd/util/settings.h" -//This needs to be patched in the kernel to work -#define UART_FCR_TRIGGER_RX_L3 0x10000 +// This needs to be patched in the kernel to work +#define UART_FCR_TRIGGER_RX_L3 0x10000 bool vtxMenuActive = false; bool armed = true; // assume armed until we are told otherwise from the fc -bool AbortNow=false; +bool AbortNow = false; bool verbose = false; bool ParseMSP = true; bool DrawOSD = false; bool mspVTXenabled = false; bool vtxMenuEnabled = false; -//libevent base main loop +// libevent base main loop struct event_base *base = NULL; int serial_fd = 0; int in_sock = 0; -int MSPUDPPort=0; +int MSPUDPPort = 0; -int MSP_PollRate=20; +int MSP_PollRate = 20; -int matrix_size=0; +int matrix_size = 0; -int AHI_Enabled=1; +int AHI_Enabled = 1; -bool enable_simple_uart=false; +bool enable_simple_uart = false; const char *default_master = "/dev/ttyAMA0"; const int default_baudrate = 115200; const char *defualt_out_addr = ""; -const char *default_in_addr = "127.0.0.1:0"; -const int RC_CHANNELS = 65; //RC_CHANNELS ( #65 ) for regular MAVLINK RC Channels read (https://mavlink.io/en/messages/common.html#RC_CHANNELS) -const int RC_CHANNELS_RAW = 35; //RC_CHANNELS_RAW ( #35 ) for ExpressLRS,Crossfire and other RC procotols (https://mavlink.io/en/messages/common.html#RC_CHANNELS_RAW) - - -//if we gonna use MSP parsing +const char *default_in_addr = "127.0.0.1:0"; +const int RC_CHANNELS = 65; // RC_CHANNELS ( #65 ) for regular MAVLINK RC Channels read + // (https://mavlink.io/en/messages/common.html#RC_CHANNELS) +const int RC_CHANNELS_RAW = 35; // RC_CHANNELS_RAW ( #35 ) for ExpressLRS,Crossfire and other RC + // procotols + // (https://mavlink.io/en/messages/common.html#RC_CHANNELS_RAW) + +// if we gonna use MSP parsing msp_state_t *rx_msp_state; struct bufferevent *serial_bev; struct sockaddr_in sin_out = { .sin_family = AF_INET, }; -int out_sock=0; - +int out_sock = 0; -long aggregate=1; +long aggregate = 1; /* -When aggregating packets, we flush when a message that draws artifical horizon (AHI). This shows the minimum size of packets in the buffer in order to flush -If we need smooth response of the OSD, then set this to 1. -Value of 3 is a compromise, 3 sequential packets for AHI change will be aggregated, this will save bandwidth, but will reduse the frame rate of the OSD. +When aggregating packets, we flush when a message that draws artifical horizon +(AHI). This shows the minimum size of packets in the buffer in order to flush If +we need smooth response of the OSD, then set this to 1. Value of 3 is a +compromise, 3 sequential packets for AHI change will be aggregated, this will +save bandwidth, but will reduse the frame rate of the OSD. */ -int minAggPckts=3; +int minAggPckts = 3; -bool monitor_wfb=false; +bool monitor_wfb = false; static int temp = false; - -static void print_usage() -{ +static void print_usage() { printf("Usage: msposd [OPTIONS]\n" - "Where:\n" - - " -m --master Serial port to receive MSP (%s by default)\n" - " -b --baudrate Serial port baudrate (%d by default)\n" - " -o --output UDP endpoint to forward aggregated MSP messages (%s)\n" - " -c --channels RC Channel to listen for commands (0 by default) and exec channels.sh. This command can be repeated. Channel values are 1-based.\n" -" -w --wait Delay after each command received(2000ms default)\n" - " -r --fps Max MSP Display refresh rate(5..50)\n" - " -p --persist How long a channel value must persist to generate a command - for multiposition switches (0ms default)\n" - " -t --temp Read SoC temperature\n" - " -d --wfb Monitors wfb.log file and reports errors via HUD messages\n" - " -s --osd Parse MSP and draw OSD over the video\n" - " -a --ahi Draw graphic AHI, mode [0-No, 2-Simple 1-Ladder, 3-LadderEx]\n" - " -x --matrix OSD matrix (0 - 53:20 , 1- 50:18 chars)\n" - " --mspvtx Enable mspvtx support\n" - " -v --verbose Show debug infot\n" - " --help Display this help\n", - - - - default_master, default_baudrate, defualt_out_addr); + "Where:\n" + + " -m --master Serial port to receive MSP (%s by default)\n" + " -b --baudrate Serial port baudrate (%d by default)\n" + " -o --output UDP endpoint to forward aggregated MSP " + "messages (%s)\n" + " -c --channels RC Channel to listen for commands (0 by default) " + "and " + "exec channels.sh. This command can be repeated. Channel values are " + "1-based.\n" + " -w --wait Delay after each command received(2000ms " + "default)\n" + " -r --fps Max MSP Display refresh rate(5..50)\n" + " -p --persist How long a channel value must persist to generate " + "a " + "command - for multiposition switches (0ms default)\n" + " -t --temp Read SoC temperature\n" + " -d --wfb Monitors wfb.log file and reports errors via HUD " + "messages\n" + " -s --osd Parse MSP and draw OSD over the video\n" + " -a --ahi Draw graphic AHI, mode [0-No, 2-Simple 1-Ladder, " + "3-LadderEx]\n" + " -x --matrix OSD matrix (0 - 53:20 , 1- 50:18 chars)\n" + " --mspvtx Enable mspvtx support\n" + " -v --verbose Show debug infot\n" + " --help Display this help\n", + + default_master, default_baudrate, defualt_out_addr); } -static speed_t speed_by_value(int baudrate) -{ +static speed_t speed_by_value(int baudrate) { switch (baudrate) { case 9600: return B9600; @@ -153,17 +159,15 @@ static speed_t speed_by_value(int baudrate) uint64_t get_current_time_ms() // in milliseconds { - struct timespec ts; - int rc = clock_gettime(1 /*CLOCK_MONOTONIC*/, &ts); - //if (rc < 0) -// return get_current_time_ms_Old(); - return ts.tv_sec * 1000LL + ts.tv_nsec / 1000000; + struct timespec ts; + int rc = clock_gettime(1 /*CLOCK_MONOTONIC*/, &ts); + // if (rc < 0) + // return get_current_time_ms_Old(); + return ts.tv_sec * 1000LL + ts.tv_nsec / 1000000; } -static bool parse_host_port(const char *s, struct in_addr *out_addr, - in_port_t *out_port) -{ - char host_and_port[32] = { 0 }; +static bool parse_host_port(const char *s, struct in_addr *out_addr, in_port_t *out_port) { + char host_and_port[32] = {0}; strncpy(host_and_port, s, sizeof(host_and_port) - 1); char *colon = strchr(host_and_port, ':'); @@ -190,343 +194,326 @@ static bool parse_host_port(const char *s, struct in_addr *out_addr, return true; } -static void signal_cb(evutil_socket_t fd, short event, void *arg) -{ +static void signal_cb(evutil_socket_t fd, short event, void *arg) { struct event_base *base = arg; (void)event; - AbortNow=true; + AbortNow = true; printf("Exit Request: %s signal received\n", strsignal(fd)); event_base_loopbreak(base); } +#define MAX_BUFFER_SIZE 50 // Limited by mavlink -#define MAX_BUFFER_SIZE 50 //Limited by mavlink - -static char MavLinkMsgFile[128]= "mavlink.msg"; +static char MavLinkMsgFile[128] = "mavlink.msg"; #ifdef _x86 -static char WfbLogFile[128]= "wfb.log"; +static char WfbLogFile[128] = "wfb.log"; #else -static char WfbLogFile[128]= "/tmp/wfb.log"; +static char WfbLogFile[128] = "/tmp/wfb.log"; #endif -bool Check4MavlinkMsg(char* buffer) { - //const char *filename = MavLinkMsgFile;//"mavlink.msg"; - - FILE *file = fopen(MavLinkMsgFile, "rb"); - if (file == NULL)// No file, no problem - return false; - - size_t bytesRead = fread(buffer, 1, MAX_BUFFER_SIZE, file); - fclose(file); - - if (bytesRead > 0) { +bool Check4MavlinkMsg(char *buffer) { + // const char *filename = MavLinkMsgFile;//"mavlink.msg"; + + FILE *file = fopen(MavLinkMsgFile, "rb"); + if (file == NULL) // No file, no problem + return false; + + size_t bytesRead = fread(buffer, 1, MAX_BUFFER_SIZE, file); + fclose(file); + + if (bytesRead > 0) { if (verbose) - printf("Mavlink msg from file:%s\n", buffer); - if (remove(MavLinkMsgFile) != 0) - printf("Error deleting file"); + printf("Mavlink msg from file:%s\n", buffer); + if (remove(MavLinkMsgFile) != 0) + printf("Error deleting file"); return true; - } else - printf("Mavlink empty file ?!\n"); + } else + printf("Mavlink empty file ?!\n"); return false; } -static uint8_t system_id=1; +static uint8_t system_id = 1; -static unsigned long long LastWfbSent=0; +static unsigned long long LastWfbSent = 0; -/// @brief wfb_tx output should be redirected to wfb.log. Parse it and extracted dropped packets! +/// @brief wfb_tx output should be redirected to wfb.log. Parse it and extracted +/// dropped packets! /// @return Number of dropped packets for the last period -int SendWfbLogToGround(){ +int SendWfbLogToGround() { if (!monitor_wfb) return false; - if ( abs(get_current_time_ms()-LastWfbSent) < 1000)//Once a second max + if (abs(get_current_time_ms() - LastWfbSent) < 1000) // Once a second max return 0; - LastWfbSent = abs(get_current_time_ms()); + LastWfbSent = abs(get_current_time_ms()); char msg_buf[200]; - FILE *file = fopen(WfbLogFile, "r"); - if (file == NULL) { + FILE *file = fopen(WfbLogFile, "r"); + if (file == NULL) { if (verbose) - printf("No file %s\n",WfbLogFile); - return 0; - } - - char buff[200]; - int total_dropped_packets = 0; + printf("No file %s\n", WfbLogFile); + return 0; + } -/* -UDP rxq overflow: 2 packets dropped -UDP rxq overflow: 45 packets dropped -*/ - //if (verbose) - // printf("Parsing file: %s\n",WfbLogFile); - int maxlinestoparse=0; - // Read lines from the file and parse for dropped packets - while (fgets(buff, sizeof(buff), file) != NULL) { - if ((maxlinestoparse++) >30){//If the file is very long, no need to struggle - total_dropped_packets=9999; + char buff[200]; + int total_dropped_packets = 0; + + /* + UDP rxq overflow: 2 packets dropped + UDP rxq overflow: 45 packets dropped + */ + // if (verbose) + // printf("Parsing file: %s\n",WfbLogFile); + int maxlinestoparse = 0; + // Read lines from the file and parse for dropped packets + while (fgets(buff, sizeof(buff), file) != NULL) { + if ((maxlinestoparse++) > 30) { // If the file is very long, no need to struggle + total_dropped_packets = 9999; break; } - if (strstr(buff, "packets dropped") != NULL) { // Check if the line contains "packets dropped" - char *token = strtok(buff, " ");//split by space, Parse the line to extract the number of dropped packets - while (token != NULL) { - if (isdigit(token[0])) { - int dropped_packets = atoi(token); - total_dropped_packets += dropped_packets; - break; - } - token = strtok(NULL, " "); - } - } - } - fclose(file); - - if (maxlinestoparse==0 && total_dropped_packets==0)//file was empty + if (strstr(buff, "packets dropped") != + NULL) { // Check if the line contains "packets dropped" + char *token = strtok(buff, " "); // split by space, Parse the line to + // extract the number of dropped packets + while (token != NULL) { + if (isdigit(token[0])) { + int dropped_packets = atoi(token); + total_dropped_packets += dropped_packets; + break; + } + token = strtok(NULL, " "); + } + } + } + fclose(file); + + if (maxlinestoparse == 0 && total_dropped_packets == 0) // file was empty return 0; - //remove(WfbLogFile) // This will break console output in the file! - - file = fopen(WfbLogFile, "w");// Open the file in write mode, truncating it to zero size - if (file != NULL) - fclose(file); - - - if (false /*out_sock>0*/){//if we have outbound socket for mavlink, but now if available it is used for MSP - sprintf(msg_buf,"%d video pckts dropped!\n", total_dropped_packets); - printf("%s",msg_buf); - + // remove(WfbLogFile) // This will break console output in the file! + + file = fopen(WfbLogFile, + "w"); // Open the file in write mode, truncating it to zero size + if (file != NULL) + fclose(file); + + if (false /*out_sock>0*/) { // if we have outbound socket for mavlink, but + // now if available it is used for MSP + sprintf(msg_buf, "%d video pckts dropped!\n", total_dropped_packets); + printf("%s", msg_buf); + mavlink_message_t message; - - mavlink_msg_statustext_pack_chan( - system_id, - MAV_COMP_ID_SYSTEM_CONTROL, - MAVLINK_COMM_1, + + mavlink_msg_statustext_pack_chan(system_id, MAV_COMP_ID_SYSTEM_CONTROL, MAVLINK_COMM_1, &message, - 4, // 4 - Warning, 5 - Error - msg_buf, - 0,0); + 4, // 4 - Warning, 5 - Error + msg_buf, 0, 0); uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; const int len = mavlink_msg_to_send_buffer(buffer, &message); - + sendto(out_sock, buffer, len, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); } - return total_dropped_packets; - + return total_dropped_packets; } - -static bool SendInfoToGround(){ +static bool SendInfoToGround() { char msg_buf[MAX_BUFFER_SIZE]; if (!Check4MavlinkMsg(&msg_buf[0])) return false; - //Huston, we have a message for you. - mavlink_message_t message; - - mavlink_msg_statustext_pack_chan( - system_id, - MAV_COMP_ID_SYSTEM_CONTROL, - MAVLINK_COMM_1, - &message, - 4, // 4 - Warning, 5 - Error - msg_buf, - 0,0); - - uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; - const int len = mavlink_msg_to_send_buffer(buffer, &message); - + // Huston, we have a message for you. + mavlink_message_t message; + + mavlink_msg_statustext_pack_chan(system_id, MAV_COMP_ID_SYSTEM_CONTROL, MAVLINK_COMM_1, + &message, + 4, // 4 - Warning, 5 - Error + msg_buf, 0, 0); + + uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; + const int len = mavlink_msg_to_send_buffer(buffer, &message); + sendto(out_sock, buffer, len, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - return true; + return true; } uint64_t get_current_time_ms_Old() { - time_t current_time = time(NULL); - return (uint64_t)(current_time * 1000); + time_t current_time = time(NULL); + return (uint64_t)(current_time * 1000); } - int last_wifi_temp; -static long last_wifi_temp_taken=0; -int GetTXTemp(){ +static long last_wifi_temp_taken = 0; + +int GetTXTemp() { - if ((get_time_ms() - last_wifi_temp_taken ) < 1000)//Set some caching to keep CPU load low + if ((get_time_ms() - last_wifi_temp_taken) < 1000) // Set some caching to keep CPU load low return last_wifi_temp; - last_wifi_temp_taken= get_time_ms(); - - glob_t glob_result; - FILE *stat = NULL; - int temperature=0; - - if (glob("/proc/net/*/*/thermal_state", GLOB_NOSORT, NULL, &glob_result) == 0) { - if (glob_result.gl_pathc > 0) { - // Open the first match - stat = fopen(glob_result.gl_pathv[0], "r"); - if (stat == NULL) { - fprintf(stderr, "Failed to open the thermal_state file: %s\n", glob_result.gl_pathv[0]); - globfree(&glob_result); - return -99; - } + last_wifi_temp_taken = get_time_ms(); + + glob_t glob_result; + FILE *stat = NULL; + int temperature = 0; + + if (glob("/proc/net/*/*/thermal_state", GLOB_NOSORT, NULL, &glob_result) == 0) { + if (glob_result.gl_pathc > 0) { + // Open the first match + stat = fopen(glob_result.gl_pathv[0], "r"); + if (stat == NULL) { + fprintf( + stderr, "Failed to open the thermal_state file: %s\n", glob_result.gl_pathv[0]); + globfree(&glob_result); + return -99; + } char buffer[128]; // Read the first line of output - if (fgets(buffer, sizeof(buffer), stat) != NULL) { - if (sscanf(buffer, "rf_path: %*d, thermal_value: %*d, offset: %*d, temperature: %d", &temperature) == 1) { + if (fgets(buffer, sizeof(buffer), stat) != NULL) { + if (sscanf(buffer, + "rf_path: %*d, thermal_value: %*d, offset: %*d, " + "temperature: %d", + &temperature) == 1) { printf("WiFi Temperature from the first line: %d\n", temperature); } else { fprintf(stderr, "Failed to parse wifi temperature\n"); } } - fclose(stat); - } else { - fprintf(stderr, "No thermal_state files found in /proc/net\n"); - } - } else { - fprintf(stderr, "Failed to glob /proc/net/*/thermal_state\n"); - } - - // Clean up - globfree(&glob_result); - last_wifi_temp=temperature; + fclose(stat); + } else { + fprintf(stderr, "No thermal_state files found in /proc/net\n"); + } + } else { + fprintf(stderr, "Failed to glob /proc/net/*/thermal_state\n"); + } + + // Clean up + globfree(&glob_result); + last_wifi_temp = temperature; return temperature; } int last_board_temp; -static long last_board_temp_taken=0; - -/// @brief -/// @return -100 if no sigmastar found -int GetTempSigmaStar(){ +static long last_board_temp_taken = 0; +/// @brief +/// @return -100 if no sigmastar found +int GetTempSigmaStar() { - if ( (get_time_ms() - last_board_temp_taken ) < 1000)//Set some caching to keep CPU load low + if ((get_time_ms() - last_board_temp_taken) < 1000) // Set some caching to keep CPU load low return last_board_temp; - last_board_temp_taken= get_time_ms(); -//https://wx.comake.online/doc/doc/SigmaStarDocs-SSD220-SIGMASTAR-202305231834/platform/BSP/Ikayaki/frequency_en.html - FILE *file = fopen("/sys/devices/virtual/mstar/msys/TEMP_R", "r"); //Temperature 62 - if (file == NULL) { + last_board_temp_taken = get_time_ms(); + // https://wx.comake.online/doc/doc/SigmaStarDocs-SSD220-SIGMASTAR-202305231834/platform/BSP/Ikayaki/frequency_en.html + FILE *file = fopen("/sys/devices/virtual/mstar/msys/TEMP_R", "r"); // Temperature 62 + if (file == NULL) { if (verbose) - printf("No temp data at %s\n",WfbLogFile); - return -100; - } - last_board_temp=-100; - char buff[200]; - // Read lines from the file and parse for dropped packets - if (fgets(buff, sizeof(buff), file) != NULL) { - char *temperature_str = strstr(buff, "Temperature"); // Find "Temperature" - if (temperature_str != NULL) - last_board_temp = atoi(temperature_str + 12); // Extract temperature value - } - fclose(file); - - if (verbose && last_board_temp<-90) - printf("No temp data in file %s\n",WfbLogFile); - - //printf("SigmaStar temp: %d\n",last_board_temp); - return last_board_temp; + printf("No temp data at %s\n", WfbLogFile); + return -100; + } + last_board_temp = -100; + char buff[200]; + // Read lines from the file and parse for dropped packets + if (fgets(buff, sizeof(buff), file) != NULL) { + char *temperature_str = strstr(buff, "Temperature"); // Find "Temperature" + if (temperature_str != NULL) + last_board_temp = atoi(temperature_str + 12); // Extract temperature value + } + fclose(file); + if (verbose && last_board_temp < -90) + printf("No temp data in file %s\n", WfbLogFile); + + // printf("SigmaStar temp: %d\n",last_board_temp); + return last_board_temp; } static uint64_t LastTempSent; - -static int SendTempToGround(unsigned char* mavbuf){ +static int SendTempToGround(unsigned char *mavbuf) { - if ( abs(get_current_time_ms()-LastTempSent) < 1000)//Once a second + if (abs(get_current_time_ms() - LastTempSent) < 1000) // Once a second return 0; LastTempSent = abs(get_current_time_ms()); - if(temp==2)//read the temperature only once per second - last_board_temp=GetTempSigmaStar(); + if (temp == 2) // read the temperature only once per second + last_board_temp = GetTempSigmaStar(); char msg_buf[MAX_BUFFER_SIZE]; - mavlink_message_t message; - - mavlink_msg_raw_imu_pack_chan( - system_id, - MAV_COMP_ID_SYSTEM_CONTROL, - MAVLINK_COMM_1, - &message,0,0,0,0,0,0,0,0,0,0,0, - last_board_temp*100 - ); - - uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; - const int len = mavlink_msg_to_send_buffer(mavbuf, &message); - //printf("temp %f sent with %d bytes",last_board_temp*100,len); - - return len; + mavlink_message_t message; + + mavlink_msg_raw_imu_pack_chan(system_id, MAV_COMP_ID_SYSTEM_CONTROL, MAVLINK_COMM_1, &message, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, last_board_temp * 100); + + uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; + const int len = mavlink_msg_to_send_buffer(mavbuf, &message); + // printf("temp %f sent with %d bytes",last_board_temp*100,len); + + return len; } -bool version_shown=false; -static void ShowVersionOnce(mavlink_message_t* msg, uint8_t header){ +bool version_shown = false; + +static void ShowVersionOnce(mavlink_message_t *msg, uint8_t header) { if (version_shown) return; - version_shown=true; -/* -The major version can be determined from the packet start marker byte: -MAVLink 1: 0xFE -MAVLink 2: 0xFD -*/ - if (header==0xFE) - printf("Detected MAVLink ver: 1.0 (%d)\n",msg->magic); - if (header==0xFD) - printf("Detected MAVLink version: 2.0 (%d)\n",msg->magic); + version_shown = true; + /* + The major version can be determined from the packet start marker byte: + MAVLink 1: 0xFE + MAVLink 2: 0xFD + */ + if (header == 0xFE) + printf("Detected MAVLink ver: 1.0 (%d)\n", msg->magic); + if (header == 0xFD) + printf("Detected MAVLink version: 2.0 (%d)\n", msg->magic); + + printf("System_id = %d \n", system_id); +} - printf("System_id = %d \n",system_id); +bool fc_shown = false; -} -bool fc_shown=false; -void handle_heartbeat(const mavlink_message_t* message) -{ +void handle_heartbeat(const mavlink_message_t *message) { if (fc_shown) return; - fc_shown=true; - - mavlink_heartbeat_t heartbeat; - mavlink_msg_heartbeat_decode(message, &heartbeat); - - printf("Flight Controller Type :"); - switch (heartbeat.autopilot) { - case MAV_AUTOPILOT_GENERIC: - printf("Generic/INAV"); - break; - case MAV_AUTOPILOT_ARDUPILOTMEGA: - printf("ArduPilot"); - break; - case MAV_AUTOPILOT_PX4: - printf("PX4"); - break; - default: - printf("other"); - break; - } - printf("\n"); -} + fc_shown = true; + mavlink_heartbeat_t heartbeat; + mavlink_msg_heartbeat_decode(message, &heartbeat); -void handle_statustext(const mavlink_message_t* message) -{ - mavlink_statustext_t statustext; - mavlink_msg_statustext_decode(message, &statustext); - printf("FC message:%s", statustext.text); + printf("Flight Controller Type :"); + switch (heartbeat.autopilot) { + case MAV_AUTOPILOT_GENERIC: + printf("Generic/INAV"); + break; + case MAV_AUTOPILOT_ARDUPILOTMEGA: + printf("ArduPilot"); + break; + case MAV_AUTOPILOT_PX4: + printf("PX4"); + break; + default: + printf("other"); + break; + } + printf("\n"); +} +void handle_statustext(const mavlink_message_t *message) { + mavlink_statustext_t statustext; + mavlink_msg_statustext_decode(message, &statustext); + printf("FC message:%s", statustext.text); } unsigned long long get_current_time_ms_simple() { - clock_t current_clock_ticks = clock(); - return (unsigned long long)(current_clock_ticks * 1000 / CLOCKS_PER_SEC); - + clock_t current_clock_ticks = clock(); + return (unsigned long long)(current_clock_ticks * 1000 / CLOCKS_PER_SEC); } - - uint16_t channels[18]; // Channel monitoring: @@ -536,215 +523,218 @@ uint16_t channels[18]; // Whether the channel monitoring was enabled. bool rc_channel_mon_enabled = false; // A boolean array that defines which channels are monitored. -// Setting a value to "true" will make this program run /usr/bin/channels.sh +// Setting a value to "true" will make this program run /usr/bin/channels.sh // if the channel value changes. static bool rc_channel_mon[kChannelCount] = {0}; -//Time to wait between bash script starts. -long wait_after_bash=2000; +// Time to wait between bash script starts. +long wait_after_bash = 2000; -//how long a RC value should stay at one level to issue a command -int ChannelPersistPeriodMS=2000; +// how long a RC value should stay at one level to issue a command +int ChannelPersistPeriodMS = 2000; -static uint64_t LastStart[kChannelCount] = {0};// +static uint64_t LastStart[kChannelCount] = {0}; // static unsigned long LastValue[kChannelCount] = {0}; uint16_t NewValue[kChannelCount] = {0}; static uint64_t NewValueStart[kChannelCount] = {0}; unsigned int ChannelCmds[kChannelCount] = {0}; -static uint64_t mavpckts_ttl=0; - - -void ProcessChannel(int rc_channel_no){ - //rc_channel_no, zero based - uint16_t val=0; - if (rc_channel_no<0 || rc_channel_no>15 /* || (mavpckts_ttl<100*/ ) //wait in the beginning for the values to settle +static uint64_t mavpckts_ttl = 0; + +void ProcessChannel(int rc_channel_no) { + // rc_channel_no, zero based + uint16_t val = 0; + if (rc_channel_no < 0 || + rc_channel_no > 15 /* || (mavpckts_ttl<100*/) // wait in the beginning for + // the values to settle return; if (!armed) handle_stickcommands(channels); - if ( abs(get_current_time_ms()-LastStart[rc_channel_no]) < wait_after_bash) + if (abs(get_current_time_ms() - LastStart[rc_channel_no]) < wait_after_bash) return; - val=channels[rc_channel_no]; + val = channels[rc_channel_no]; + + if (abs(val - NewValue[rc_channel_no]) > 32 && ChannelPersistPeriodMS > 0) { + // We have a new value, let us wait for it to persist + NewValue[rc_channel_no] = val; + NewValueStart[rc_channel_no] = get_current_time_ms(); + return; + } else if (abs(get_current_time_ms() - NewValueStart[rc_channel_no]) < ChannelPersistPeriodMS) + return; // New value should remain "stable" for a second before being + // approved + else { + } // New value persisted for more THAN ChannelPersistPeriodMS - if (abs(val-NewValue[rc_channel_no])>32 && ChannelPersistPeriodMS>0){ - //We have a new value, let us wait for it to persist - NewValue[rc_channel_no]=val; - NewValueStart[rc_channel_no]=get_current_time_ms(); + if (abs(val - LastValue[rc_channel_no]) < 32) // the change is too small return; - }else - if (abs(get_current_time_ms()-NewValueStart[rc_channel_no])0){ - //intentionally skip the first command, since when starting it will always receive some channel value and execute the script - system(buff); + printf("Starting(%d): %s \n", ChannelCmds[rc_channel_no], buff); + LastStart[rc_channel_no] = get_current_time_ms(); + + if (ChannelCmds[rc_channel_no] > 0) { + // intentionally skip the first command, since when starting it will + // always receive some channel value and execute the script + system(buff); } - printf("Started(%d): %s \n",ChannelCmds[rc_channel_no],buff); + printf("Started(%d): %s \n", ChannelCmds[rc_channel_no], buff); ChannelCmds[rc_channel_no]++; - } -void ProcessChannels(){ - for (int i=0; i < kChannelCount; ++i) { +void ProcessChannels() { + for (int i = 0; i < kChannelCount; ++i) { if (rc_channel_mon[i]) ProcessChannel(i); } } -void showchannels(int count){ - if (verbose){ - printf("Channels :"); - for (int i =0; i 2000){ +unsigned int mavbuff_offset = 0; +unsigned int mavpckts_count = 0; + +static void process_mavlink(uint8_t *buffer, int count, void *arg) { + + mavlink_message_t message; + mavlink_status_t status; + for (int i = 0; i < count; ++i) { + + if (mavbuff_offset > 2000) { printf("Mavlink buffer overflowed! Packed lost!\n"); - mavbuff_offset=0; + mavbuff_offset = 0; } - mavbuf[mavbuff_offset]=buffer[i]; + mavbuf[mavbuff_offset] = buffer[i]; mavbuff_offset++; - if (mavlink_parse_char(MAVLINK_COMM_0, buffer[i], &message, &status) == 1) { + if (mavlink_parse_char(MAVLINK_COMM_0, buffer[i], &message, &status) == 1) { mavpckts_ttl++; - system_id=message.sysid; - ShowVersionOnce(&message, (uint8_t) buffer[0]); + system_id = message.sysid; + ShowVersionOnce(&message, (uint8_t)buffer[0]); if (verbose) - printf("Mavlink msg %d no: %d\n",message.msgid, message.seq); - switch (message.msgid) { - case MAVLINK_MSG_ID_RC_CHANNELS_RAW://35 Used by INAV - handle_msg_id_rc_channels_raw(&message); - break; - case MAVLINK_MSG_ID_RC_CHANNELS_OVERRIDE://70 - handle_msg_id_rc_channels_override(&message); - break; - - case MAVLINK_MSG_ID_RC_CHANNELS://65 used by ArduPilot - handle_msg_id_rc_channels(&message); - break; - - case MAVLINK_MSG_ID_HEARTBEAT://Msg info from the FC - handle_heartbeat(&message); - break; - case MAVLINK_MSG_ID_STATUSTEXT://Msg info from the FC - //handle_statustext(&message); - break; - } - - mavpckts_count++; - bool mustflush=false; - if (aggregate>0){//We will send whole packets only - if ( - ((aggregate>=1 && aggregate<50 ) && mavpckts_count>=aggregate ) || //if packets more than treshold - ((aggregate>50 && aggregate<2000 ) && mavbuff_offset>=aggregate ) || //if buffer more than treshold - ((mavpckts_count>=minAggPckts) && message.msgid==MAVLINK_MSG_ID_ATTITUDE ) //MAVLINK_MSG_ID_ATTITUDE will always cause the buffer flushed - ){ - //flush and send all data - if (sendto(out_sock, mavbuf, mavbuff_offset, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)) == -1) { + printf("Mavlink msg %d no: %d\n", message.msgid, message.seq); + switch (message.msgid) { + case MAVLINK_MSG_ID_RC_CHANNELS_RAW: // 35 Used by INAV + handle_msg_id_rc_channels_raw(&message); + break; + case MAVLINK_MSG_ID_RC_CHANNELS_OVERRIDE: // 70 + handle_msg_id_rc_channels_override(&message); + break; + + case MAVLINK_MSG_ID_RC_CHANNELS: // 65 used by ArduPilot + handle_msg_id_rc_channels(&message); + break; + + case MAVLINK_MSG_ID_HEARTBEAT: // Msg info from the FC + handle_heartbeat(&message); + break; + case MAVLINK_MSG_ID_STATUSTEXT: // Msg info from the FC + // handle_statustext(&message); + break; + } + + mavpckts_count++; + bool mustflush = false; + if (aggregate > 0) { // We will send whole packets only + if (((aggregate >= 1 && aggregate < 50) && + mavpckts_count >= aggregate) || // if packets more than treshold + ((aggregate > 50 && aggregate < 2000) && + mavbuff_offset >= aggregate) || // if buffer more than treshold + ((mavpckts_count >= minAggPckts) && + message.msgid == MAVLINK_MSG_ID_ATTITUDE) // MAVLINK_MSG_ID_ATTITUDE + // will always cause the + // buffer flushed + ) { + // flush and send all data + if (sendto(out_sock, mavbuf, mavbuff_offset, 0, (struct sockaddr *)&sin_out, + sizeof(sin_out)) == -1) { perror("sendto()"); event_base_loopbreak(arg); } if (verbose) - printf("%d Pckts / %d bytes sent\n",mavpckts_count,mavbuff_offset); - mavbuff_offset=0; - mavpckts_count=0; + printf("%d Pckts / %d bytes sent\n", mavpckts_count, mavbuff_offset); + mavbuff_offset = 0; + mavpckts_count = 0; SendInfoToGround(); SendWfbLogToGround(); + if (last_board_temp > -100) { - if (last_board_temp>-100){ - - mavbuff_offset=SendTempToGround(mavbuf); + mavbuff_offset = SendTempToGround(mavbuf); } - if (mavbuff_offset>0){ + if (mavbuff_offset > 0) { mavpckts_count++; } - } } - }//if mavlink_parse_char - } + } // if mavlink_parse_char + } } -static long ttl_packets=0; -static long ttl_bytes=0; +static long ttl_packets = 0; +static long ttl_bytes = 0; -static long stat_bytes=0; -static long stat_pckts=0; -static long last_stat=0; - -//handles both UART and Serial read -static void serial_read_cb(struct bufferevent *bev, void *arg) -{ - if (AbortNow)//Abort request by user pending... +static long stat_bytes = 0; +static long stat_pckts = 0; +static long last_stat = 0; + +// handles both UART and Serial read +static void serial_read_cb(struct bufferevent *bev, void *arg) { + if (AbortNow) // Abort request by user pending... return; int fd = bufferevent_getfd(bev); // Get the file descriptor associated with the event - if (fd == serial_fd) - {}//printf("Reading from serial port...\n"); - else if (fd == in_sock) - {}//printf("Reading from UDP socket...\n"); - + if (fd == serial_fd) { + } // printf("Reading from serial port...\n"); + else if (fd == in_sock) { + } // printf("Reading from UDP socket...\n"); struct evbuffer *input = bufferevent_get_input(bev); int packet_len, in_len; - struct event_base *base = arg; + struct event_base *base = arg; while ((in_len = evbuffer_get_length(input))) { unsigned char *data = evbuffer_pullup(input, in_len); @@ -753,82 +743,95 @@ static void serial_read_cb(struct bufferevent *bev, void *arg) } packet_len = in_len; - if (get_time_ms() - last_stat>1000) {//no faster than 1 per second - last_stat=(get_time_ms()); - if (stat_screen_refresh_count==0) + if (get_time_ms() - last_stat > 1000) { // no faster than 1 per second + last_stat = (get_time_ms()); + if (stat_screen_refresh_count == 0) stat_screen_refresh_count++; - if (verbose){ + if (verbose) { if (DrawOSD) - printf("UART Events:%u MessagesTTL:%u AttitMSGs:%u(%dms) Bytes/S:%u FPS:%u of %u (skipped:%d), AvgFrameLoad ms:%d | %d | %d | \r\n",stat_pckts,stat_msp_msgs,stat_msp_msg_attitude, (stat_attitudeDelay / (stat_msp_msg_attitude+1) ), - stat_bytes, stat_screen_refresh_count, stat_MSP_draw_complete_count, stat_skipped_frames, stat_draw_overlay_1/stat_screen_refresh_count,stat_draw_overlay_2/stat_screen_refresh_count,stat_draw_overlay_3/stat_screen_refresh_count); - else - printf("UART Events:%u MessagesTTL:%u AttitMSGs:%u(%dms) Bytes/S Recvd:%u Sent:%u, Screen FPS:%u MSP_FPS:%u MSP_UDP_Pckts:%u, AvgFrameLoad ms:%d | %d | \r\n",stat_pckts,stat_msp_msgs,stat_msp_msg_attitude, (stat_attitudeDelay / (stat_msp_msg_attitude+1) ), - stat_bytes, stat_MSPBytesSent, stat_screen_refresh_count, stat_MSP_draw_complete_count,stat_UDP_MSPframes, stat_draw_overlay_1/stat_screen_refresh_count,stat_draw_overlay_3/stat_screen_refresh_count); + printf("UART Events:%lu MessagesTTL:%u AttitMSGs:%u(%dms) " + "Bytes/S:%lu " + "FPS:%u of %u (skipped:%d), AvgFrameLoad ms:%d | %d " + "| %d | \r\n", + stat_pckts, stat_msp_msgs, stat_msp_msg_attitude, + (stat_attitudeDelay / (stat_msp_msg_attitude + 1)), stat_bytes, + stat_screen_refresh_count, stat_MSP_draw_complete_count, + stat_skipped_frames, stat_draw_overlay_1 / stat_screen_refresh_count, + stat_draw_overlay_2 / stat_screen_refresh_count, + stat_draw_overlay_3 / stat_screen_refresh_count); + else + printf("UART Events:%lu MessagesTTL:%u AttitMSGs:%u(%dms) " + "Bytes/S " + "Recvd:%lu Sent:%u, Screen FPS:%u MSP_FPS:%u " + "MSP_UDP_Pckts:%u, AvgFrameLoad ms:%d | %d | \r\n", + stat_pckts, stat_msp_msgs, stat_msp_msg_attitude, + (stat_attitudeDelay / (stat_msp_msg_attitude + 1)), stat_bytes, + stat_MSPBytesSent, stat_screen_refresh_count, stat_MSP_draw_complete_count, + stat_UDP_MSPframes, stat_draw_overlay_1 / stat_screen_refresh_count, + stat_draw_overlay_3 / stat_screen_refresh_count); showchannels(18); } - stat_screen_refresh_count=0; - stat_pckts=0; - stat_bytes=0; - stat_msp_msgs=0; - stat_msp_msg_attitude=0; - stat_draw_overlay_1=0; - stat_draw_overlay_2=0; - stat_draw_overlay_3=0; - stat_skipped_frames=0; - stat_MSPBytesSent=0; - stat_MSP_draw_complete_count=0; - stat_UDP_MSPframes=0; - } + stat_screen_refresh_count = 0; + stat_pckts = 0; + stat_bytes = 0; + stat_msp_msgs = 0; + stat_msp_msg_attitude = 0; + stat_draw_overlay_1 = 0; + stat_draw_overlay_2 = 0; + stat_draw_overlay_3 = 0; + stat_skipped_frames = 0; + stat_MSPBytesSent = 0; + stat_MSP_draw_complete_count = 0; + stat_UDP_MSPframes = 0; + } stat_pckts++; - stat_bytes+=packet_len; + stat_bytes += packet_len; ttl_packets++; - ttl_bytes+=packet_len; - if (ParseMSP){ - //Test to do RAW MSP forward here - //sendto(out_sock, data, packet_len, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - for(int i=0;i0 || rc_channel_mon_enabled)//if no RC channel control needed, only forward the data - process_mavlink(data,packet_len, arg);//Let's try to parse the stream + // Let's try to parse the stream + if (aggregate > 0 || rc_channel_mon_enabled) // if no RC channel control needed, only + // forward the data + process_mavlink(data, packet_len, + arg); // Let's try to parse the stream } - evbuffer_drain(input, packet_len); + evbuffer_drain(input, packet_len); } } - - // Signal handler function void sendtestmsg(int signum) { printf("Sending test mavlink msg.\n"); char buff[200]; sprintf(buff, "echo Hello_From_OpenIPC > %s", MavLinkMsgFile); system(buff); - SendInfoToGround(); + SendInfoToGround(); } - -static void serial_event_cb(struct bufferevent *bev, short events, void *arg) -{ +static void serial_event_cb(struct bufferevent *bev, short events, void *arg) { (void)bev; struct event_base *base = arg; @@ -841,15 +844,15 @@ static void serial_event_cb(struct bufferevent *bev, short events, void *arg) // Callback function to handle keyboard input #ifdef __KEYBOARD_INPUT__ void stdin_read_callback(int fd, short event, void *arg) { - char buffer[256]; - ssize_t n = read(fd, buffer, sizeof(buffer) - 1); - - if (n > 0 && ! armed) { - buffer[n] = '\0'; // Null-terminate the input - printf("You typed: %s\n", buffer); + char buffer[256]; + ssize_t n = read(fd, buffer, sizeof(buffer) - 1); + + if (n > 0 && !armed) { + buffer[n] = '\0'; // Null-terminate the input + printf("You typed: %s\n", buffer); if (buffer[0] == 'm') { printf("Disableing msposd\n"); - vtxMenuEnabled = init_state_manager(); + vtxMenuEnabled = init_state_manager(); if (vtxMenuEnabled) vtxMenuActive = true; } @@ -857,45 +860,42 @@ void stdin_read_callback(int fd, short event, void *arg) { printf("Enableing msposd\n"); vtxMenuActive = false; } - if (buffer[0] == 'w') { + if (buffer[0] == 'w') { uint16_t channels[18]; channels[0] = 1500; channels[1] = 2000; channels[2] = 1500; channels[3] = 1500; - handle_stickcommands(channels); // Move up - } else if (buffer[0] == 's') { + handle_stickcommands(channels); // Move up + } else if (buffer[0] == 's') { uint16_t channels[18]; channels[0] = 1500; channels[1] = 1000; channels[2] = 1500; channels[3] = 1500; - handle_stickcommands(channels);// Move down - } else if (buffer[0] == 'a') { + handle_stickcommands(channels); // Move down + } else if (buffer[0] == 'a') { uint16_t channels[18]; channels[0] = 1000; channels[1] = 1500; channels[2] = 1500; channels[3] = 1500; - handle_stickcommands(channels);// Move left - } else if (buffer[0] == 'd') { - uint16_t channels[18]; + handle_stickcommands(channels); // Move left + } else if (buffer[0] == 'd') { + uint16_t channels[18]; channels[0] = 2000; channels[1] = 1500; channels[2] = 1500; channels[3] = 1500; - handle_stickcommands(channels);// Move right - } else if (buffer[0] == 'e') { - //unused - } - } + handle_stickcommands(channels); // Move right + } else if (buffer[0] == 'e') { + // unused + } + } } #endif - - -static void* setup_temp_mem(off_t base, size_t size) -{ +static void *setup_temp_mem(off_t base, size_t size) { int mem_fd; mem_fd = open("/dev/mem", O_RDWR | O_SYNC); @@ -904,11 +904,9 @@ static void* setup_temp_mem(off_t base, size_t size) return NULL; } - char *mapped_area = - mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, mem_fd, base); + char *mapped_area = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, mem_fd, base); if (mapped_area == MAP_FAILED) { - fprintf(stderr, "read_mem_reg mmap error: %s (%d)\n", - strerror(errno), errno); + fprintf(stderr, "read_mem_reg mmap error: %s (%d)\n", strerror(errno), errno); return NULL; } @@ -923,7 +921,8 @@ static void* setup_temp_mem(off_t base, size_t size) // N is the value of MISC_CTRL45 bit[27:20] MISC_CTRL45 |= 50 << 20; - // Enable the T-Sensor by configuring MISC_CTRL45 bit[31] and start to collect the temperature + // Enable the T-Sensor by configuring MISC_CTRL45 bit[31] and start to + // collect the temperature MISC_CTRL45 |= 1 << 31; *(volatile uint32_t *)(mapped_area + 0xB4) = MISC_CTRL45; @@ -931,183 +930,197 @@ static void* setup_temp_mem(off_t base, size_t size) return mapped_area; } -static void temp_read(evutil_socket_t sock, short event, void *arg) -{ +static void temp_read(evutil_socket_t sock, short event, void *arg) { (void)sock; (void)event; char *mapped_area = arg; uint32_t val = *(volatile uint32_t *)(mapped_area + 0xBC); float tempo = val & ((1 << 16) - 1); - //tempo = ((tempo - 117) / 798.0f) * 165.0f - 40.0f; - tempo = ((tempo - 117) / 798) * 165 - 40; + // tempo = ((tempo - 117) / 798.0f) * 165.0f - 40.0f; + tempo = ((tempo - 117) / 798) * 165 - 40; - if (last_board_temp == -100)//only once + if (last_board_temp == -100) // only once printf("Temp read %f C\n", tempo); - last_board_temp=tempo; + last_board_temp = tempo; } -int VariantCounter=0; - -static bool ReadSerialSimple(int showstat){ - if (showstat) {//no faster than 1 per second - last_stat=(get_time_ms()); - if (stat_screen_refresh_count==0) - stat_screen_refresh_count++; - if (verbose){ - if (DrawOSD) - printf("UART Events:%u MessagesTTL:%u AttitMSGs:%u(%dms) Bytes/S:%u FPS:%u of %u (skipped:%d), AvgFrameLoad ms:%d | %d | %d | \r\n",stat_pckts,stat_msp_msgs,stat_msp_msg_attitude, (stat_attitudeDelay / (stat_msp_msg_attitude+1) ), - stat_bytes, stat_screen_refresh_count, stat_MSP_draw_complete_count, stat_skipped_frames, stat_draw_overlay_1/stat_screen_refresh_count,stat_draw_overlay_2/stat_screen_refresh_count,stat_draw_overlay_3/stat_screen_refresh_count); - else - printf("UART Events:%u MessagesTTL:%u AttitMSGs:%u(%dms) Bytes/S Recvd:%u Sent:%u, Screen FPS:%u MSP_FPS:%u MSP_UDP_Pckts:%u, AvgFrameLoad ms:%d | %d | \r\n",stat_pckts,stat_msp_msgs,stat_msp_msg_attitude, (stat_attitudeDelay / (stat_msp_msg_attitude+1) ), - stat_bytes, stat_MSPBytesSent, stat_screen_refresh_count, stat_MSP_draw_complete_count,stat_UDP_MSPframes, stat_draw_overlay_1/stat_screen_refresh_count,stat_draw_overlay_3/stat_screen_refresh_count); - - showchannels(18); - } - stat_screen_refresh_count=0; - stat_pckts=0; - stat_bytes=0; - stat_msp_msgs=0; - stat_msp_msg_attitude=0; - stat_draw_overlay_1=0; - stat_draw_overlay_2=0; - stat_draw_overlay_3=0; - stat_skipped_frames=0; - stat_MSPBytesSent=0; - stat_MSP_draw_complete_count=0; - stat_UDP_MSPframes=0; +int VariantCounter = 0; + +static bool ReadSerialSimple(int showstat) { + if (showstat) { // no faster than 1 per second + last_stat = (get_time_ms()); + if (stat_screen_refresh_count == 0) + stat_screen_refresh_count++; + if (verbose) { + if (DrawOSD) + printf("UART Events:%lu MessagesTTL:%u AttitMSGs:%u(%dms) " + "Bytes/S:%lu " + "FPS:%u of %u (skipped:%d), AvgFrameLoad ms:%d | %d | " + "%d | \r\n", + stat_pckts, stat_msp_msgs, stat_msp_msg_attitude, + (stat_attitudeDelay / (stat_msp_msg_attitude + 1)), stat_bytes, + stat_screen_refresh_count, stat_MSP_draw_complete_count, stat_skipped_frames, + stat_draw_overlay_1 / stat_screen_refresh_count, + stat_draw_overlay_2 / stat_screen_refresh_count, + stat_draw_overlay_3 / stat_screen_refresh_count); + else + printf("UART Events:%lu MessagesTTL:%u AttitMSGs:%u(%dms) Bytes/S " + "Recvd:%lu Sent:%u, Screen FPS:%u MSP_FPS:%u " + "MSP_UDP_Pckts:%u, " + "AvgFrameLoad ms:%d | %d | \r\n", + stat_pckts, stat_msp_msgs, stat_msp_msg_attitude, + (stat_attitudeDelay / (stat_msp_msg_attitude + 1)), stat_bytes, + stat_MSPBytesSent, stat_screen_refresh_count, stat_MSP_draw_complete_count, + stat_UDP_MSPframes, stat_draw_overlay_1 / stat_screen_refresh_count, + stat_draw_overlay_3 / stat_screen_refresh_count); + + showchannels(18); + } + stat_screen_refresh_count = 0; + stat_pckts = 0; + stat_bytes = 0; + stat_msp_msgs = 0; + stat_msp_msg_attitude = 0; + stat_draw_overlay_1 = 0; + stat_draw_overlay_2 = 0; + stat_draw_overlay_3 = 0; + stat_skipped_frames = 0; + stat_MSPBytesSent = 0; + stat_MSP_draw_complete_count = 0; + stat_UDP_MSPframes = 0; } - + uint8_t data[2048]; - // Read from the serial port once per interval - int packet_len = read(serial_fd, data, sizeof(data)); - if (packet_len < 0) + // Read from the serial port once per interval + int packet_len = read(serial_fd, data, sizeof(data)); + if (packet_len < 0) return false; - stat_pckts++; - stat_bytes+=packet_len; + stat_pckts++; + stat_bytes += packet_len; ttl_packets++; - ttl_bytes+=packet_len; + ttl_bytes += packet_len; - //support for very low refresh rate, we will lose some FC data, may end up with distorted OSD? But we need to read all data in the beginning to identify the FC ! - if (packet_len==sizeof(data) && bitmapFnt.pData!=NULL) + // support for very low refresh rate, we will lose some FC data, may end up + // with distorted OSD? But we need to read all data in the beginning to + // identify the FC ! + if (packet_len == sizeof(data) && bitmapFnt.pData != NULL) tcflush(serial_fd, TCIOFLUSH); - if (ParseMSP){ - for(int i=0;iMSP_PollRate) - rate_divider=1; - - if (( VariantCounter%rate_divider == 0 )) - ReadSerialSimple(VariantCounter == 0); + if (enable_simple_uart) { + int rate_divider = MSP_PollRate / (1000 / MinTimeBetweenScreenRefresh); + if (rate_divider < 1 || rate_divider > MSP_PollRate) + rate_divider = 1; + + if ((VariantCounter % rate_divider == 0)) + ReadSerialSimple(VariantCounter == 0); } - if (rc_channel_mon_enabled && VariantCounter%5==1){//once every 5 cycles, 4 times per second + if (rc_channel_mon_enabled && + VariantCounter % 5 == 1) { // once every 5 cycles, 4 times per second construct_msp_command(buffer, MSP_RC, NULL, 0, MSP_OUTBOUND); - res = write(serial_fd, &buffer, sizeof(buffer)); - }else if (AHI_Enabled){ - if (AHI_Enabled==3 && VariantCounter%13==1){ + res = write(serial_fd, &buffer, sizeof(buffer)); + } else if (AHI_Enabled) { + if (AHI_Enabled == 3 && VariantCounter % 13 == 1) { construct_msp_command(buffer, MSP_COMP_GPS, NULL, 0, MSP_OUTBOUND); - res = write(serial_fd, &buffer, sizeof(buffer)); - }else{//this is called at every POLL, skipping every 5th and every 13th, that is 15 times per second + res = write(serial_fd, &buffer, sizeof(buffer)); + } else { // this is called at every POLL, skipping every 5th and every + // 13th, that is 15 times per second construct_msp_command(buffer, MSP_ATTITUDE, NULL, 0, MSP_OUTBOUND); - res = write(serial_fd, &buffer, sizeof(buffer)); - last_MSP_ATTITUDE=get_time_ms(); + res = write(serial_fd, &buffer, sizeof(buffer)); + last_MSP_ATTITUDE = get_time_ms(); } } - - if (MSP_PollRate <= ++VariantCounter){//poll every one second + + if (MSP_PollRate <= ++VariantCounter) { // poll every one second construct_msp_command(buffer, MSP_CMD_FC_VARIANT, NULL, 0, MSP_OUTBOUND); res = write(serial_fd, &buffer, sizeof(buffer)); - //Sending several request right one after another does not work well on INAV ... - if (bitmapFnt.pData!=NULL && mspVTXenabled) {//no need to poll when no fonts are still loaded + // Sending several request right one after another does not work well on + // INAV ... + if (bitmapFnt.pData != NULL && + mspVTXenabled) { // no need to poll when no fonts are still loaded // Poll for mspVTX construct_msp_command(buffer, MSP_GET_VTX_CONFIG, NULL, 0, MSP_OUTBOUND); res = write(serial_fd, &buffer, sizeof(buffer)); - } - //usleep(20*1000); - VariantCounter=0; + } + // usleep(20*1000); + VariantCounter = 0; } - //Sending several request right one after another does not work well on INAV ... - if (MSP_PollRate - 2 == VariantCounter ){//poll every one second, but one by one! - //poll for FC_STATUS + // Sending several request right one after another does not work well on + // INAV + // ... + if (MSP_PollRate - 2 == VariantCounter) { // poll every one second, but one by one! + // poll for FC_STATUS construct_msp_command(buffer, MSP_CMD_STATUS, NULL, 0, MSP_OUTBOUND); - res = write(serial_fd, &buffer, sizeof(buffer)); + res = write(serial_fd, &buffer, sizeof(buffer)); } + // construct_msp_command(buffer, MSP_CMD_BATTERY_STATE, NULL, 0, + // MSP_OUTBOUND); + // res = write(serial_fd, &buffer, sizeof(buffer)); - //construct_msp_command(buffer, MSP_CMD_BATTERY_STATE, NULL, 0, MSP_OUTBOUND); - //res = write(serial_fd, &buffer, sizeof(buffer)); - - //printf("Sent %d\n", res); + // printf("Sent %d\n", res); } -static void poll_msp(evutil_socket_t sock, short event, void *arg) -{ - int serial_fd = *((int *)arg); +static void poll_msp(evutil_socket_t sock, short event, void *arg) { + int serial_fd = *((int *)arg); send_variant_request2(serial_fd); } - - -static int handle_data(const char *port_name, int baudrate, - const char *out_addr ) -{ - struct event *sig_int = NULL, *in_ev = NULL, *temp_tmr = NULL, *msp_tmr=NULL; +static int handle_data(const char *port_name, int baudrate, const char *out_addr) { + struct event *sig_int = NULL, *in_ev = NULL, *temp_tmr = NULL, *msp_tmr = NULL; struct event *sig_term; int ret = EXIT_SUCCESS; - - - if (strlen(port_name) > 0 && port_name[0] >= '0' && port_name[0] <= '9') {//Read from UDP + if (strlen(port_name) > 0 && port_name[0] >= '0' && port_name[0] <= '9') { // Read from UDP struct sockaddr_in sin_in = { - .sin_family = AF_INET, + .sin_family = AF_INET, }; - if (!parse_host_port(port_name, (struct in_addr *)&sin_in.sin_addr.s_addr, - &sin_in.sin_port)) + if (!parse_host_port( + port_name, (struct in_addr *)&sin_in.sin_addr.s_addr, &sin_in.sin_port)) goto err; - if (sin_in.sin_port>0) - in_sock=socket(AF_INET, SOCK_DGRAM, 0); + if (sin_in.sin_port > 0) + in_sock = socket(AF_INET, SOCK_DGRAM, 0); - if (in_sock>0 && bind(in_sock, (struct sockaddr *)&sin_in, sizeof(sin_in))) {// we may not need this + if (in_sock > 0 && bind(in_sock, (struct sockaddr *)&sin_in, + sizeof(sin_in))) { // we may not need this perror("bind()"); exit(EXIT_FAILURE); } - if(in_sock>0) + if (in_sock > 0) printf("Listening UDP on %s...\n", port_name); - }else{//Read from UART + } else { // Read from UART serial_fd = open(port_name, O_RDWR | O_NOCTTY); if (serial_fd < 0) { - printf("Error while openning port %s: %s\n", port_name, - strerror(errno)); + printf("Error while opening port %s: %s\n", port_name, strerror(errno)); return EXIT_FAILURE; }; evutil_make_socket_nonblocking(serial_fd); printf("Listening UART on %s...\n", port_name); - } + } struct termios options; tcgetattr(serial_fd, &options); cfsetspeed(&options, speed_by_value(baudrate)); - options.c_cflag &= ~CSIZE; // Mask the character size bits - options.c_cflag |= CS8; // 8 bit data + options.c_cflag &= ~CSIZE; // Mask the character size bits + options.c_cflag |= CS8; // 8 bit data options.c_cflag &= ~PARENB; // set parity to no options.c_cflag &= ~PARODD; // set parity to no options.c_cflag &= ~CSTOPB; // set one stop bit @@ -1120,15 +1133,15 @@ static int handle_data(const char *port_name, int baudrate, options.c_iflag &= 0; // disable software flow controll options.c_oflag &= 0; - if (enable_simple_uart) - options.c_iflag |= ( UART_FCR_TRIGGER_RX_L3 ); //#define UART_FCR_TRIGGER_RX_L3 0x10000 will work only on patched kernel driver + options.c_iflag |= (UART_FCR_TRIGGER_RX_L3); //#define UART_FCR_TRIGGER_RX_L3 0x10000 + // will work only on patched kernel driver cfmakeraw(&options); tcsetattr(serial_fd, TCSANOW, &options); -#ifdef _x86 - usleep(500*1000);//flush all data in the Rx buffer - int tttt=tcflush(serial_fd, TCIOFLUSH); +#ifdef _x86 + usleep(500 * 1000); // flush all data in the Rx buffer + int tttt = tcflush(serial_fd, TCIOFLUSH); #endif if (enable_simple_uart) tcflush(serial_fd, TCIOFLUSH); @@ -1139,12 +1152,11 @@ static int handle_data(const char *port_name, int baudrate, msp_set_vtx_config(serial_fd); } - if (strlen(out_addr)>1){ + if (strlen(out_addr) > 1) { out_sock = socket(AF_INET, SOCK_DGRAM, 0); - if (!parse_host_port(out_addr, - (struct in_addr *)&sin_out.sin_addr.s_addr, - &sin_out.sin_port)) + if (!parse_host_port( + out_addr, (struct in_addr *)&sin_out.sin_addr.s_addr, &sin_out.sin_port)) goto err; } @@ -1152,7 +1164,6 @@ static int handle_data(const char *port_name, int baudrate, .sin_family = AF_INET, }; - base = event_base_new(); sig_int = evsignal_new(base, SIGINT, signal_cb, base); @@ -1161,78 +1172,80 @@ static int handle_data(const char *port_name, int baudrate, // it's recommended by libevent authors to ignore SIGPIPE signal(SIGPIPE, SIG_IGN); - // Handle SIGTERM (e.g., killall myapp) - sig_term = evsignal_new(base, SIGTERM, signal_cb, base); - event_add(sig_term, NULL); + // Handle SIGTERM (e.g., killall myapp) + sig_term = evsignal_new(base, SIGTERM, signal_cb, base); + event_add(sig_term, NULL); - //Test inject a simple packet to test malvink communication Camera to Ground + // Test inject a simple packet to test malvink communication Camera to + // Ground signal(SIGUSR1, sendtestmsg); - if (serial_fd>0 && !enable_simple_uart){//if UART opened and we need to read it via events - + if (serial_fd > 0 && !enable_simple_uart) { // if UART opened and we need to + // read it via events + serial_bev = bufferevent_socket_new(base, serial_fd, 0); - /* Trigger the read callback only whenever there is at least 16 bytes of data in the buffer. */ - //So that the read event is not triggered so often + /* Trigger the read callback only whenever there is at least 16 bytes of + * data in the buffer. */ + // So that the read event is not triggered so often bufferevent_setwatermark(serial_bev, EV_READ, 16, 0); - bufferevent_setcb(serial_bev, serial_read_cb, NULL, serial_event_cb, - base); - bufferevent_enable(serial_bev, EV_READ); + bufferevent_setcb(serial_bev, serial_read_cb, NULL, serial_event_cb, base); + bufferevent_enable(serial_bev, EV_READ); } - - if (in_sock>0){ - //in_ev = event_new(base, in_sock, EV_READ | EV_PERSIST, in_read, NULL); - //event_add(in_ev, NULL); - // Using bufferevent for the UDP socket too, for a unified callback - struct bufferevent *udp_bev = bufferevent_socket_new(base, in_sock, 0); - bufferevent_setcb(udp_bev, serial_read_cb, NULL, NULL, base); - bufferevent_enable(udp_bev, EV_READ | EV_PERSIST); + if (in_sock > 0) { + // in_ev = event_new(base, in_sock, EV_READ | EV_PERSIST, in_read, + // NULL); event_add(in_ev, NULL); + // Using bufferevent for the UDP socket too, for a unified callback + struct bufferevent *udp_bev = bufferevent_socket_new(base, in_sock, 0); + bufferevent_setcb(udp_bev, serial_read_cb, NULL, NULL, base); + bufferevent_enable(udp_bev, EV_READ | EV_PERSIST); } - - - // Set up an event for stdin (file descriptor 0) + // Set up an event for stdin (file descriptor 0) #ifdef __KEYBOARD_INPUT__ - struct event *stdin_event = event_new(base, STDIN_FILENO, EV_READ | EV_PERSIST, stdin_read_callback, base); + struct event *stdin_event = + event_new(base, STDIN_FILENO, EV_READ | EV_PERSIST, stdin_read_callback, base); - // Add the event to the event loop - event_add(stdin_event, NULL); + // Add the event to the event loop + event_add(stdin_event, NULL); #endif if (temp) { - if (GetTempSigmaStar()>-90){ - temp=2;//SigmaStar + if (GetTempSigmaStar() > -90) { + temp = 2; // SigmaStar printf("Found SigmaStart temp sensor\n"); - }else{ //Goke/Hisilicon method - void* mem = setup_temp_mem(0x12028000, 0xFFFF); + } else { // Goke/Hisilicon method + void *mem = setup_temp_mem(0x12028000, 0xFFFF); temp_tmr = event_new(base, -1, EV_PERSIST, temp_read, mem); evtimer_add(temp_tmr, &(struct timeval){.tv_sec = 1}); } } - //MSP_PollRate - if (ParseMSP && msp_tmr==NULL && serial_fd>0){ //Only if we are on Cam, on ground no need to poll + // MSP_PollRate + if (ParseMSP && msp_tmr == NULL && + serial_fd > 0) { // Only if we are on Cam, on ground no need to poll msp_tmr = event_new(base, -1, EV_PERSIST, poll_msp, &serial_fd); - // Set poll interval to 50 milliseconds if pollrate is 20 - struct timeval interval = { - .tv_sec = 0, // 0 seconds - .tv_usec = 1000000/ MSP_PollRate // 200 milliseconds (200,000 microseconds) - }; + // Set poll interval to 50 milliseconds if pollrate is 20 + struct timeval interval = { + .tv_sec = 0, // 0 seconds + .tv_usec = 1000000 / MSP_PollRate // 200 milliseconds (200,000 microseconds) + }; - evtimer_add(msp_tmr, &interval /*(struct timeval){.tv_sec = 1}*/ /*&(struct timeval){.tv_usec = 5000000}*/); + evtimer_add(msp_tmr, &interval /*(struct timeval){.tv_sec = 1}*/ + /*&(struct timeval){.tv_usec = 5000000}*/); } event_base_dispatch(base); err: - - if (temp_tmr ) { + + if (temp_tmr) { event_del(temp_tmr); event_free(temp_tmr); } - if (out_sock>0) + if (out_sock > 0) close(out_sock); - + if (serial_fd >= 0) close(serial_fd); @@ -1251,49 +1264,37 @@ static int handle_data(const char *port_name, int baudrate, event_base_free(base); libevent_global_shutdown(); - + CloseMSP(); return ret; } void resetLastStartValues() { - for (int i=0; i < kChannelCount; ++i) { + for (int i = 0; i < kChannelCount; ++i) { LastStart[i] = get_current_time_ms(); } } -int main(int argc, char **argv) -{ - const struct option long_options[] = { - { "master", required_argument, NULL, 'm' }, - { "baudrate", required_argument, NULL, 'b' }, - { "out", required_argument, NULL, 'o' }, - { "ahi", required_argument, NULL, 'a' }, - { "in", required_argument, NULL, 'i' }, - { "channels", required_argument, NULL, 'c' }, - { "wait_time", required_argument, NULL, 'w' }, - { "refreshrate", required_argument, NULL, 'r' }, - { "folder", required_argument, NULL, 'f' }, - { "persist", required_argument, NULL, 'p' }, - { "matrix", required_argument, NULL, 'x' }, - { "osd", no_argument, NULL, 'd' }, - { "verbose", no_argument, NULL, 'v' }, - { "temp", no_argument, NULL, 't' }, - { "wfb", no_argument, NULL, 'j' }, - { "mspvtx", no_argument, NULL, '1' }, - { "help", no_argument, NULL, 'h' }, - { NULL, 0, NULL, 0 } - }; +int main(int argc, char **argv) { + const struct option long_options[] = {{"master", required_argument, NULL, 'm'}, + {"baudrate", required_argument, NULL, 'b'}, {"out", required_argument, NULL, 'o'}, + {"ahi", required_argument, NULL, 'a'}, {"in", required_argument, NULL, 'i'}, + {"channels", required_argument, NULL, 'c'}, {"wait_time", required_argument, NULL, 'w'}, + {"refreshrate", required_argument, NULL, 'r'}, {"folder", required_argument, NULL, 'f'}, + {"persist", required_argument, NULL, 'p'}, {"matrix", required_argument, NULL, 'x'}, + {"osd", no_argument, NULL, 'd'}, {"verbose", no_argument, NULL, 'v'}, + {"temp", no_argument, NULL, 't'}, {"wfb", no_argument, NULL, 'j'}, + {"mspvtx", no_argument, NULL, '1'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0}}; const char *port_name = default_master; int baudrate = default_baudrate; const char *out_addr = defualt_out_addr; const char *in_addr = default_in_addr; - MinTimeBetweenScreenRefresh=50; - last_board_temp=-100; + MinTimeBetweenScreenRefresh = 50; + last_board_temp = -100; - printf("Ver: %s Compiled at: %s\n", GIT_VERSION, VERSION_STRING); + printf("Version: %s, compiled at: %s\n", GIT_VERSION, VERSION_STRING); int opt; int r; int long_index = 0; @@ -1302,8 +1303,8 @@ int main(int argc, char **argv) while ((opt = getopt_long_only(argc, argv, "", long_options, &long_index)) != -1) { switch (opt) { case 'm': - port_name = optarg; - printf("Listen on port :%s\n",port_name); + port_name = optarg; + printf("Listen on port: %s\n", port_name); break; case 'b': baudrate = atoi(optarg); @@ -1312,98 +1313,102 @@ int main(int argc, char **argv) out_addr = optarg; break; case 'i': - + break; - case 'a': + case 'a': AHI_Enabled = atoi(optarg); - - break; - + + break; + case 'c': rc_channel_no = atoi(optarg); - if(rc_channel_no == 0) + if (rc_channel_no == 0) printf("rc_channels monitoring disabled\n"); - else - { - printf("Monitoring RC channel %d \n", rc_channel_no); + else { + printf("Monitoring RC channel: %d\n", rc_channel_no); rc_channel_mon_enabled = true; // The array is zero-based, so substract 1 from the index: - rc_channel_mon[rc_channel_no-1] = true; + rc_channel_mon[rc_channel_no - 1] = true; } resetLastStartValues(); break; case 'f': - if (optarg != NULL) { - - snprintf(MavLinkMsgFile, sizeof(MavLinkMsgFile), "%smavlink.msg", optarg); + if (optarg != NULL) { + snprintf(MavLinkMsgFile, sizeof(MavLinkMsgFile), "%smavlink.msg", optarg); snprintf(WfbLogFile, sizeof(MavLinkMsgFile), "%swfb.log", optarg); - } - + } break; + case 'w': - wait_after_bash = atoi(optarg); + wait_after_bash = atoi(optarg); resetLastStartValues(); break; case 'x': - matrix_size = atoi(optarg); + matrix_size = atoi(optarg); break; case 'r': - r=atoi(optarg); - if (r>1000){ - enable_simple_uart=true; - r=r%1000; - printf("Simple UART Reading mode! %d \n", r); + r = atoi(optarg); + if (r > 1000) { + enable_simple_uart = true; + r = r % 1000; + printf("Simple UART Reading mode! %d\n", r); } - MinTimeBetweenScreenRefresh = 1000/r; + MinTimeBetweenScreenRefresh = 1000 / r; resetLastStartValues(); break; case 'p': - ChannelPersistPeriodMS = atoi(optarg); + ChannelPersistPeriodMS = atoi(optarg); resetLastStartValues(); break; - case 't': - temp = 1;//1 HiSilicon/Goke , 2 SigmaStar SOC + case 't': + temp = 1; // 1 HiSilicon/Goke , 2 SigmaStar SOC break; - case 'j': + case 'j': monitor_wfb = true; break; - case '1': + + case '1': mspVTXenabled = true; break; + case 'v': verbose = true; - printf("Verbose mode!"); - break; + printf("Verbose mode!\n"); + break; + case 'd': - DrawOSD=true; - printf("MSP to OSD mode!"); - break; + DrawOSD = true; + printf("MSP to OSD mode!\n"); + break; + case 'h': default: print_usage(); return EXIT_SUCCESS; } - } - - - strcpy(_port_name,port_name); - if (ParseMSP){ - //msp_process_data(rx_msp_state, serial_data[i]); - rx_msp_state = calloc(1, sizeof(msp_state_t)); - rx_msp_state->cb = &rx_msp_callback; - //if (DrawOSD) - InitMSPHook();//We need to create screen overlay if we gonna show message on screen - - if (false){//Forwarding MSP enabled - //this opens the UDP port so that it can be used ith file descriptors - socket_fd = bind_socket(MSP_PORT+1); - // Connect the socket to the target address and port so that we can debug + } + + strcpy(_port_name, port_name); + if (ParseMSP) { + // msp_process_data(rx_msp_state, serial_data[i]); + rx_msp_state = calloc(1, sizeof(msp_state_t)); + rx_msp_state->cb = &rx_msp_callback; + // if (DrawOSD) + InitMSPHook(); // We need to create screen overlay if we gonna show + // message on screen + + if (false) { // Forwarding MSP enabled + // this opens the UDP port so that it can be used ith file + // descriptors + socket_fd = bind_socket(MSP_PORT + 1); + // Connect the socket to the target address and port so that we can + // debug struct sockaddr_in si_other; memset((char *)&si_other, 0, sizeof(si_other)); si_other.sin_family = AF_INET; @@ -1416,7 +1421,7 @@ int main(int argc, char **argv) return 1; } } - //loadfonts + // loadfonts } return handle_data(port_name, baudrate, out_addr); diff --git a/osd.c b/osd.c index 84e3288..d083389 100644 --- a/osd.c +++ b/osd.c @@ -1,61 +1,58 @@ -#include #include -#include +#include +#include // For dirname() +#include #include -#include #include -#include +#include #include #include +#include #include -#include -#include // For dirname() - +#include #include "osd/msp/msp.h" #include "osd/msp/msp_displayport.h" #if defined(_x86) || defined(__ROCKCHIP__) - // #include - // #include - // #include - // #include - // #include - // #include - // #include - #include "osd/util/Render_gs.c" - #else - #include "bmp/region.h" - #include "bmp/common.h" -#endif +// #include +// #include +// #include +// #include +// #include +// #include +// #include +#include "osd/util/Render_gs.c" +#else +#include "bmp/common.h" #include "bmp/region.h" +#endif #include "bmp/bitmap.h" +#include "bmp/region.h" #include "bmp/text.h" #include "libpng/lodepng.h" - #define X_OFFSET 0 #define CLOCK_MONOTONIC 1 /*------------------------------------------------------------------------------------------------------*/ -/*------------MSP PROTOCOL MSG PROCESSING ----------------------------------------------------------------*/ +/*------------MSP PROTOCOL MSG PROCESSING + * ----------------------------------------------------------------*/ #include #include -#include #include #include - +#include //#include "osd/msp/msp.h" //#include "osd/msp/msp_displayport.h" - #include "osd/util/debug.h" -#include "osd/util/time_util.h" #include "osd/util/fs_util.h" +#include "osd/util/time_util.h" -#include "osd/util/settings.h" #include "osd/util/interface.h" +#include "osd/util/settings.h" #define CPU_TEMP_PATH "/sys/devices/platform/soc/f0a00000.apb/f0a71000.omc/temp1" #define AU_VOLTAGE_PATH "/sys/devices/platform/soc/f0a00000.apb/f0a71000.omc/voltage4" @@ -67,7 +64,8 @@ #define NO_BTFL_HD_KEY "disable_betaflight_hd" // The MSP_PORT is used to send MSP passthrough messages. -// The DATA_PORT is used to send arbitrary data - for example, bitrate and temperature data. +// The DATA_PORT is used to send arbitrary data - for example, bitrate and +// temperature data. #define MSP_PORT 7654 #define DATA_PORT 7655 @@ -75,31 +73,31 @@ #define COMPRESSED_DATA_VERSION 1 -enum { - MAX_DISPLAY_X = 60, - MAX_DISPLAY_Y = 22 -}; +enum { MAX_DISPLAY_X = 60, MAX_DISPLAY_Y = 22 }; -// The Betaflight MSP minor version in which MSP DisplayPort sizing is supported. +// The Betaflight MSP minor version in which MSP DisplayPort sizing is +// supported. #define MSP_DISPLAY_SIZE_VERSION 45 -extern FrequencyChannel fc_list[MAX_ENTRIES]; // Array to store frequency-channel pairs +extern FrequencyChannel fc_list[MAX_ENTRIES]; // Array to store frequency-channel pairs typedef struct msp_cache_entry_s { - struct timespec time; - msp_msg_t message; + struct timespec time; + msp_msg_t message; } msp_cache_entry_t; static msp_cache_entry_t *msp_message_cache[256]; // make a slot for all possible messages -static uint8_t frame_buffer[1024]; // buffer a whole frame of MSP commands until we get a draw command. needs to fit in UDP ! +static uint8_t frame_buffer[1024]; // buffer a whole frame of MSP commands until we get a + // draw command. needs to fit in UDP ! static uint32_t fb_cursor = 0; char _port_name[80]; -static uint8_t message_buffer[256]; // only needs to be the maximum size of an MSP packet, we only care to fwd MSP +static uint8_t message_buffer[256]; // only needs to be the maximum size of an + // MSP packet, we only care to fwd MSP static char current_fc_identifier[4]; -static char current_fc_identifier_end_of_string=0x00; +static char current_fc_identifier_end_of_string = 0x00; /* For compressed full-frame transmission */ static uint16_t msp_character_map_buffer[MAX_DISPLAY_X][MAX_DISPLAY_Y]; @@ -108,55 +106,55 @@ static msp_hd_options_e msp_hd_option = 0; static displayport_vtable_t *display_driver = NULL; uint8_t update_rate_hz = 2; -static unsigned long long LastDrawn=0; -static unsigned long long LastPcktSent=0; +static unsigned long long LastDrawn = 0; +static unsigned long long LastPcktSent = 0; -static int MinTimeBetweenScreenRefresh; +static int MinTimeBetweenScreenRefresh; int pty_fd; int serial_fd; int socket_fd; int compressed_fd; -/// @brief Will skip char on the left to allow for smaller matrix and overlay area -int SkipXChar=0; +/// @brief Will skip char on the left to allow for smaller matrix and overlay +/// area +int SkipXChar = 0; -int font_pages=2; +int font_pages = 2; static uint8_t serial_passthrough = 1; static uint8_t compress = 0; static uint8_t no_btfl_hd = 0; static int16_t last_pitch = 0; static int16_t last_roll = 0; -static int16_t last_heading=0; +static int16_t last_heading = 0; -static int16_t last_directionToHome=0; -static int16_t last_distanceToHome=0; +static int16_t last_directionToHome = 0; +static int16_t last_distanceToHome = 0; int AHI_TiltY = 50; // https://github.com/betaflight/betaflight/blob/master/src/main/msp/msp.c#L1949 -typedef struct -{ - uint8_t vtxType; - uint8_t band; - uint8_t channel; - uint8_t power; - uint8_t pitmode; - // uint16_t freq; // This doesnt work and bytes are missing after memcpy. - uint8_t freqLSB; - uint8_t freqMSB; - uint8_t deviceIsReady; - uint8_t lowPowerDisarm; - // uint16_t pitModeFreq; // This doesnt work and bytes are missing after memcpy. - uint8_t pitModeFreqLSB; - uint8_t pitModeFreqMSB; - uint8_t vtxTableAvailable; - uint8_t bands; - uint8_t channels; - uint8_t powerLevels; +typedef struct { + uint8_t vtxType; + uint8_t band; + uint8_t channel; + uint8_t power; + uint8_t pitmode; + // uint16_t freq; // This doesnt work and bytes are missing after memcpy. + uint8_t freqLSB; + uint8_t freqMSB; + uint8_t deviceIsReady; + uint8_t lowPowerDisarm; + // uint16_t pitModeFreq; // This doesnt work and bytes are missing after + // memcpy. + uint8_t pitModeFreqLSB; + uint8_t pitModeFreqMSB; + uint8_t vtxTableAvailable; + uint8_t bands; + uint8_t channels; + uint8_t powerLevels; } mspVtxConfigStruct; - extern bool vtxMenuActive; extern bool vtxMenuEnabled; extern bool armed; @@ -164,48 +162,49 @@ extern bool vtxInitDone; extern bool DrawOSD; static void send_display_size(int serial_fd) { - uint8_t buffer[8]; - uint8_t payload[2] = {MAX_DISPLAY_X, MAX_DISPLAY_Y}; - construct_msp_command(buffer, MSP_CMD_SET_OSD_CANVAS, payload, 2, MSP_OUTBOUND); - write(serial_fd, &buffer, sizeof(buffer)); + uint8_t buffer[8]; + uint8_t payload[2] = {MAX_DISPLAY_X, MAX_DISPLAY_Y}; + construct_msp_command(buffer, MSP_CMD_SET_OSD_CANVAS, payload, 2, MSP_OUTBOUND); + write(serial_fd, &buffer, sizeof(buffer)); } static void send_variant_request(int serial_fd) { - uint8_t buffer[6]; - construct_msp_command(buffer, MSP_CMD_FC_VARIANT, NULL, 0, MSP_OUTBOUND); - write(serial_fd, &buffer, sizeof(buffer)); + uint8_t buffer[6]; + construct_msp_command(buffer, MSP_CMD_FC_VARIANT, NULL, 0, MSP_OUTBOUND); + write(serial_fd, &buffer, sizeof(buffer)); } static void send_version_request(int serial_fd) { - uint8_t buffer[6]; - construct_msp_command(buffer, MSP_CMD_API_VERSION, NULL, 0, MSP_OUTBOUND); - write(serial_fd, &buffer, sizeof(buffer)); + uint8_t buffer[6]; + construct_msp_command(buffer, MSP_CMD_API_VERSION, NULL, 0, MSP_OUTBOUND); + write(serial_fd, &buffer, sizeof(buffer)); } static void copy_to_msp_frame_buffer(void *buffer, uint16_t size) { - memcpy(&frame_buffer[fb_cursor], buffer, size); - fb_cursor += size; + memcpy(&frame_buffer[fb_cursor], buffer, size); + fb_cursor += size; } -//int displayport_process_message(displayport_vtable_t *display_driver, msp_msg_t *msg) { -//} -static int stat_msp_msgs=0; -static int stat_msp_msg_attitude=0; -static int stat_screen_refresh_count=0; -static int stat_skipped_frames=0; -static int stat_draw_overlay_1=0, stat_draw_overlay_2=0, stat_draw_overlay_3=0; -static int stat_MSPBytesSent=0; -static int stat_MSP_draw_complete_count=0; -static int stat_UDP_MSPframes=0; -static uint64_t last_MSP_ATTITUDE=0; -static int stat_attitudeDelay=0; -int RCWidgetX=0; -int RCWidgetY=0; +// int displayport_process_message(displayport_vtable_t *display_driver, +// msp_msg_t *msg) { +// } +static int stat_msp_msgs = 0; +static int stat_msp_msg_attitude = 0; +static int stat_screen_refresh_count = 0; +static int stat_skipped_frames = 0; +static int stat_draw_overlay_1 = 0, stat_draw_overlay_2 = 0, stat_draw_overlay_3 = 0; +static int stat_MSPBytesSent = 0; +static int stat_MSP_draw_complete_count = 0; +static int stat_UDP_MSPframes = 0; +static uint64_t last_MSP_ATTITUDE = 0; +static int stat_attitudeDelay = 0; +int RCWidgetX = 0; +int RCWidgetY = 0; char air_unit_info_msg[255]; extern bool AbortNow; extern bool verbose; -extern struct sockaddr_in sin_out;//= {.sin_family = AF_INET,}; +extern struct sockaddr_in sin_out; //= {.sin_family = AF_INET,}; extern int out_sock; extern int AHI_Enabled; extern void showchannels(int count); @@ -218,47 +217,42 @@ extern int SendWfbLogToGround(); extern bool monitor_wfb; extern int last_board_temp; -void fill(char* str); -void SetOSDMsg(char* msg); +void fill(char *str); +void SetOSDMsg(char *msg); uint64_t get_time_ms() // in milliseconds { - struct timespec ts; - int rc = clock_gettime(1 /*CLOCK_MONOTONIC*/, &ts); - //if (rc < 0) -// return get_current_time_ms_Old(); - return ts.tv_sec * 1000LL + ts.tv_nsec / 1000000; + struct timespec ts; + int rc = clock_gettime(1 /*CLOCK_MONOTONIC*/, &ts); + // if (rc < 0) + // return get_current_time_ms_Old(); + return ts.tv_sec * 1000LL + ts.tv_nsec / 1000000; } - - /* MSP DisplayPort handlers for compressed mode */ static void msp_draw_character(uint32_t x, uint32_t y, uint16_t c) { - DEBUG_PRINT("drawing char %d at x %d y %d\n", c, x, y); - msp_character_map_buffer[x][y] = c; + DEBUG_PRINT("drawing char %d at x %d y %d\n", c, x, y); + msp_character_map_buffer[x][y] = c; } static void msp_clear_screen() { - memset(msp_character_map_buffer, 0, sizeof(msp_character_map_buffer)); + memset(msp_character_map_buffer, 0, sizeof(msp_character_map_buffer)); } -static void msp_draw_complete() { - memcpy(msp_character_map_draw, msp_character_map_buffer, sizeof(msp_character_map_buffer)); +static void msp_draw_complete() { + memcpy(msp_character_map_draw, msp_character_map_buffer, sizeof(msp_character_map_buffer)); } static void msp_set_options(uint8_t font_num, msp_hd_options_e is_hd) { - DEBUG_PRINT("Got options!\n"); - msp_clear_screen(); - msp_hd_option = is_hd; + DEBUG_PRINT("Got options!\n"); + msp_clear_screen(); + msp_hd_option = is_hd; } - - - - /*----------------------------------------------------------------------------------------------------*/ -/*------------CONFIGURE SWITCHES ----------------------------------------------------------------*/ +/*------------CONFIGURE SWITCHES + * ----------------------------------------------------------------*/ static int enable_fast_layout = 0; void *io_map; @@ -266,33 +260,33 @@ struct osd *osds; char timefmt[32] = DEF_TIMEFMT; int PIXEL_FORMAT_BitsPerPixel = 8; - typedef struct display_info_s { - uint8_t char_width; - uint8_t char_height; - uint8_t font_width; - uint8_t font_height; - uint16_t num_chars; -} display_info_t; + uint8_t char_width; + uint8_t char_height; + uint8_t font_width; + uint8_t font_height; + uint16_t num_chars; +} display_info_t; -#define SD_DISPLAY_INFO {.char_width = 31, .char_height = 15, .font_width = 36, .font_height = 54, .num_chars = 256} +#define SD_DISPLAY_INFO \ + { .char_width = 31, .char_height = 15, .font_width = 36, .font_height = 54, .num_chars = 256 } static const display_info_t sd_display_info = SD_DISPLAY_INFO; static const display_info_t hd_display_info = { - .char_width = 50, - .char_height = 18, - .font_width = 24, - .font_height = 36, - .num_chars = 512, + .char_width = 50, + .char_height = 18, + .font_width = 24, + .font_height = 36, + .num_chars = 512, }; static const display_info_t fhd_display_info = { - .char_width = 50, - .char_height = 18, - .font_width = 36, - .font_height = 54, - .num_chars = 512, + .char_width = 50, + .char_height = 18, + .font_width = 36, + .font_height = 54, + .num_chars = 512, }; /* @@ -306,8 +300,9 @@ static const display_info_t fhd_display_info = { #define TRANSPARENT_COLOR 0xFBDE -//Not implemented, draw the center part of the screen with much faster rate to keep CPU load low -//overlays 1 to 8 are taken by OSD tool, but they are limited to 8 in some systems like Goke +// Not implemented, draw the center part of the screen with much faster rate to +// keep CPU load low overlays 1 to 8 are taken by OSD tool, but they are limited +// to 8 in some systems like Goke #ifdef __SIGMASTAR__ #define FULL_OVERLAY_ID 9 #define FAST_OVERLAY_ID 8 @@ -318,9 +313,8 @@ static const display_info_t fhd_display_info = { char font_2_name[256]; -uint16_t OVERLAY_WIDTH =1800; -uint16_t OVERLAY_HEIGHT =1000; - +uint16_t OVERLAY_WIDTH = 1800; +uint16_t OVERLAY_HEIGHT = 1000; static displayport_vtable_t *display_driver; @@ -329,2011 +323,2132 @@ static display_info_t current_display_info = SD_DISPLAY_INFO; /// @brief We keep the main font glyphs here BITMAP bitmapFnt; -//bounderies as characters of fast area. Fast Character -int fcX= 12; int fcW=10; int fcY= 5 ; int fcH=8; +// bounderies as characters of fast area. Fast Character +int fcX = 12; +int fcW = 10; +int fcY = 5; +int fcH = 8; char font_load_name[255]; bool LoadFont(); - -static bool InjectChars(char* payload){ - - char* str= payload + 4; - //string starts at 4 payload[0]==MSP_subtype - //set Position to Widget that draws Stick Positions - only on ground side, so do not clear it on camera side - if (DrawOSD && str[0]=='!' && str[1]=='R' && str[2]=='C' && str[3]=='!'){ - // uint8_t row = payload[0]; //uint8_t col = payload[1]; - RCWidgetX = payload[2] *current_display_info.font_width; - RCWidgetY = payload[1] * current_display_info.font_height; - memset (&payload[4],0,4); - - return true; - } - int cnt=0; - //may have several in one text message - while (str[0]!=0 && cnt<20){ - //set extra temp on screen - if ( str[0]=='!' && str[1]=='T' && str[2]=='M' && str[3]=='P'&& str[4]=='!'){ - int temp = 103; - #if __SIGMASTAR__ - temp = 102; - temp = GetTempSigmaStar(); - #else - temp = last_board_temp ; - if (temp==-100) - temp=101; - #endif - if (temp<0) - temp=104; - - if (font_pages==2){//inav symbols - str[0] = 199;//10748/54=199 - str[3] = 11;//degree - }else{//betaflight symbols - str[0] = 122;//10748/54=199 - str[3] = 14;//degree - } - if (temp>100) - str[1]=48 + 'A'; - else - str[1]=48 + temp/10; - - str[2]=48 + temp%10; - - str[4] = 32;//end of string, no need, we are only replacing! place space - str = str + 4; - //return true; - } - - //set extra temp on screen - if ( str[0]=='!' && str[1]=='T' && str[2]=='M' && str[3]=='W'&& str[4]=='!'){ - int temp = 99; - - temp = GetTXTemp(); - if (temp<0) - last_board_temp=99; - - if (last_board_temp==-100) - last_board_temp=99; - - if (last_board_temp<0) - last_board_temp=99; - if (font_pages==2){//inav symbols - str[0] = 196;//10748/54=199 - str[3] = 11;//degree - }else{//betaflight symbols - str[0] = 122;//10748/54=199 - str[3] = 14;//degree - } - str[1]=48 + temp/10; - str[2]=48 + temp%10; - - str[4] = 32;//end of string, no need, we are only replacing! place space - str = str + 4;//move the pointer - //return true; - } - str=str + 1; - cnt++; - }//while - return false; +static bool InjectChars(char *payload) { + + char *str = payload + 4; + // string starts at 4 payload[0]==MSP_subtype + // set Position to Widget that draws Stick Positions - only on ground side, + // so do not clear it on camera side + if (DrawOSD && str[0] == '!' && str[1] == 'R' && str[2] == 'C' && str[3] == '!') { + // uint8_t row = payload[0]; //uint8_t col = payload[1]; + RCWidgetX = payload[2] * current_display_info.font_width; + RCWidgetY = payload[1] * current_display_info.font_height; + memset(&payload[4], 0, 4); + + return true; + } + int cnt = 0; + // may have several in one text message + while (str[0] != 0 && cnt < 20) { + // set extra temp on screen + if (str[0] == '!' && str[1] == 'T' && str[2] == 'M' && str[3] == 'P' && str[4] == '!') { + int temp = 103; +#if __SIGMASTAR__ + temp = 102; + temp = GetTempSigmaStar(); +#else + temp = last_board_temp; + if (temp == -100) + temp = 101; +#endif + if (temp < 0) + temp = 104; + + if (font_pages == 2) { // inav symbols + str[0] = 199; // 10748/54=199 + str[3] = 11; // degree + } else { // betaflight symbols + str[0] = 122; // 10748/54=199 + str[3] = 14; // degree + } + if (temp > 100) + str[1] = 48 + 'A'; + else + str[1] = 48 + temp / 10; + + str[2] = 48 + temp % 10; + + str[4] = 32; // end of string, no need, we are only replacing! place + // space + str = str + 4; + // return true; + } + + // set extra temp on screen + if (str[0] == '!' && str[1] == 'T' && str[2] == 'M' && str[3] == 'W' && str[4] == '!') { + int temp = 99; + + temp = GetTXTemp(); + if (temp < 0) + last_board_temp = 99; + + if (last_board_temp == -100) + last_board_temp = 99; + + if (last_board_temp < 0) + last_board_temp = 99; + if (font_pages == 2) { // inav symbols + str[0] = 196; // 10748/54=199 + str[3] = 11; // degree + } else { // betaflight symbols + str[0] = 122; // 10748/54=199 + str[3] = 14; // degree + } + str[1] = 48 + temp / 10; + str[2] = 48 + temp % 10; + + str[4] = 32; // end of string, no need, we are only replacing! place + // space + str = str + 4; // move the pointer + // return true; + } + str = str + 1; + cnt++; + } // while + return false; } - - -static void rx_msp_callback(msp_msg_t *msp_message) -{ - // Process a received MSP message from FC and decide whether to send it to the PTY (DJI) or UDP port (MSP-OSD on Goggles) - DEBUG_PRINT("FC->AU MSP msg %d with data len %d \n", msp_message->cmd, msp_message->size); - stat_msp_msgs++; - - //We will forward ALL MSP traffic, not only DisplayPort - if(fb_cursor > sizeof(frame_buffer)) { - if (out_sock>0){ - printf("Exhausted frame buffer! Flushing...\n"); - sendto(out_sock, frame_buffer, fb_cursor, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - } - fb_cursor = 0; - //return; - } - //Here it will replace custom text messages for configurator screen - if (msp_message->cmd==MSP_CMD_DISPLAYPORT && msp_message->direction == MSP_INBOUND && msp_message->cmd == MSP_CMD_DISPLAYPORT && msp_message->payload[0] == MSP_DISPLAYPORT_DRAW_STRING) - InjectChars(&msp_message->payload[0]); - - //if (out_sock>0){//No need to cache MSP if we won't send it later - uint16_t size = msp_data_from_msg(message_buffer, msp_message); - copy_to_msp_frame_buffer(message_buffer, size); - //} - - switch(msp_message->cmd) { - - case MSP_CMD_STATUS: { - // we need the armed state - armed = (msp_message->payload[6] & 0x01); - if (armed) vtxMenuActive = false; - break; - } - - case MSP_ATTITUDE: { - - last_pitch = *(int16_t*)&msp_message->payload[2]; - last_roll = *(int16_t*)&msp_message->payload[0]; - last_heading = *(int16_t*)&msp_message->payload[4]; - stat_msp_msg_attitude++; - stat_attitudeDelay=get_time_ms() - last_MSP_ATTITUDE; - //printf("\n Got MSG_ATTITUDE pitch:%d roll:%d\n", pitch, roll); - break; - } - - case MSP_COMP_GPS: { - /* +static void rx_msp_callback(msp_msg_t *msp_message) { + // Process a received MSP message from FC and decide whether to send it to + // the PTY (DJI) or UDP port (MSP-OSD on Goggles) + DEBUG_PRINT("FC->AU MSP msg %d with data len %d \n", msp_message->cmd, msp_message->size); + stat_msp_msgs++; + + // We will forward ALL MSP traffic, not only DisplayPort + if (fb_cursor > sizeof(frame_buffer)) { + if (out_sock > 0) { + printf("Exhausted frame buffer! Flushing...\n"); + sendto( + out_sock, frame_buffer, fb_cursor, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); + } + fb_cursor = 0; + // return; + } + // Here it will replace custom text messages for configurator screen + if (msp_message->cmd == MSP_CMD_DISPLAYPORT && msp_message->direction == MSP_INBOUND && + msp_message->cmd == MSP_CMD_DISPLAYPORT && + msp_message->payload[0] == MSP_DISPLAYPORT_DRAW_STRING) + InjectChars(&msp_message->payload[0]); + + // if (out_sock>0){//No need to cache MSP if we won't send it later + uint16_t size = msp_data_from_msg(message_buffer, msp_message); + copy_to_msp_frame_buffer(message_buffer, size); + //} + + switch (msp_message->cmd) { + + case MSP_CMD_STATUS: { + // we need the armed state + armed = (msp_message->payload[6] & 0x01); + if (armed) + vtxMenuActive = false; + break; + } + + case MSP_ATTITUDE: { + + last_pitch = *(int16_t *)&msp_message->payload[2]; + last_roll = *(int16_t *)&msp_message->payload[0]; + last_heading = *(int16_t *)&msp_message->payload[4]; + stat_msp_msg_attitude++; + stat_attitudeDelay = get_time_ms() - last_MSP_ATTITUDE; + // printf("\n Got MSG_ATTITUDE pitch:%d roll:%d\n", pitch, + // roll); + break; + } + + case MSP_COMP_GPS: { + /* GPS_distanceToHome UINT 16 unit: meter -GPS_directionToHome UINT 16 unit: degree (range [-180;+180]) -GPS_update UINT 8 a flag to indicate when a new GPS frame is received (the GPS fix is not dependent of this) - */ - last_distanceToHome = *(int16_t*)&msp_message->payload[0]; - last_directionToHome = *(int16_t*)&msp_message->payload[2]; - //stat_msp_msg_attitude++; - //printf("\n Got MSG_ATTITUDE pitch:%d roll:%d\n", pitch, roll); - break; - } - case MSP_RC: { - //printf("Got MSP_RC \n"); - //memcpy(&channels[0], &msp_message->payload[0],32); - memcpy(&channels[0], &msp_message->payload[0], 16 * sizeof(uint16_t)); - - //showchannels(18); - ProcessChannels(); - if (vtxMenuEnabled && vtxMenuActive) { - print_current_state(display_driver); - } - break; - } - - case MSP_CMD_DISPLAYPORT: { - - if(msp_message->payload[0] == MSP_DISPLAYPORT_INFO_MSG) { - msp_message->payload[80]=0;//just in case - strcpy(air_unit_info_msg,&msp_message->payload[1]); - fill(air_unit_info_msg); - } - - - - if ( ! vtxMenuActive ) { - displayport_process_message(display_driver, msp_message); - - } else - if (!DrawOSD){//if we only resend to ground station and menu is active, stop regular OSD - LastPcktSent= get_time_ms();//clear buffer and prevent from sending MSP to ground - fb_cursor = 0; - printf("D"); - } - - if (out_sock>0 && fb_cursor>0){//if there is data to send - if(msp_message->payload[0] == MSP_DISPLAYPORT_DRAW_SCREEN) { - //Try to aggregate several MSP packets into one UDP packets - if ( (!DrawOSD) && MinTimeBetweenScreenRefresh>20 && (get_time_ms() - LastPcktSent ) < MinTimeBetweenScreenRefresh) - {}//Do not send the frame but keep it in the buffer - else{ - stat_UDP_MSPframes++; - sendto(out_sock, frame_buffer, fb_cursor, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - LastPcktSent= get_time_ms(); - stat_MSPBytesSent+=fb_cursor; - fb_cursor = 0; - } - - } - } - - - break; - } - case MSP_CMD_FC_VARIANT: { - // This is an FC Variant response, so we want to use it to set our FC variant. - DEBUG_PRINT("Got FC Variant response!\n"); - if(strncmp(current_fc_identifier, msp_message->payload, 4) != 0) { - // FC variant changed or was updated. Update the current FC identifier and send an MSP version request. - memcpy(current_fc_identifier, msp_message->payload, 4); - //Seems only BetaFlight needs this - send_version_request(serial_fd); - printf("Flight Controller detected: %s \r\n",current_fc_identifier); - if (bitmapFnt.pData==NULL){ - SetOSDMsg(""); - LoadFont(); - if (bitmapFnt.pData==NULL){ - char msg[200]; - sprintf(msg,"&F38 &L43 No Font File %s found!",font_load_name); - SetOSDMsg(msg); - } - } - } - break; - } - case MSP_CMD_API_VERSION: { - // Got an MSP API version response. Compare the version if we have Betaflight in order to see if we should send the new display size message. - if(strncmp(current_fc_identifier, "BTFL", 4) == 0) { - uint8_t msp_minor_version = msp_message->payload[2]; - DEBUG_PRINT("Got Betaflight minor MSP version %d\n", msp_minor_version); - if(msp_minor_version >= MSP_DISPLAY_SIZE_VERSION) { - if(!no_btfl_hd) { - if(!compress) { - // If compression is disabled, we need to manually inject a canvas-change command into the command stream. - uint8_t displayport_set_size[3] = {MSP_DISPLAYPORT_SET_OPTIONS, 0, MSP_HD_OPTION_60_22}; - construct_msp_command(message_buffer, MSP_CMD_DISPLAYPORT, displayport_set_size, 3, MSP_INBOUND); - copy_to_msp_frame_buffer(message_buffer, 9); - DEBUG_PRINT("Sent display size to goggles\n"); - - } - // Betaflight with HD support. Send our display size and set 60x22. - send_display_size(serial_fd); - msp_hd_option = MSP_HD_OPTION_60_22; - DEBUG_PRINT("Sent display size to FC\n"); - } - } - } - break; - } - case MSP_GET_VTX_CONFIG: { - if (vtxInitDone) { - mspVtxConfigStruct *in_mspVtxConfigStruct = (mspVtxConfigStruct *) msp_message->payload; - uint16_t frequency = (in_mspVtxConfigStruct->freqMSB << 8) | in_mspVtxConfigStruct->freqLSB; - - double current_frequency = read_current_freq_from_interface(read_setting("/etc/wfb.conf","wlan")); - - if (verbose) printf("mspVTX Band: %i, Channel: %i, wanted Frequency: %u, set Frequency: %.0f\n",in_mspVtxConfigStruct->band, in_mspVtxConfigStruct->channel, frequency, current_frequency); - - if (frequency != (uint16_t)current_frequency) { - int channel = 0; - for (int i =0 ; i < MAX_ENTRIES; i++) { - if (fc_list[i].frequency == frequency) - channel = fc_list[i].channel; - } - if (channel > 0) { - if (verbose) printf("mspVTX executing channel change to channel %d\n",channel); - - set_frequency(read_setting("/etc/wfb.conf","wlan"), channel); - - //store new channel to wfb.conf - char cha_str[32]; - sprintf(cha_str, "%i", channel); - write_setting("/etc/wfb.conf", "channel", cha_str); - } else { - printf("Never change to channel 0, we should not reach here, check vtx table in your fc\n"); - } - } - } else { - if (verbose) - printf("vtxInitDone not finished, should never happen\n"); - } - break; - } - default: { - if (verbose) printf("Received a uncatched MSP_COMMAND: %i\n", msp_message->cmd); - uint16_t size = msp_data_from_msg(message_buffer, msp_message); - if(serial_passthrough /*|| cache_msp_message(msp_message)*/) { - // Either serial passthrough was on, or the cache was enabled but missed (a response was not available). - // Either way, this means we need to send the message through to DJI. - write(pty_fd, message_buffer, size); - } - break; - } - } + GPS_directionToHome UINT 16 unit: degree (range [-180;+180]) + GPS_update UINT 8 a flag to indicate when a new GPS frame is received (the + GPS fix is not dependent of this) + */ + last_distanceToHome = *(int16_t *)&msp_message->payload[0]; + last_directionToHome = *(int16_t *)&msp_message->payload[2]; + // stat_msp_msg_attitude++; + // printf("\n Got MSG_ATTITUDE pitch:%d roll:%d\n", pitch, + // roll); + break; + } + case MSP_RC: { + // printf("Got MSP_RC \n"); + // memcpy(&channels[0], &msp_message->payload[0],32); + memcpy(&channels[0], &msp_message->payload[0], 16 * sizeof(uint16_t)); + + // showchannels(18); + ProcessChannels(); + if (vtxMenuEnabled && vtxMenuActive) { + print_current_state(display_driver); + } + break; + } + + case MSP_CMD_DISPLAYPORT: { + + if (msp_message->payload[0] == MSP_DISPLAYPORT_INFO_MSG) { + msp_message->payload[80] = 0; // just in case + strcpy(air_unit_info_msg, &msp_message->payload[1]); + fill(air_unit_info_msg); + } + + if (!vtxMenuActive) { + displayport_process_message(display_driver, msp_message); + + } else if (!DrawOSD) { // if we only resend to ground station and menu + // is active, stop regular OSD + LastPcktSent = get_time_ms(); // clear buffer and prevent from + // sending MSP to ground + fb_cursor = 0; + printf("D"); + } + + if (out_sock > 0 && fb_cursor > 0) { // if there is data to send + if (msp_message->payload[0] == MSP_DISPLAYPORT_DRAW_SCREEN) { + // Try to aggregate several MSP packets into one UDP packets + if ((!DrawOSD) && MinTimeBetweenScreenRefresh > 20 && + (get_time_ms() - LastPcktSent) < MinTimeBetweenScreenRefresh) { + } // Do not send the frame but keep it in the buffer + else { + stat_UDP_MSPframes++; + sendto(out_sock, frame_buffer, fb_cursor, 0, (struct sockaddr *)&sin_out, + sizeof(sin_out)); + LastPcktSent = get_time_ms(); + stat_MSPBytesSent += fb_cursor; + fb_cursor = 0; + } + } + } + + break; + } + case MSP_CMD_FC_VARIANT: { + // This is an FC Variant response, so we want to use it to set our FC + // variant. + DEBUG_PRINT("Got FC Variant response!\n"); + if (strncmp(current_fc_identifier, msp_message->payload, 4) != 0) { + // FC variant changed or was updated. Update the current FC + // identifier and send an MSP version request. + memcpy(current_fc_identifier, msp_message->payload, 4); + // Seems only BetaFlight needs this + send_version_request(serial_fd); + printf("Flight Controller detected: %s \r\n", current_fc_identifier); + if (bitmapFnt.pData == NULL) { + SetOSDMsg(""); + LoadFont(); + if (bitmapFnt.pData == NULL) { + char msg[200]; + sprintf(msg, "&F38 &L43 No Font File %s found!", font_load_name); + SetOSDMsg(msg); + } + } + } + break; + } + case MSP_CMD_API_VERSION: { + // Got an MSP API version response. Compare the version if we have + // Betaflight in order to see if we should send the new display size + // message. + if (strncmp(current_fc_identifier, "BTFL", 4) == 0) { + uint8_t msp_minor_version = msp_message->payload[2]; + DEBUG_PRINT("Got Betaflight minor MSP version %d\n", msp_minor_version); + if (msp_minor_version >= MSP_DISPLAY_SIZE_VERSION) { + if (!no_btfl_hd) { + if (!compress) { + // If compression is disabled, we need to manually + // inject a canvas-change command into the command + // stream. + uint8_t displayport_set_size[3] = { + MSP_DISPLAYPORT_SET_OPTIONS, 0, MSP_HD_OPTION_60_22}; + construct_msp_command(message_buffer, MSP_CMD_DISPLAYPORT, + displayport_set_size, 3, MSP_INBOUND); + copy_to_msp_frame_buffer(message_buffer, 9); + DEBUG_PRINT("Sent display size to goggles\n"); + } + // Betaflight with HD support. Send our display size and set + // 60x22. + send_display_size(serial_fd); + msp_hd_option = MSP_HD_OPTION_60_22; + DEBUG_PRINT("Sent display size to FC\n"); + } + } + } + break; + } + case MSP_GET_VTX_CONFIG: { + if (vtxInitDone) { + mspVtxConfigStruct *in_mspVtxConfigStruct = (mspVtxConfigStruct *)msp_message->payload; + uint16_t frequency = + (in_mspVtxConfigStruct->freqMSB << 8) | in_mspVtxConfigStruct->freqLSB; + + double current_frequency = + read_current_freq_from_interface(read_setting("/etc/wfb.conf", "wlan")); + + if (verbose) + printf("mspVTX Band: %i, Channel: %i, wanted Frequency: %u, set " + "Frequency: %.0f\n", + in_mspVtxConfigStruct->band, in_mspVtxConfigStruct->channel, frequency, + current_frequency); + + if (frequency != (uint16_t)current_frequency) { + int channel = 0; + for (int i = 0; i < MAX_ENTRIES; i++) { + if (fc_list[i].frequency == frequency) + channel = fc_list[i].channel; + } + if (channel > 0) { + if (verbose) + printf("mspVTX executing channel change to channel " + "%d\n", + channel); + + set_frequency(read_setting("/etc/wfb.conf", "wlan"), channel); + + // store new channel to wfb.conf + char cha_str[32]; + sprintf(cha_str, "%i", channel); + write_setting("/etc/wfb.conf", "channel", cha_str); + } else { + printf("Never change to channel 0, we should not reach " + "here, check " + "vtx table in your fc\n"); + } + } + } else { + if (verbose) + printf("vtxInitDone not finished, should never happen\n"); + } + break; + } + default: { + if (verbose) + printf("Received a uncatched MSP_COMMAND: %i\n", msp_message->cmd); + uint16_t size = msp_data_from_msg(message_buffer, msp_message); + if (serial_passthrough /*|| cache_msp_message(msp_message)*/) { + // Either serial passthrough was on, or the cache was enabled but + // missed (a response was not available). Either way, this means we + // need to send the message through to DJI. + write(pty_fd, message_buffer, size); + } + break; + } + } } +static int load_fontFromBMP(const char *filename, BITMAP *bitmap) { + if (access(filename, F_OK)) + return -1; -static int load_fontFromBMP(const char *filename, BITMAP *bitmap){ - if (access(filename, F_OK)) - return -1; - - //White will be the transparant color - return prepare_bitmap(filename, bitmap, 2, TRANSPARENT_COLOR, PIXEL_FORMAT_1555); - + // White will be the transparant color + return prepare_bitmap(filename, bitmap, 2, TRANSPARENT_COLOR, PIXEL_FORMAT_1555); } - // Function to move the cursor to a specific position -void move_cursor(int row, int col) { - printf("\033[%d;%dH", row, col); -} +void move_cursor(int row, int col) { printf("\033[%d;%dH", row, col); } // Function to draw a character at a specific position void draw_character_on_console(int row, int col, char ch) { - move_cursor(row, col); - printf("%c", ch); + move_cursor(row, col); + printf("%c", ch); } - - /// @brief Extra font glyphs with smaller size BITMAP bmpFntSmall; uint16_t character_map[MAX_OSD_WIDTH][MAX_OSD_HEIGHT]; -struct osd *osds;//regions over the overlay +struct osd *osds; // regions over the overlay -static long cntr=-10; +static long cntr = -10; -int center_refresh=0; +int center_refresh = 0; -/// @brief Where to place the message, 0 upper left, 1 -upper middle , 2 - upper right, 3 - upper row moving -int msg_layout=0; -/// @brief Color type to use to render the font. 0 - White, 1 - Black edges on white font -int msg_colour=0; +/// @brief Where to place the message, 0 upper left, 1 -upper middle , 2 - upper +/// right, 3 - upper row moving +int msg_layout = 0; +/// @brief Color type to use to render the font. 0 - White, 1 - Black edges on +/// white font +int msg_colour = 0; -static unsigned long long LastCleared=0; +static unsigned long long LastCleared = 0; static bool osd_msg_enabled = false; - -//This will be where we will copy font icons and then pass to Display API to render over video. + +// This will be where we will copy font icons and then pass to Display API to +// render over video. BITMAP bmpBuff; -//Buffer to hold converted RGBA data to work with Cairo -unsigned char* bmp_x86=NULL; +// Buffer to hold converted RGBA data to work with Cairo +unsigned char *bmp_x86 = NULL; /// @brief Pointer to the canvas memory with bmp data -void* directBmp; -bool useDirectBMPBuffer=false; +void *directBmp; +bool useDirectBMPBuffer = false; int x_start = 600; int y_start = 500; int x_end = 1300; int y_end = 500; - uint32_t getcolor(uint8_t index){ - MI_RGN_PaletteElement_t element = g_stPaletteTable.astElement[index]; - uint32_t rgba = (element.u8Red << 24) | (element.u8Green << 16) | (element.u8Blue<< 8) | element.u8Alpha; - - } +uint32_t getcolor(uint8_t index) { + MI_RGN_PaletteElement_t element = g_stPaletteTable.astElement[index]; + uint32_t rgba = + (element.u8Red << 24) | (element.u8Green << 16) | (element.u8Blue << 8) | element.u8Alpha; +} - void LineDirect(uint8_t* bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1, uint8_t color, int thickness) { +void LineDirect(uint8_t *bmpData, uint32_t width, uint32_t height, int x0, int y0, int x1, int y1, + uint8_t color, int thickness) { #if defined(_x86) || defined(__ROCKCHIP__) - drawLineGS(x0, y0, x1, y1, getcolor(color), thickness, false); + drawLineGS(x0, y0, x1, y1, getcolor(color), thickness, false); #else - drawLineI4( bmpData, width, height, x0, y0, x1, y1, color, thickness); -#endif - } - + drawLineI4(bmpData, width, height, x0, y0, x1, y1, color, thickness); +#endif +} -void LineTranspose(uint8_t* bmpData, int posX0, int posY0, int posX1, int posY1, uint8_t color, int thickness) { +void LineTranspose( + uint8_t *bmpData, int posX0, int posY0, int posX1, int posY1, uint8_t color, int thickness) { #if defined(_x86) || defined(__ROCKCHIP__) - drawLineGS(posX0, posY0, posX1, posY1, getcolor(color), thickness, true); + drawLineGS(posX0, posY0, posX1, posY1, getcolor(color), thickness, true); #else - drawLine( bmpData, posX0, posY0, posX1, posY1, color, thickness); + drawLine(bmpData, posX0, posY0, posX1, posY1, color, thickness); #endif } +static void draw_AHI() { + + int OffsY = sin((last_pitch / 10) * (M_PI / 180.0)) * 400; + + int img_width = x_end - x_start; + int img_height = y_end - y_start; + + double angle_degrees = -last_roll / 10; // Rotate by 45 degrees + Transform_OVERLAY_WIDTH = OVERLAY_WIDTH; + Transform_OVERLAY_HEIGHT = OVERLAY_HEIGHT; + Transform_Pitch = last_pitch / 10; + Transform_Roll = -last_roll / 10; - static void draw_AHI(){ - - int OffsY= sin((last_pitch/10) * (M_PI / 180.0))*400; - - int img_width = x_end-x_start; - int img_height = y_end-y_start; - - double angle_degrees = -last_roll/10; // Rotate by 45 degrees - Transform_OVERLAY_WIDTH=OVERLAY_WIDTH; - Transform_OVERLAY_HEIGHT=OVERLAY_HEIGHT; - Transform_Pitch=last_pitch/10; - Transform_Roll=-last_roll/10; - - Point img_center = {OVERLAY_WIDTH/2, OVERLAY_HEIGHT/2}; // Center of the image (example) - Point original_point = {600, 500}; // Example point - Point original_point2 = {1300, 500}; // Example point - - // drawLineI4Ex(bmpBuff.pData, bmpBuff.u32Width, bmpBuff.u32Height, original_point,original_point2, 7); - int linewidth=400; - int linethickness=2; - if (OVERLAY_WIDTH>1500){ - linewidth=500; - linethickness=3; - } - - LineTranspose(bmpBuff.pData, img_center.x-linewidth/2 , img_center.y, img_center.x+linewidth/2, img_center.y, COLOR_WHITE, linethickness); - - //drawRectangleI4(bmpBuff.pData, 600 , 400 , 700 , 6, COLOR_GREEN, 1); - - } - - /// @brief Ugly implementation. To do : clear from bmp format dependant code - static void draw_Ladder(){ - //if (PIXEL_FORMAT_DEFAULT!=PIXEL_FORMAT_I4) - // return; - - - - Transform_OVERLAY_WIDTH=OVERLAY_WIDTH; - Transform_OVERLAY_HEIGHT=OVERLAY_HEIGHT; - Transform_Pitch=last_pitch/10; - Transform_Roll=-last_roll/10; - - int TiltY= - AHI_TiltY;//pixels offset on the vertical, negative value means up, this is camera nose-down angle in pixels - //to do, make this in degrees - - const bool horizonInvertPitch = false; - const bool horizonInvertRoll = false; - double horizonWidth = 3; - const int horizonSpacing = 165;//????//pixels per degree 165 - const bool horizonShowLadder = true; - int horizonRange = 80; //total vertical range in degrees - const int horizonStep = 10;//????//degrees per line - const bool show_center_indicator = false;////m_show_center_indicator; - - const double ladder_stroke_faktor=0.1; - const int subline_thickness=1; - - if (OVERLAY_HEIGHT<900){//720p mode - horizonWidth = 2; - horizonRange = 50; - } - - double roll_degree = ((double)last_roll)/10; - double pitch_degree = ((double)last_pitch)/10; - - if (horizonInvertRoll == true){ - roll_degree=roll_degree*-1; - } - if (horizonInvertPitch == false){ - pitch_degree=pitch_degree*-1; - } - - - const int pos_x= OVERLAY_WIDTH/2; - const int pos_y= (OVERLAY_HEIGHT/2) + TiltY; - const int width_ladder= 100*horizonWidth; - - int px = pos_x - width_ladder / 2; - - - if(/*show_center_indicator*/true){ - - - // Line always drawn in the center to have some orientation where the center is - int line_w = 100 * horizonWidth * 0.2; - - LineDirect(bmpBuff.pData, OVERLAY_WIDTH, OVERLAY_HEIGHT, px-20,pos_y-3,px+20,pos_y-3, COLOR_GRAY_Light,2); - - LineDirect(bmpBuff.pData, OVERLAY_WIDTH, OVERLAY_HEIGHT, px+width_ladder-20,pos_y-3,px+width_ladder+20,pos_y-3, COLOR_GRAY_Light,2); - - } - - int ratio = horizonSpacing; //pixels per degree - int vrange = horizonRange; //total vertical range in degrees - int step = horizonStep; //degrees per line - if (step == 0) step = 10; // avoid div by 0 - if (ratio == 0) ratio = 1; // avoid div by 0 - - int m_color=7; - int i; - int k; - int y; - int n; - int startH; - int stopH; - startH = pitch_degree - vrange/2; - stopH = pitch_degree + vrange/2; - if (startH<-90) startH = -90; - if (stopH>90) stopH = 90; - - //painter->setPen(m_color); - int m_color_def=m_color; - for (i = startH/step; i <= stopH/step; i++) { - m_color = m_color_def; - if (i>0 && i*ratio<30 && /*showHorizonHeadingLadder*/ true ) i=i+ 30/ratio; - - k = i*step; - y = pos_y - (i - 1.0*pitch_degree/step)*ratio; - if (horizonShowLadder == true) { - if (i != 0) { - - //fix pitch line wrap around at extreme nose up/down - n=k;//this is the line index number relative to the main one. - if (n>90){ - n=180-k; - } - if (n<-90){ - n=-k-180; - } - if (abs(n)>20)//pitch higher than 30 degree. - m_color=COLOR_YELLOW; - if (abs(n)>40)//pitch higher than 30 degree. - m_color=COLOR_RED; - - //left numbers - // painter->setPen(m_color); - // painter->drawText(px-30, y+6, QString::number(n)); - - //right numbers - //painter->drawText((px + width_ladder)+8, y+6, QString::number(n)); - // painter->setPen(m_color); - - if ((i > 0)) { - //Upper ladders - // default to stroke strength of 2 (I think it is pixels) - int stroke_s = 2 * ladder_stroke_faktor; - - - //left upper cap - //drawRectangleI4(bmpBuff.pData, px , y , stroke_s , width_ladder/24, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px, y, px, y+width_ladder/24 , m_color, subline_thickness); // Top side - - //left upper line - //drawRectangleI4(bmpBuff.pData, px , y , width_ladder/3 , stroke_s, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px, y, px + width_ladder/3, y , m_color, subline_thickness); // Top side - - //right upper cap - //drawRectangleI4(bmpBuff.pData, px+width_ladder-2 , y , px+width_ladder-2 + stroke_s , width_ladder/24, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px+width_ladder-2 , y , px+width_ladder-2, y+width_ladder/24 , m_color, subline_thickness); // Top side - - //right upper line - //drawRectangleI4(bmpBuff.pData, px+width_ladder*2/3 , y , width_ladder/3 , stroke_s, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px+width_ladder*2/3 , y , (px+width_ladder*2/3) + width_ladder/3 - 1 , y , m_color, subline_thickness); // Top side - - - - } else if (i < 0) { - // Lower ladders - // default to stroke strength of 2 (I think it is pixels) - - int stroke_s = 2 * ladder_stroke_faktor; - - //left to right - //left lower cap - //drawRectangleI4(bmpBuff.pData, px, y-(width_ladder/24)+2 , stroke_s , width_ladder/24, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px, y-(width_ladder/24)+2 , px , y-(width_ladder/24)+1 + width_ladder/24 , m_color, subline_thickness); // Top side - - //1l - //drawRectangleI4(bmpBuff.pData, px , y , width_ladder/12 , stroke_s, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px , y , px + width_ladder/12 , y , m_color, subline_thickness); // Top side - - //2l - //drawRectangleI4(bmpBuff.pData, px+(width_ladder/12)*1.5 , y , width_ladder/12 , stroke_s, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px+(width_ladder/12)*1.5 , y , px+(width_ladder/12)*1.5 + width_ladder/12 , y , m_color, subline_thickness); // Top side - - //3l - //drawRectangleI4(bmpBuff.pData, px+(width_ladder/12)*3 , y , width_ladder/12 , stroke_s, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px+(width_ladder/12)*3 , y ,px+(width_ladder/12)*3 + width_ladder/12 , y , m_color, subline_thickness); // Top side - - //right lower cap - //drawRectangleI4(bmpBuff.pData, px+width_ladder-2 , y-(width_ladder/24)+2 , stroke_s , width_ladder/24, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px+width_ladder-2 , y-(width_ladder/24)+2 , px+width_ladder-2 , y-(width_ladder/24)+1 + width_ladder/24 , m_color, subline_thickness); // Top side - - //1r ///spacing on these might be a bit off - //drawRectangleI4(bmpBuff.pData, px+(width_ladder/12)*8 , y , width_ladder/12 , stroke_s, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px+(width_ladder/12)*8 , y , px+(width_ladder/12)*8 + width_ladder/12 , y , m_color, subline_thickness); // Top side - - - //2r ///spacing on these might be a bit off - //drawRectangleI4(bmpBuff.pData, px+(width_ladder/12)*9.5 , y , width_ladder/12 , stroke_s, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px+(width_ladder/12)*9.5 , y , px+(width_ladder/12)*9.5 + width_ladder/12 , y , m_color, subline_thickness); // Top side - - //3r ///spacing on these might be a bit off tried a decimal here - //drawRectangleI4(bmpBuff.pData, px+(width_ladder*.9166) , y , width_ladder/12 , stroke_s, m_color,subline_thickness); - LineTranspose(bmpBuff.pData, px+(width_ladder*.9166) , y , px+(width_ladder*.9166) + width_ladder/12 , y , m_color, subline_thickness); // Top side - - - - } - } else { // i==0 - //Main AHI Line - // default to stroke strength of 3 - a bit bigger than the non center lines - int stroke_s = 4 * ladder_stroke_faktor; - - - int rect_height = 5; // Height of the rectangles (as per your original code) - int fragments=6; - float SpacingK=0.6; - //int rect_width = (width_ladder*2.5/(fragments + (float)SpacingK*fragments)); // Width of a single rectangle - int rect_width = width_ladder*2.5/(fragments); // Width of a single semiline+spacing - - int spacing = rect_width*SpacingK ; // Spacing between rectangles - - rect_width = rect_width - spacing;//Length of a small line - // Calculate the starting X position for the first rectangle - int start_x = pos_x-width_ladder*2.5/2; - - // Draw 6 rectangles in a line - for (int i = 0; i < fragments; i++) { - // Calculate the X position for the current rectangle - int rect_x = start_x + i * (rect_width + spacing) + spacing/2; - - bool isPlaneLevel= (-2 < last_pitch/10 && last_pitch/10 <2)&&(i==2 || i==3); - LineTranspose(bmpBuff.pData, rect_x, y, rect_x + rect_width, y, isPlaneLevel? COLOR_GREEN : COLOR_WHITE, 3); - - } - - int LAST_ROLL = -5; // Example integer value (change as needed) - char buffer[6]; // Enough space for "+/-", two digits, the degree symbol, and the null terminator - - // Format the LAST_ROLL value into the buffer with the specified format - // %+02d: '+' sign for positive numbers, '0' for leading zero, '2' for width. - // \xB0: ASCII code for the degree symbol. - if (-10 < last_pitch && last_pitch <10) - sprintf(buffer, "%+0.1f°", -last_pitch / 10.0); - else - sprintf(buffer, "%+02d°", -last_pitch/10); - - int osd_font_size=18; + Point img_center = {OVERLAY_WIDTH / 2, OVERLAY_HEIGHT / 2}; // Center of the image (example) + Point original_point = {600, 500}; // Example point + Point original_point2 = {1300, 500}; // Example point + + // drawLineI4Ex(bmpBuff.pData, bmpBuff.u32Width, bmpBuff.u32Height, + // original_point,original_point2, 7); + int linewidth = 400; + int linethickness = 2; + if (OVERLAY_WIDTH > 1500) { + linewidth = 500; + linethickness = 3; + } + + LineTranspose(bmpBuff.pData, img_center.x - linewidth / 2, img_center.y, + img_center.x + linewidth / 2, img_center.y, COLOR_WHITE, linethickness); + + // drawRectangleI4(bmpBuff.pData, 600 , 400 , 700 , 6, COLOR_GREEN, 1); +} + +/// @brief Ugly implementation. To do : clear from bmp format dependant code +static void draw_Ladder() { + // if (PIXEL_FORMAT_DEFAULT!=PIXEL_FORMAT_I4) + // return; + + Transform_OVERLAY_WIDTH = OVERLAY_WIDTH; + Transform_OVERLAY_HEIGHT = OVERLAY_HEIGHT; + Transform_Pitch = last_pitch / 10; + Transform_Roll = -last_roll / 10; + + int TiltY = -AHI_TiltY; // pixels offset on the vertical, negative value means + // up, this is camera nose-down angle in pixels + // to do, make this in degrees + + const bool horizonInvertPitch = false; + const bool horizonInvertRoll = false; + double horizonWidth = 3; + const int horizonSpacing = 165; //????//pixels per degree 165 + const bool horizonShowLadder = true; + int horizonRange = 80; // total vertical range in degrees + const int horizonStep = 10; //????//degrees per line + const bool show_center_indicator = false; ////m_show_center_indicator; + + const double ladder_stroke_faktor = 0.1; + const int subline_thickness = 1; + + if (OVERLAY_HEIGHT < 900) { // 720p mode + horizonWidth = 2; + horizonRange = 50; + } + + double roll_degree = ((double)last_roll) / 10; + double pitch_degree = ((double)last_pitch) / 10; + + if (horizonInvertRoll == true) { + roll_degree = roll_degree * -1; + } + if (horizonInvertPitch == false) { + pitch_degree = pitch_degree * -1; + } + + const int pos_x = OVERLAY_WIDTH / 2; + const int pos_y = (OVERLAY_HEIGHT / 2) + TiltY; + const int width_ladder = 100 * horizonWidth; + + int px = pos_x - width_ladder / 2; + + if (/*show_center_indicator*/ true) { + + // Line always drawn in the center to have some orientation where the + // center is + int line_w = 100 * horizonWidth * 0.2; + + LineDirect(bmpBuff.pData, OVERLAY_WIDTH, OVERLAY_HEIGHT, px - 20, pos_y - 3, px + 20, + pos_y - 3, COLOR_GRAY_Light, 2); + + LineDirect(bmpBuff.pData, OVERLAY_WIDTH, OVERLAY_HEIGHT, px + width_ladder - 20, pos_y - 3, + px + width_ladder + 20, pos_y - 3, COLOR_GRAY_Light, 2); + } + + int ratio = horizonSpacing; // pixels per degree + int vrange = horizonRange; // total vertical range in degrees + int step = horizonStep; // degrees per line + if (step == 0) + step = 10; // avoid div by 0 + if (ratio == 0) + ratio = 1; // avoid div by 0 + + int m_color = 7; + int i; + int k; + int y; + int n; + int startH; + int stopH; + startH = pitch_degree - vrange / 2; + stopH = pitch_degree + vrange / 2; + if (startH < -90) + startH = -90; + if (stopH > 90) + stopH = 90; + + // painter->setPen(m_color); + int m_color_def = m_color; + for (i = startH / step; i <= stopH / step; i++) { + m_color = m_color_def; + if (i > 0 && i * ratio < 30 && /*showHorizonHeadingLadder*/ true) + i = i + 30 / ratio; + + k = i * step; + y = pos_y - (i - 1.0 * pitch_degree / step) * ratio; + if (horizonShowLadder == true) { + if (i != 0) { + + // fix pitch line wrap around at extreme nose up/down + n = k; // this is the line index number relative to the main + // one. + if (n > 90) { + n = 180 - k; + } + if (n < -90) { + n = -k - 180; + } + if (abs(n) > 20) // pitch higher than 30 degree. + m_color = COLOR_YELLOW; + if (abs(n) > 40) // pitch higher than 30 degree. + m_color = COLOR_RED; + + // left numbers + // painter->setPen(m_color); + // painter->drawText(px-30, y+6, QString::number(n)); + + // right numbers + // painter->drawText((px + width_ladder)+8, y+6, + // QString::number(n)); painter->setPen(m_color); + + if ((i > 0)) { + // Upper ladders + // default to stroke strength of 2 (I think it is pixels) + int stroke_s = 2 * ladder_stroke_faktor; + + // left upper cap + // drawRectangleI4(bmpBuff.pData, px , y , stroke_s , + // width_ladder/24, m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px, y, px, y + width_ladder / 24, m_color, + subline_thickness); // Top side + + // left upper line + // drawRectangleI4(bmpBuff.pData, px , y , width_ladder/3 , + // stroke_s, m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px, y, px + width_ladder / 3, y, m_color, + subline_thickness); // Top side + + // right upper cap + // drawRectangleI4(bmpBuff.pData, px+width_ladder-2 , y , + // px+width_ladder-2 + stroke_s , width_ladder/24, + // m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px + width_ladder - 2, y, px + width_ladder - 2, + y + width_ladder / 24, m_color, + subline_thickness); // Top side + + // right upper line + // drawRectangleI4(bmpBuff.pData, px+width_ladder*2/3 , y , + // width_ladder/3 , stroke_s, m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px + width_ladder * 2 / 3, y, + (px + width_ladder * 2 / 3) + width_ladder / 3 - 1, y, m_color, + subline_thickness); // Top side + + } else if (i < 0) { + // Lower ladders + // default to stroke strength of 2 (I think it is pixels) + + int stroke_s = 2 * ladder_stroke_faktor; + + // left to right + // left lower cap + // drawRectangleI4(bmpBuff.pData, px, y-(width_ladder/24)+2 + // , stroke_s , width_ladder/24, m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px, y - (width_ladder / 24) + 2, px, + y - (width_ladder / 24) + 1 + width_ladder / 24, m_color, + subline_thickness); // Top side + + // 1l + // drawRectangleI4(bmpBuff.pData, px , y , width_ladder/12 , + // stroke_s, m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px, y, px + width_ladder / 12, y, m_color, + subline_thickness); // Top side + + // 2l + // drawRectangleI4(bmpBuff.pData, px+(width_ladder/12)*1.5 , + // y , width_ladder/12 , stroke_s, + // m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px + (width_ladder / 12) * 1.5, y, + px + (width_ladder / 12) * 1.5 + width_ladder / 12, y, m_color, + subline_thickness); // Top side + + // 3l + // drawRectangleI4(bmpBuff.pData, px+(width_ladder/12)*3 , y + // , width_ladder/12 , stroke_s, m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px + (width_ladder / 12) * 3, y, + px + (width_ladder / 12) * 3 + width_ladder / 12, y, m_color, + subline_thickness); // Top side + + // right lower cap + // drawRectangleI4(bmpBuff.pData, px+width_ladder-2 , + // y-(width_ladder/24)+2 , stroke_s , width_ladder/24, + // m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px + width_ladder - 2, y - (width_ladder / 24) + 2, + px + width_ladder - 2, y - (width_ladder / 24) + 1 + width_ladder / 24, + m_color, + subline_thickness); // Top side + + // 1r ///spacing on these might be a bit off + // drawRectangleI4(bmpBuff.pData, px+(width_ladder/12)*8 , y + // , width_ladder/12 , stroke_s, m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px + (width_ladder / 12) * 8, y, + px + (width_ladder / 12) * 8 + width_ladder / 12, y, m_color, + subline_thickness); // Top side + + // 2r ///spacing on these might be a bit off + // drawRectangleI4(bmpBuff.pData, px+(width_ladder/12)*9.5 , + // y , width_ladder/12 , stroke_s, + // m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px + (width_ladder / 12) * 9.5, y, + px + (width_ladder / 12) * 9.5 + width_ladder / 12, y, m_color, + subline_thickness); // Top side + + // 3r ///spacing on these might be a bit off tried a + // decimal here drawRectangleI4(bmpBuff.pData, + // px+(width_ladder*.9166) , y , width_ladder/12 , stroke_s, + // m_color,subline_thickness); + LineTranspose(bmpBuff.pData, px + (width_ladder * .9166), y, + px + (width_ladder * .9166) + width_ladder / 12, y, m_color, + subline_thickness); // Top side + } + } else { // i==0 + // Main AHI Line + // default to stroke strength of 3 - a bit bigger than the non + // center lines + int stroke_s = 4 * ladder_stroke_faktor; + + int rect_height = 5; // Height of the rectangles (as per your original code) + int fragments = 6; + float SpacingK = 0.6; + // int rect_width = (width_ladder*2.5/(fragments + + // (float)SpacingK*fragments)); // Width of a single rectangle + int rect_width = + width_ladder * 2.5 / (fragments); // Width of a single semiline+spacing + + int spacing = rect_width * SpacingK; // Spacing between rectangles + + rect_width = rect_width - spacing; // Length of a small line + // Calculate the starting X position for the first rectangle + int start_x = pos_x - width_ladder * 2.5 / 2; + + // Draw 6 rectangles in a line + for (int i = 0; i < fragments; i++) { + // Calculate the X position for the current rectangle + int rect_x = start_x + i * (rect_width + spacing) + spacing / 2; + + bool isPlaneLevel = + (-2 < last_pitch / 10 && last_pitch / 10 < 2) && (i == 2 || i == 3); + LineTranspose(bmpBuff.pData, rect_x, y, rect_x + rect_width, y, + isPlaneLevel ? COLOR_GREEN : COLOR_WHITE, 3); + } + + int LAST_ROLL = -5; // Example integer value (change as needed) + char buffer[6]; // Enough space for "+/-", two digits, the + // degree symbol, and the null terminator + + // Format the LAST_ROLL value into the buffer with the specified + // format + // %+02d: '+' sign for positive numbers, '0' for leading zero, + // '2' for width. \xB0: ASCII code for the degree symbol. + if (-10 < last_pitch && last_pitch < 10) + sprintf(buffer, "%+0.1f°", -last_pitch / 10.0); + else + sprintf(buffer, "%+02d°", -last_pitch / 10); + + int osd_font_size = 18; #if defined(_x86) || defined(__ROCKCHIP__) - uint32_t color = getcolor(COLOR_YELLOW); - if ((-50 < last_pitch) && (last_pitch <50)) - color = getcolor(COLOR_WHITE); - drawText(buffer, start_x + width_ladder*2.5 - spacing/3, y + osd_font_size/2 - 4, color, osd_font_size, true,1); -#endif - - if (AHI_Enabled==3){//Draw home - uint32_t xHome, yHome; - int home_offset = last_directionToHome - last_heading; - - // Normalize to range [-180, 180] - if (home_offset > 180) { - home_offset -= 360; - } else if (home_offset < -180) { - home_offset += 360; - } - - // home is out of AHI range - if (abs(home_offset)>90){ - if (home_offset<0){ //(left < right){ - xHome=start_x; - } else{ - xHome=start_x+width_ladder*2.5;//Don't go over the pitch digits - } - }else{ - double K = (double)((double)home_offset+90) /180;//this is from 0 to 1 - if (K==0)//just in case - K=1; - xHome = (start_x + (K*((double)width_ladder)*2.5)); - } - if (xHome>(start_x+width_ladder*2.5-40))//Don't go over the pitch digits - xHome=start_x+width_ladder*2.5-40; - - int c=10;//Home(small house) symbol to be shown for INAV - if (font_pages>2)//tha same symbol for betflight - c=17; - //Find the coordinates if the the rectangle in the Font Bitmap - u_int16_t s_left = /*page*/0*current_display_info.font_width; - u_int16_t s_top = current_display_info.font_height * c; - u_int16_t s_width = current_display_info.font_width; - u_int16_t s_height = current_display_info.font_height; - - BITMAP btmp=bitmapFnt; - if (matrix_size>10 && bmpFntSmall.u32Width>0){ - btmp=bmpFntSmall; - s_width=24; - s_height=36; - s_left = 0*s_width; - s_top = s_height * c; - btmp=bmpFntSmall; - } - uint32_t xR, yR; - ApplyTransform(xHome - (s_width/2) , y - s_height, &xR, &yR); - - //xR = (xR + 7) & ~7;//Round up to 8 - xR = (xR + 3) & ~3;//Round up to 4, otherwise I4 bitmap image copy distorts the glyph !!! - - if (xR>0 && xR0 && yRifa_next) - { - if (equals(ifa->ifa_name, "lo")) continue; - if (!ifa->ifa_addr || ifa->ifa_addr->sa_family != AF_PACKET) continue; - if (!ifa->ifa_data) continue; - - struct rtnl_link_stats *stats = ifa->ifa_data; - char b[32]; - sprintf(b, "R:%dKbps S:%dKbps", - (stats->rx_bytes - rxb_l) / 1024, (stats->tx_bytes - txb_l) / 1024); - strcat(out, b); - opos += strlen(b); - rxb_l = stats->rx_bytes; - txb_l = stats->tx_bytes; - break; - } - - freeifaddrs(ifaddr); - } - else if (str[ipos + 1] == 'C') - { - ipos++; - char tmp[6]; - unsigned int cpu[7]; - static unsigned long long cpu_l[7] = {0}; // Stores previous CPU stats for comparison - - //#ifdef __SIGMASTAR__ - FILE *stat = fopen("/proc/stat", "r"); - if (!stat) { - perror("Failed to open /proc/stat"); - return; - } - - // Read CPU statistics from /proc/stat - fscanf(stat, "%s %u %u %u %u %u %u %u", - tmp, &cpu[0], &cpu[1], &cpu[2], &cpu[3], &cpu[4], &cpu[5], &cpu[6]); - fclose(stat); - // #endif - - // Calculate the total time and idle time for the current reading - unsigned long long total_time = cpu[0] + cpu[1] + cpu[2] + cpu[3] + cpu[4] + cpu[5] + cpu[6]; - unsigned long long idle_time = cpu[3] + cpu[4]; // Idle time is the sum of idle and iowait - - // Calculate the total and idle differences since the last check - unsigned long long prev_total_time = cpu_l[0] + cpu_l[1] + cpu_l[2] + cpu_l[3] + cpu_l[4] + cpu_l[5] + cpu_l[6]; - unsigned long long prev_idle_time = cpu_l[3] + cpu_l[4]; - unsigned long long total_diff = total_time - prev_total_time; - unsigned long long idle_diff = idle_time - prev_idle_time; - - // Avoid division by zero if total_diff is too small - float cpu_load = (total_diff == 0) ? 0.0f : 100.0f * (total_diff - idle_diff) / total_diff; - - // Store the current values in cpu_l for the next comparison - for (int i = 0; i < 7; i++) { - cpu_l[i] = cpu[i]; - } - - // Format and append the CPU load percentage to output - char c[25]; - sprintf(c, "%d%%", (int)cpu_load); - strcat(out, c); - opos += strlen(c); - - - }else if (str[ipos + 1] == 'B') - { - ipos++; - unsigned int bitrate; ; - float fps; - char c[25]; -#ifdef __SIGMASTAR__ - FILE *stat = popen("cat /proc/mi_modules/mi_venc/mi_venc0 | grep Fps10s -A 1 | awk 'NR==2 {print $9, $10}'", "r"); - // Sample result : 34.91 14836 - if (stat == NULL) { - sscanf("34.91 14836", "%f %u", &fps, &bitrate); - }else{ - fscanf(stat, "%f %u", &fps, &bitrate); - fclose(stat); - } + uint32_t color = getcolor(COLOR_YELLOW); + if ((-50 < last_pitch) && (last_pitch < 50)) + color = getcolor(COLOR_WHITE); + drawText(buffer, start_x + width_ladder * 2.5 - spacing / 3, + y + osd_font_size / 2 - 4, color, osd_font_size, true, 1); +#endif + + if (AHI_Enabled == 3) { // Draw home + uint32_t xHome, yHome; + int home_offset = last_directionToHome - last_heading; + + // Normalize to range [-180, 180] + if (home_offset > 180) { + home_offset -= 360; + } else if (home_offset < -180) { + home_offset += 360; + } + + // home is out of AHI range + if (abs(home_offset) > 90) { + if (home_offset < 0) { //(left < right){ + xHome = start_x; + } else { + xHome = start_x + width_ladder * 2.5; // Don't go over the + // pitch digits + } + } else { + double K = (double)((double)home_offset + 90) / 180; // this is from 0 to 1 + if (K == 0) // just in case + K = 1; + xHome = (start_x + (K * ((double)width_ladder) * 2.5)); + } + if (xHome > + (start_x + width_ladder * 2.5 - 40)) // Don't go over the pitch digits + xHome = start_x + width_ladder * 2.5 - 40; + + int c = 10; // Home(small house) symbol to be shown for INAV + if (font_pages > 2) // tha same symbol for betflight + c = 17; + // Find the coordinates if the the rectangle in the Font + // Bitmap + u_int16_t s_left = + /*page*/ 0 * current_display_info.font_width; + u_int16_t s_top = current_display_info.font_height * c; + u_int16_t s_width = current_display_info.font_width; + u_int16_t s_height = current_display_info.font_height; + + BITMAP btmp = bitmapFnt; + if (matrix_size > 10 && bmpFntSmall.u32Width > 0) { + btmp = bmpFntSmall; + s_width = 24; + s_height = 36; + s_left = 0 * s_width; + s_top = s_height * c; + btmp = bmpFntSmall; + } + uint32_t xR, yR; + ApplyTransform(xHome - (s_width / 2), y - s_height, &xR, &yR); + + // xR = (xR + 7) & ~7;//Round up to 8 + xR = (xR + 3) & ~3; // Round up to 4, otherwise I4 bitmap + // image copy distorts the glyph !!! + + if (xR > 0 && xR < OVERLAY_WIDTH && yR > 0 && yR < OVERLAY_HEIGHT && + btmp.pData != NULL) { + if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_I4) + copyRectI4(btmp.pData, btmp.u32Width, btmp.u32Height, bmpBuff.pData, + bmpBuff.u32Width, bmpBuff.u32Height, s_left, s_top, s_width, + s_height, xR, yR); + else if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_8888) { + // This is tricky. We copy in the bmp with + // the icons, but they have been already + // painted! + copyRectRGBA8888(btmp.pData, btmp.u32Width, btmp.u32Height, + bmpBuff.pData, bmpBuff.u32Width, bmpBuff.u32Height, s_left, s_top, + s_width, s_height, xR, yR); + // needed since we may have already painted + // the icons + } + } +#if defined(_x86) || defined(__ROCKCHIP__) + Render_rect(bmpBuff.pData, bmpBuff.u32Width, bmpBuff.u32Height, xR, yR, xR, yR, + s_width, s_height); +#endif + } + } + } + } // draw ladder +} + +static int droppedTTL = 0; +static bool first_wfb_read = true; + +void fill(char *str) { + unsigned int rxb_l, txb_l, cpu_l[7]; + char out[280] = ""; + char param = 0; + int ipos = 0, opos = 0; + + while (str[ipos] != 0) { + if (str[ipos] == '\r' || str[ipos] == '\n') + str[ipos] = ' '; + if (str[ipos] != '&') { + strncat(out, str + ipos, 1); + opos++; + } else if (str[ipos + 1] == 'Z') { + ipos++; + struct ifaddrs *ifaddr, *ifa; + if (getifaddrs(&ifaddr) == -1) + continue; + + for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { + if (equals(ifa->ifa_name, "lo")) + continue; + if (!ifa->ifa_addr || ifa->ifa_addr->sa_family != AF_PACKET) + continue; + if (!ifa->ifa_data) + continue; + + struct rtnl_link_stats *stats = ifa->ifa_data; + char b[32]; + sprintf(b, "R:%dKbps S:%dKbps", (stats->rx_bytes - rxb_l) / 1024, + (stats->tx_bytes - txb_l) / 1024); + strcat(out, b); + opos += strlen(b); + rxb_l = stats->rx_bytes; + txb_l = stats->tx_bytes; + break; + } + + freeifaddrs(ifaddr); + } else if (str[ipos + 1] == 'C') { + ipos++; + char tmp[6]; + unsigned int cpu[7]; + static unsigned long long cpu_l[7] = {0}; // Stores previous CPU stats for comparison + + //#ifdef __SIGMASTAR__ + FILE *stat = fopen("/proc/stat", "r"); + if (!stat) { + perror("Failed to open /proc/stat"); + return; + } + + // Read CPU statistics from /proc/stat + fscanf(stat, "%s %u %u %u %u %u %u %u", tmp, &cpu[0], &cpu[1], &cpu[2], &cpu[3], + &cpu[4], &cpu[5], &cpu[6]); + fclose(stat); + // #endif + + // Calculate the total time and idle time for the current reading + unsigned long long total_time = + cpu[0] + cpu[1] + cpu[2] + cpu[3] + cpu[4] + cpu[5] + cpu[6]; + unsigned long long idle_time = + cpu[3] + cpu[4]; // Idle time is the sum of idle and iowait + + // Calculate the total and idle differences since the last check + unsigned long long prev_total_time = + cpu_l[0] + cpu_l[1] + cpu_l[2] + cpu_l[3] + cpu_l[4] + cpu_l[5] + cpu_l[6]; + unsigned long long prev_idle_time = cpu_l[3] + cpu_l[4]; + unsigned long long total_diff = total_time - prev_total_time; + unsigned long long idle_diff = idle_time - prev_idle_time; + + // Avoid division by zero if total_diff is too small + float cpu_load = + (total_diff == 0) ? 0.0f : 100.0f * (total_diff - idle_diff) / total_diff; + + // Store the current values in cpu_l for the next comparison + for (int i = 0; i < 7; i++) { + cpu_l[i] = cpu[i]; + } + + // Format and append the CPU load percentage to output + char c[25]; + sprintf(c, "%d%%", (int)cpu_load); + strcat(out, c); + opos += strlen(c); + + } else if (str[ipos + 1] == 'B') { + ipos++; + unsigned int bitrate; + ; + float fps; + char c[25]; +#ifdef __SIGMASTAR__ + FILE *stat = popen("cat /proc/mi_modules/mi_venc/mi_venc0 | grep Fps10s " + "-A 1 | awk 'NR==2 {print $9, $10}'", + "r"); + // Sample result : 34.91 14836 + if (stat == NULL) { + sscanf("34.91 14836", "%f %u", &fps, &bitrate); + } else { + fscanf(stat, "%f %u", &fps, &bitrate); + fclose(stat); + } #else - sscanf("34.91 14836", "%f %u", &fps, &bitrate); -#endif - // Convert kilobits to megabits - float megabits = bitrate / 1000.0; - - // Print the value with one digit after the decimal point - sprintf(c, "%.1fMb FPS:%d", megabits,(unsigned int)fps); - - strcat(out, c); - opos += strlen(c); - - }else if (str[ipos + 1] == 'p') - { - ipos++; - char c[80]; - monitor_wfb=true; - int dropped = SendWfbLogToGround(); - if (first_wfb_read){ - dropped=0; - droppedTTL=0; - } - - first_wfb_read=false; - droppedTTL+=dropped; - // Print the value with one digit after the decimal point - if (dropped==0) - sprintf(c, "d=%d", droppedTTL); - else{ - sprintf(c, "+ %d ! Dropped=%d ", dropped,droppedTTL); - if (verbose) - printf("WFB_NG Dropped UDP packets: %d\r\n",dropped); - } - strcat(out, c); - opos += strlen(c); - } - - else if (str[ipos + 1] == 't') - { - ipos++; - char s[64]; - time_t t = time(NULL); - struct tm *tm = localtime(&t); - strftime(s, 64, timefmt, tm); - strcat(out, s); - opos += strlen(s); - } - else if (str[ipos + 1] == 'T') - { - ipos++; + sscanf("34.91 14836", "%f %u", &fps, &bitrate); +#endif + // Convert kilobits to megabits + float megabits = bitrate / 1000.0; + + // Print the value with one digit after the decimal point + sprintf(c, "%.1fMb FPS:%d", megabits, (unsigned int)fps); + + strcat(out, c); + opos += strlen(c); + + } else if (str[ipos + 1] == 'p') { + ipos++; + char c[80]; + monitor_wfb = true; + int dropped = SendWfbLogToGround(); + if (first_wfb_read) { + dropped = 0; + droppedTTL = 0; + } + + first_wfb_read = false; + droppedTTL += dropped; + // Print the value with one digit after the decimal point + if (dropped == 0) + sprintf(c, "d=%d", droppedTTL); + else { + sprintf(c, "+ %d ! Dropped=%d ", dropped, droppedTTL); + if (verbose) + printf("WFB_NG Dropped UDP packets: %d\r\n", dropped); + } + strcat(out, c); + opos += strlen(c); + } + + else if (str[ipos + 1] == 't') { + ipos++; + char s[64]; + time_t t = time(NULL); + struct tm *tm = localtime(&t); + strftime(s, 64, timefmt, tm); + strcat(out, s); + opos += strlen(s); + } else if (str[ipos + 1] == 'T') { + ipos++; #ifdef __SIGMASTAR__ - unsigned short temp = GetTempSigmaStar();//1370 * (400 - ((unsigned short*)io_map)[0x2918 >> 1]) / 1000.0f + 27; + unsigned short temp = GetTempSigmaStar(); // 1370 * (400 - ((unsigned + // short*)io_map)[0x2918 + // >> 1]) / 1000.0f + 27; #elif defined(__16CV300__) - unsigned short temp = 0;// (((unsigned short*)io_map)[0x300A4 >> 1] - 125) / 806.0f * 165.0f - 40; + unsigned short temp = 0; // (((unsigned short*)io_map)[0x300A4 >> 1] + // - 125) / 806.0f * 165.0f - 40; #else - unsigned short temp = 0;//;(((unsigned short*)io_map)[0x280BC >> 1] - 117) / 798.0f * 165.0f - 40; + unsigned short temp = 0; //;(((unsigned short*)io_map)[0x280BC >> 1] + //- 117) / 798.0f * 165.0f - 40; #endif - char t[8]; - sprintf(t, "%d", temp); - strcat(out, t); - opos += strlen(t); - }else if (str[ipos + 1] == 'W'){//get WiFi 8812EU temp - ipos++; - char c[18]; - sprintf(c, "%d", GetTXTemp()); - strcat(out, c); - opos += strlen(c); - - } else if (str[ipos + 1] == 'F' && isdigit(str[ipos + 2]) && isdigit(str[ipos + 3])) { - if (!DrawOSD){ - strncat(out, str + ipos, 1); - opos++; - }else{ - // Extract the two digits after $F as an integer - char numStr[3] = {str[ipos + 2], str[ipos + 3], '\0'}; - int value = atoi(numStr); - //Ugly - osds[FULL_OVERLAY_ID].size=value; - // Skip the $Fxx part in the input string - ipos += 3; - } - } else if (str[ipos + 1] == 'L' && isdigit(str[ipos + 2]) && isdigit(str[ipos + 3])) { - if (!DrawOSD){//we need to keep &Lxx - strncat(out, str + ipos, 1); - opos++; - }else{ - // Extract the two digits after $F as an integer - char numStr[3] = {str[ipos + 2], str[ipos + 3], '\0'}; - int value = atoi(numStr); - //Ugly - msg_layout=value%10; - msg_colour=value/10; - if (msg_colour==0) - msg_colour=COLOR_WHITE; - else if (msg_colour==1) - msg_colour=COLOR_BLACK; - else - // 1=Red, Green, Blue, Yellow ,Magenta, 6=Cyan - msg_colour--; - - - ipos += 3; - } - } - else if (str[ipos + 1] == '&') { - ipos++; - strcat(out, "&"); - opos++; - } - ipos++; - } - strncpy(str, out, 180); + char t[8]; + sprintf(t, "%d", temp); + strcat(out, t); + opos += strlen(t); + } else if (str[ipos + 1] == 'W') { // get WiFi 8812EU temp + ipos++; + char c[18]; + sprintf(c, "%d", GetTXTemp()); + strcat(out, c); + opos += strlen(c); + + } else if (str[ipos + 1] == 'F' && isdigit(str[ipos + 2]) && isdigit(str[ipos + 3])) { + if (!DrawOSD) { + strncat(out, str + ipos, 1); + opos++; + } else { + // Extract the two digits after $F as an integer + char numStr[3] = {str[ipos + 2], str[ipos + 3], '\0'}; + int value = atoi(numStr); + // Ugly + osds[FULL_OVERLAY_ID].size = value; + // Skip the $Fxx part in the input string + ipos += 3; + } + } else if (str[ipos + 1] == 'L' && isdigit(str[ipos + 2]) && isdigit(str[ipos + 3])) { + if (!DrawOSD) { // we need to keep &Lxx + strncat(out, str + ipos, 1); + opos++; + } else { + // Extract the two digits after $F as an integer + char numStr[3] = {str[ipos + 2], str[ipos + 3], '\0'}; + int value = atoi(numStr); + // Ugly + msg_layout = value % 10; + msg_colour = value / 10; + if (msg_colour == 0) + msg_colour = COLOR_WHITE; + else if (msg_colour == 1) + msg_colour = COLOR_BLACK; + else + // 1=Red, Green, Blue, Yellow ,Magenta, 6=Cyan + msg_colour--; + + ipos += 3; + } + } else if (str[ipos + 1] == '&') { + ipos++; + strcat(out, "&"); + opos++; + } + ipos++; + } + strncpy(str, out, 180); } -#ifdef _x86 -static char FECFile[128]= "./MSPOSD.msg"; +#ifdef _x86 +static char FECFile[128] = "./MSPOSD.msg"; #else -static char FECFile[128]= "/tmp/MSPOSD.msg"; -#endif - - -void SetOSDMsg(char* msg){ - - - // Open the file for writing - FILE *file = fopen(FECFile, "w"); - if (file == NULL) - perror("Error opening file"); - else{ - fprintf(file, "%s", msg); - fclose(file); - } - - //this will send the message to ground even if no data is available on the uart -/* - if (!DrawOSD && out_sock>0){//send the message to the ground as msp message - static uint8_t msg_buffer[256]; - static uint8_t payload_buffer[256]; - int msglen = strlen(&msg[0]); - payload_buffer[0]=MSP_DISPLAYPORT_INFO_MSG; - memcpy(&payload_buffer[1],&msg[0], msglen+1); //include the 0 for string ending - construct_msp_command(msg_buffer, MSP_CMD_DISPLAYPORT, &payload_buffer[0], 80, MSP_INBOUND); - sendto(out_sock, msg_buffer,100 , 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - printf("Sent text msg : %s\r\n",msg); - } -*/ -} +static char FECFile[128] = "/tmp/MSPOSD.msg"; +#endif +void SetOSDMsg(char *msg) { + + // Open the file for writing + FILE *file = fopen(FECFile, "w"); + if (file == NULL) + perror("Error opening file"); + else { + fprintf(file, "%s", msg); + fclose(file); + } + + // this will send the message to ground even if no data is available on the + // uart + /* + if (!DrawOSD && out_sock>0){//send the message to the ground as msp + message static uint8_t msg_buffer[256]; static uint8_t + payload_buffer[256]; int msglen = strlen(&msg[0]); + payload_buffer[0]=MSP_DISPLAYPORT_INFO_MSG; + memcpy(&payload_buffer[1],&msg[0], msglen+1); //include the 0 for + string ending construct_msp_command(msg_buffer, MSP_CMD_DISPLAYPORT, + &payload_buffer[0], 80, MSP_INBOUND); sendto(out_sock, msg_buffer,100 , + 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); printf("Sent text msg : + %s\r\n",msg); + } + */ +} uint64_t LastOSDMsgParsed = 0; BITMAP bitmapText; void print_string_as_hex(const char *str) { - while (*str) { - printf("%02X ", (unsigned char)*str); - str++; - } - printf("\n"); + while (*str) { + printf("%02X ", (unsigned char)*str); + str++; + } + printf("\n"); } + void remove_carriage_returns(char *out) { - int j = 0; - for (int i = 0; out[i] != '\0'; i++) - if (out[i] != '\r' && out[i] != '\n') - out[j++] = out[i]; // Copy non-\r characters + int j = 0; + for (int i = 0; out[i] != '\0'; i++) + if (out[i] != '\r' && out[i] != '\n') + out[j++] = out[i]; // Copy non-\r characters - out[j] = '\0'; // Null-terminate the modified string + out[j] = '\0'; // Null-terminate the modified string } char osdmsg[180]; -bool DrawTextOnOSDBitmap(char* msg){ - char *font; -#ifdef _x86 - asprintf(&font, "fonts/%s.ttf", osds[FULL_OVERLAY_ID].font); +bool DrawTextOnOSDBitmap(char *msg) { + char *font; +#ifdef _x86 + asprintf(&font, "fonts/%s.ttf", osds[FULL_OVERLAY_ID].font); #else - asprintf(&font, "/usr/share/fonts/truetype/%s.ttf", osds[FULL_OVERLAY_ID].font); - -#endif - - if (!osd_msg_enabled){ - if ((get_time_ms() - LastOSDMsgParsed)<1000){//If msgs are not needed, do not check for file every frame, but once per second - //printf("skipped msg osd check\n"); - return false; - } - LastOSDMsgParsed = get_time_ms();//Do not parse and read variable too often - } - bool res=false; - int result; - - char out[180]; - size_t bytesRead=0; - FILE *file=NULL; - if (msg == NULL || strlen(msg)==0){ - file = fopen(FECFile, "rb"); - if (file != NULL){// New file, will have to render the font - bytesRead = fread(osdmsg, 1, 179 /*max buffer*/, file); //with files - fclose(file); - remove(FECFile); - osdmsg[bytesRead]=0;//end of string - osds[FULL_OVERLAY_ID].updt = 1; - osd_msg_enabled=true; - } - if (osd_msg_enabled==false) - return false; - }else - strcpy(osdmsg, msg); - - uint64_t timems=get_time_ms(); - if(osds[FULL_OVERLAY_ID].updt == 1 || - (timems - LastOSDMsgParsed) > 1000){//Update varaibles in Message and render the text as BMP - LastOSDMsgParsed= timems;//Do not parse and read variable too often - - strcpy(out, osdmsg); - //sprintf(out,"$M $B Size: %d",(int)osds[FULL_OVERLAY_ID].size); - //osds[FULL_OVERLAY_ID].size=18+((cntr/10)%10);//TEST - if (strstr(out, "&")){ - fill(out); - osds[FULL_OVERLAY_ID].updt = 0;// - } - - -//rendering text on goke makes the program crash?! Need to fix. -// so we simply send it to the ground - - if (!DrawOSD && out_sock>0){//send the line to the ground - static uint8_t msg_buffer[256]; - static uint8_t payload_buffer[256]; - out[79]=0;//just in case - int msglen = strlen(&out[0]); - - payload_buffer[0]=MSP_DISPLAYPORT_INFO_MSG; - memcpy(&payload_buffer[1],&out[0], msglen+1); //include the 0 for string ending - construct_msp_command(msg_buffer, MSP_CMD_DISPLAYPORT, &payload_buffer[0], 80, MSP_INBOUND); - sendto(out_sock, msg_buffer,100 , 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - - //printf("Sent text msg : %s\r\n",out); - return false; - } - - if (access(font, F_OK)) //no font file - return false; - - if ((osds[FULL_OVERLAY_ID].size < 5.0) || (osds[FULL_OVERLAY_ID].size > 99.0)) - osds[FULL_OVERLAY_ID].size = 20.0; - - //print_string_as_hex(out); - //remove_carriage_returns(out); - - RECT rect = measure_text(font, osds[FULL_OVERLAY_ID].size, out); - - if (bitmapText.pData!=NULL){ - bitmapText.pData=NULL; - free(bitmapText.pData); - } - - bitmapText = raster_text(font, osds[FULL_OVERLAY_ID].size, out);//allocates new bitmap, Bus error on goke ?! - - - if (PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_I4){//convert to I4 and copy over the main overlay - - uint8_t* destBitmap = (uint8_t*)malloc(bitmapText.u32Height*getRowStride(bitmapText.u32Width , PIXEL_FORMAT_BitsPerPixel)); - - convertBitmap1555ToI4(bitmapText.pData, bitmapText.u32Width , bitmapText.u32Height, destBitmap, msg_colour); - - free(bitmapText.pData);//free ARGB1555 bitmap - //This is inefficient, we use 4 times more memory, but the buffer size is small - bitmapText.pData=(void *)destBitmap;//replace it with I4, same size - bitmapText.enPixelFormat = PIXEL_FORMAT_DEFAULT ;//E_MI_RGN_PIXEL_FORMAT_I8; //I8 - } - if (PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_1555){//convert to I4 and copy over the main overlay - - uint8_t* destBitmap = (uint8_t*)malloc(bitmapText.u32Height*getRowStride(bitmapText.u32Width , PIXEL_FORMAT_BitsPerPixel)); - - //convertBitmap1555ToARGB1555(bitmapText.pData, bitmapText.u32Width , bitmapText.u32Height, destBitmap, msg_colour); - memcpy(destBitmap,bitmapText.pData,bitmapText.u32Height*getRowStride(bitmapText.u32Width , PIXEL_FORMAT_BitsPerPixel)); - free(bitmapText.pData);//free ARGB1555 bitmap - //This is inefficient, we use 4 times more memory, but the buffer size is small - bitmapText.pData=(void *)destBitmap;//replace it with I4, same size - bitmapText.enPixelFormat = PIXEL_FORMAT_DEFAULT ;//E_MI_RGN_PIXEL_FORMAT_I8; //I8 - } - - } - - int posX=5, posY=5; - - if (msg_layout%4==0)//upper left - posX=4; - if (msg_layout%4==1)//upper center - posX=(bmpBuff.u32Width - bitmapText.u32Width) /2; - if (msg_layout%4==2)//upper right - posX=(bmpBuff.u32Width - bitmapText.u32Width) -2; - if (msg_layout%4==3)//moving - posX=20 + ((timems/16)%(bmpBuff.u32Width - bitmapText.u32Width - 40))& ~1; - posY=(msg_layout/4)==0? 0 : (bmpBuff.u32Height - bitmapText.u32Height) - 2; - - if (bitmapText.pData!=NULL && bitmapText.enPixelFormat == PIXEL_FORMAT_I4){ - copyRectI4(bitmapText.pData,bitmapText.u32Width,bitmapText.u32Height, - bmpBuff.pData,bmpBuff.u32Width, bmpBuff.u32Height, - //0,0,bitmapText.u32Width,bitmapText.u32Height, - 0,0,bitmapText.u32Width ,bitmapText.u32Height, - posX,posY); - } - - if (bitmapText.pData!=NULL && bitmapText.enPixelFormat == PIXEL_FORMAT_1555){ - copyRectARGB1555(bitmapText.pData,bitmapText.u32Width,bitmapText.u32Height, - bmpBuff.pData,bmpBuff.u32Width, bmpBuff.u32Height, - //0,0,bitmapText.u32Width,bitmapText.u32Height, - 0,0,bitmapText.u32Width ,bitmapText.u32Height, - posX,posY); - } - - return true; + asprintf(&font, "/usr/share/fonts/truetype/%s.ttf", osds[FULL_OVERLAY_ID].font); +#endif + + if (!osd_msg_enabled) { + if ((get_time_ms() - LastOSDMsgParsed) < 1000) { // If msgs are not needed, do not check for + // file every frame, but once per second + // printf("skipped msg osd check\n"); + return false; + } + LastOSDMsgParsed = get_time_ms(); // Do not parse and read variable too + // often + } + bool res = false; + int result; + + char out[180]; + size_t bytesRead = 0; + FILE *file = NULL; + if (msg == NULL || strlen(msg) == 0) { + file = fopen(FECFile, "rb"); + if (file != NULL) { // New file, will have to render the font + bytesRead = fread(osdmsg, 1, 179 /*max buffer*/, file); // with files + fclose(file); + remove(FECFile); + osdmsg[bytesRead] = 0; // end of string + osds[FULL_OVERLAY_ID].updt = 1; + osd_msg_enabled = true; + } + if (osd_msg_enabled == false) + return false; + } else + strcpy(osdmsg, msg); + + uint64_t timems = get_time_ms(); + if (osds[FULL_OVERLAY_ID].updt == 1 || + (timems - LastOSDMsgParsed) > + 1000) { // Update varaibles in Message and render the text as BMP + LastOSDMsgParsed = timems; // Do not parse and read variable too often + + strcpy(out, osdmsg); + // sprintf(out,"$M $B Size: %d",(int)osds[FULL_OVERLAY_ID].size); + // osds[FULL_OVERLAY_ID].size=18+((cntr/10)%10);//TEST + if (strstr(out, "&")) { + fill(out); + osds[FULL_OVERLAY_ID].updt = 0; // + } + + // rendering text on goke makes the program crash?! Need to fix. + // so we simply send it to the ground + + if (!DrawOSD && out_sock > 0) { // send the line to the ground + static uint8_t msg_buffer[256]; + static uint8_t payload_buffer[256]; + out[79] = 0; // just in case + int msglen = strlen(&out[0]); + + payload_buffer[0] = MSP_DISPLAYPORT_INFO_MSG; + memcpy(&payload_buffer[1], &out[0], + msglen + 1); // include the 0 for string ending + construct_msp_command( + msg_buffer, MSP_CMD_DISPLAYPORT, &payload_buffer[0], 80, MSP_INBOUND); + sendto(out_sock, msg_buffer, 100, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); + + // printf("Sent text msg : %s\r\n",out); + return false; + } + + if (access(font, F_OK)) // no font file + return false; + + if ((osds[FULL_OVERLAY_ID].size < 5.0) || (osds[FULL_OVERLAY_ID].size > 99.0)) + osds[FULL_OVERLAY_ID].size = 20.0; + + // print_string_as_hex(out); + // remove_carriage_returns(out); + + RECT rect = measure_text(font, osds[FULL_OVERLAY_ID].size, out); + + if (bitmapText.pData != NULL) { + bitmapText.pData = NULL; + free(bitmapText.pData); + } + + bitmapText = raster_text(font, osds[FULL_OVERLAY_ID].size, + out); // allocates new bitmap, Bus error on goke ?! + + if (PIXEL_FORMAT_DEFAULT == + PIXEL_FORMAT_I4) { // convert to I4 and copy over the main overlay + + uint8_t *destBitmap = + (uint8_t *)malloc(bitmapText.u32Height * + getRowStride(bitmapText.u32Width, PIXEL_FORMAT_BitsPerPixel)); + + convertBitmap1555ToI4(bitmapText.pData, bitmapText.u32Width, bitmapText.u32Height, + destBitmap, msg_colour); + + free(bitmapText.pData); // free ARGB1555 bitmap + // This is inefficient, we use 4 times more memory, but the buffer + // size is small + bitmapText.pData = (void *)destBitmap; // replace it with I4, same size + bitmapText.enPixelFormat = PIXEL_FORMAT_DEFAULT; // E_MI_RGN_PIXEL_FORMAT_I8; //I8 + } + if (PIXEL_FORMAT_DEFAULT == + PIXEL_FORMAT_1555) { // convert to I4 and copy over the main overlay + + uint8_t *destBitmap = + (uint8_t *)malloc(bitmapText.u32Height * + getRowStride(bitmapText.u32Width, PIXEL_FORMAT_BitsPerPixel)); + + // convertBitmap1555ToARGB1555(bitmapText.pData, bitmapText.u32Width + // , bitmapText.u32Height, destBitmap, msg_colour); + memcpy(destBitmap, bitmapText.pData, + bitmapText.u32Height * + getRowStride(bitmapText.u32Width, PIXEL_FORMAT_BitsPerPixel)); + free(bitmapText.pData); // free ARGB1555 bitmap + // This is inefficient, we use 4 times more memory, but the buffer + // size is small + bitmapText.pData = (void *)destBitmap; // replace it with I4, same size + bitmapText.enPixelFormat = PIXEL_FORMAT_DEFAULT; // E_MI_RGN_PIXEL_FORMAT_I8; //I8 + } + } + + int posX = 5, posY = 5; + + if (msg_layout % 4 == 0) // upper left + posX = 4; + if (msg_layout % 4 == 1) // upper center + posX = (bmpBuff.u32Width - bitmapText.u32Width) / 2; + if (msg_layout % 4 == 2) // upper right + posX = (bmpBuff.u32Width - bitmapText.u32Width) - 2; + if (msg_layout % 4 == 3) // moving + posX = 20 + ((timems / 16) % (bmpBuff.u32Width - bitmapText.u32Width - 40)) & ~1; + posY = (msg_layout / 4) == 0 ? 0 : (bmpBuff.u32Height - bitmapText.u32Height) - 2; + + if (bitmapText.pData != NULL && bitmapText.enPixelFormat == PIXEL_FORMAT_I4) { + copyRectI4(bitmapText.pData, bitmapText.u32Width, bitmapText.u32Height, bmpBuff.pData, + bmpBuff.u32Width, bmpBuff.u32Height, + // 0,0,bitmapText.u32Width,bitmapText.u32Height, + 0, 0, bitmapText.u32Width, bitmapText.u32Height, posX, posY); + } + + if (bitmapText.pData != NULL && bitmapText.enPixelFormat == PIXEL_FORMAT_1555) { + copyRectARGB1555(bitmapText.pData, bitmapText.u32Width, bitmapText.u32Height, bmpBuff.pData, + bmpBuff.u32Width, bmpBuff.u32Height, + // 0,0,bitmapText.u32Width,bitmapText.u32Height, + 0, 0, bitmapText.u32Width, bitmapText.u32Height, posX, posY); + } + + return true; } - - -/// @brief This will try to calculate the position for a small 720p icon on a 1080p screen. -/// @param fnt -/// @param s_left -/// @param s_top -/// @param s_width -/// @param s_height -/// @param d_x -/// @param d_y -/// @param x -/// @param y -/// @param c -/// @param page -/// @return -bool Convert2SmallGlyph(BITMAP *fnt , u_int16_t *s_left, u_int16_t *s_top, u_int16_t *s_width, u_int16_t * s_height, u_int16_t *d_x, u_int16_t * d_y, - int x, int y,int c, int page){ - - - int font_width=24; - int font_height=36; - - if ((y>1 && y<18 && y!=9 & y!=10) && (x < 20 || x > 32)){// Row 0,1 and 18,19 will be normal height - - *fnt=bmpFntSmall; - *s_left = page*font_width; - *s_top = font_height * c; - *s_width=font_width; - *s_height=font_height; - - if (x>32){//right align - *d_x = 52 * 36 - ((52-x) * font_width); - }else - *d_x= x * font_width ; - - if (y>10)//bottom align - *d_y= 20 * 54 - (2*(54-36)) - ((20-y) * font_height); - else - *d_y= (2*(54-36)) + y * font_height; //offset for the first 2 lines that are normal height - - return true; - } - - return false; +/// @brief This will try to calculate the position for a small 720p icon on a +/// 1080p screen. +/// @param fnt +/// @param s_left +/// @param s_top +/// @param s_width +/// @param s_height +/// @param d_x +/// @param d_y +/// @param x +/// @param y +/// @param c +/// @param page +/// @return +bool Convert2SmallGlyph(BITMAP *fnt, u_int16_t *s_left, u_int16_t *s_top, u_int16_t *s_width, + u_int16_t *s_height, u_int16_t *d_x, u_int16_t *d_y, int x, int y, int c, int page) { + + int font_width = 24; + int font_height = 36; + + if ((y > 1 && y < 18 && y != 9 & y != 10) && + (x < 20 || x > 32)) { // Row 0,1 and 18,19 will be normal height + + *fnt = bmpFntSmall; + *s_left = page * font_width; + *s_top = font_height * c; + *s_width = font_width; + *s_height = font_height; + + if (x > 32) { // right align + *d_x = 52 * 36 - ((52 - x) * font_width); + } else + *d_x = x * font_width; + + if (y > 10) // bottom align + *d_y = 20 * 54 - (2 * (54 - 36)) - ((20 - y) * font_height); + else + *d_y = (2 * (54 - 36)) + y * font_height; // offset for the first 2 lines + // that are normal height + + return true; + } + + return false; } -//Not needed, but somehow parsing DrawString in InjectChars sometimes does not work. -static bool ReplaceWidgets_Slow(int* x, int* y){ - +// Not needed, but somehow parsing DrawString in InjectChars sometimes does not +// work. +static bool ReplaceWidgets_Slow(int *x, int *y) { + #if defined(_x86) || defined(__ROCKCHIP__) - if (character_map[*x][*y]=='!' && character_map[*x+1][*y]=='R' && character_map[*x+2][*y]=='C' && character_map[*x+3][*y]=='!'){ - RCWidgetX = *x *current_display_info.font_width; - RCWidgetY = current_display_info.font_height * *y; - *x=*x+3;//Skip this text - return true; - } -#endif - - if ( character_map[*x][*y]=='!' && character_map[*x+1][*y]=='T' && character_map[*x+2][*y]=='M' && character_map[*x+3][*y]=='P'&& character_map[*x+4][*y]=='!'){ - int temp = 99; -#if __SIGMASTAR__ - temp = GetTempSigmaStar(); -#else - temp = last_board_temp; -#endif - if (temp<0) - temp=99; - if (font_pages==2){//inav symbols - character_map[*x][*y] = 199;//10748/54=199 - character_map[*x+3][*y] = 11;//degree - }else{//betaflight symbols - character_map[*x][*y] = 123;//6590/54=122 - character_map[*x+3][*y] = 14;//degree - } - - character_map[*x+1][*y]= 48 + temp/10; - character_map[*x+2][*y]= 48 + temp%10; - - character_map[*x+4][*y] = 0;//degree - //*x=*x+4;//Skip this text - return false;//need to render them - } - //WIFI card Temp - if ( character_map[*x][*y]=='!' && character_map[*x+1][*y]=='T' && character_map[*x+2][*y]=='M' && character_map[*x+3][*y]=='W'&& character_map[*x+4][*y]=='!'){ - int temp = 99; -#if __SIGMASTAR__ - temp = GetTXTemp(); -#else - temp = last_board_temp; -#endif - if (temp<0) - temp=99; - if (font_pages==2){//inav symbols - character_map[*x][*y] = 196;//10748/54=199 Thermometer symbol - character_map[*x+3][*y] = 11;//degree - }else{ //betaflight symbols - character_map[*x][*y] = 122;//6590/54=122 - character_map[*x+3][*y] = 14;//degree - } - - character_map[*x+1][*y]=48 + temp/10; - character_map[*x+2][*y]=48 + temp%10; - character_map[*x+4][*y] = 0;//degree - //*x=*x+4;//Skip this text - return false;//need to render them - } - - - return false; + if (character_map[*x][*y] == '!' && character_map[*x + 1][*y] == 'R' && + character_map[*x + 2][*y] == 'C' && character_map[*x + 3][*y] == '!') { + RCWidgetX = *x * current_display_info.font_width; + RCWidgetY = current_display_info.font_height * *y; + *x = *x + 3; // Skip this text + return true; + } +#endif + + if (character_map[*x][*y] == '!' && character_map[*x + 1][*y] == 'T' && + character_map[*x + 2][*y] == 'M' && character_map[*x + 3][*y] == 'P' && + character_map[*x + 4][*y] == '!') { + int temp = 99; +#if __SIGMASTAR__ + temp = GetTempSigmaStar(); +#else + temp = last_board_temp; +#endif + if (temp < 0) + temp = 99; + if (font_pages == 2) { // inav symbols + character_map[*x][*y] = 199; // 10748/54=199 + character_map[*x + 3][*y] = 11; // degree + } else { // betaflight symbols + character_map[*x][*y] = 123; // 6590/54=122 + character_map[*x + 3][*y] = 14; // degree + } + + character_map[*x + 1][*y] = 48 + temp / 10; + character_map[*x + 2][*y] = 48 + temp % 10; + + character_map[*x + 4][*y] = 0; // degree + //*x=*x+4;//Skip this text + return false; // need to render them + } + // WIFI card Temp + if (character_map[*x][*y] == '!' && character_map[*x + 1][*y] == 'T' && + character_map[*x + 2][*y] == 'M' && character_map[*x + 3][*y] == 'W' && + character_map[*x + 4][*y] == '!') { + int temp = 99; +#if __SIGMASTAR__ + temp = GetTXTemp(); +#else + temp = last_board_temp; +#endif + if (temp < 0) + temp = 99; + if (font_pages == 2) { // inav symbols + character_map[*x][*y] = 196; // 10748/54=199 Thermometer symbol + character_map[*x + 3][*y] = 11; // degree + } else { // betaflight symbols + character_map[*x][*y] = 122; // 6590/54=122 + character_map[*x + 3][*y] = 14; // degree + } + + character_map[*x + 1][*y] = 48 + temp / 10; + character_map[*x + 2][*y] = 48 + temp % 10; + character_map[*x + 4][*y] = 0; // degree + //*x=*x+4;//Skip this text + return false; // need to render them + } + + return false; } -static void draw_screenBMP(){ - uint64_t step2=0; - if (cntr++<0 )//skip in the beginning to show to font preview - return ; - - if ( !DrawOSD && (get_time_ms() - LastDrawn ) < 200)//No need to redraw text on screen so often, lets keep low CPU load - return ; - - if ( (get_time_ms() - LastDrawn ) < MinTimeBetweenScreenRefresh){//Set some delay to keep CPU load low - stat_skipped_frames++; - return ; - } - - if ( (get_time_ms() - LastCleared ) < 2){ - //at least 2ms to reload some data after clearscreen, otherwise the screen will blink? - //but if there is too few chars to show we may never render it - //printf("%lu DrawSkipped after clear LastDrawn:%lu | %lu%\r\n",(uint32_t)get_time_ms()%10000, (uint32_t)LastDrawn%10000 , (uint32_t) LastCleared%10000); - //return ; - } - - LastDrawn= get_time_ms(); - - if (bmpBuff.pData==NULL){ - - bmpBuff.enPixelFormat=PIXEL_FORMAT_DEFAULT; - bmpBuff.u32Width= OVERLAY_WIDTH; //current_display_info.font_width * current_display_info.char_width; - bmpBuff.u32Height = OVERLAY_HEIGHT;//current_display_info.font_height * current_display_info.char_height; - //bmpBuff.pData = malloc( bmpBuff.u32Height * bmpBuff.u32Width / 8); - if (useDirectBMPBuffer){ - bmpBuff.pData = get_directBMP(osds[FULL_OVERLAY_ID].hand); - //clear the image, since it contains the last one - memset(bmpBuff.pData, PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_I4 ? 0xFF : 0x00 , bmpBuff.u32Height * getRowStride(bmpBuff.u32Width , PIXEL_FORMAT_BitsPerPixel)); - }else - bmpBuff.pData = malloc( bmpBuff.u32Height * getRowStride(bmpBuff.u32Width , PIXEL_FORMAT_BitsPerPixel)); - - }else - bmpBuff.pData = memset(bmpBuff.pData, PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_I4 ? 0xFF : 0x00 , bmpBuff.u32Height * getRowStride(bmpBuff.u32Width , PIXEL_FORMAT_BitsPerPixel)); - //bmpBuff.pData = memset(bmpBuff.pData, 0xFF , bmpBuff.u32Height * getRowStride(bmpBuff.u32Width , PIXEL_FORMAT_BitsPerPixel)); - - bmpBuff.enPixelFormat = PIXEL_FORMAT_DEFAULT;// PIXEL_FORMAT_DEFAULT ;//PIXEL_FORMAT_1555; - - if (DrawOSD){//If we only need message without icons - - bool try_smaller_font=false; - for (int y = 0; y < current_display_info.char_height; y++){ - - for (int x = 0; x < current_display_info.char_width; x++){ - - if (AbortNow){//There is request to close app, do not copy to buffer since it may be disposed already. - printf("Drawing aborted! \r\n"); - return; - } - - uint16_t c = character_map[x][y]; - - //if (ReplaceWidgets_Slow(&x,&y)) // Logic moved to InjectChars - // continue; - - if (c != 0 && bitmapFnt.pData!=NULL){//If there is now font, no drawing - uint8_t page = 0; - if (c > 255) { - page = (c >> 8) & 0x03; - c = c & 0xFF; - } - - //Find the coordinates if the the rectangle in the Font Bitmap - u_int16_t s_left = page*current_display_info.font_width; - u_int16_t s_top = current_display_info.font_height * c; - u_int16_t s_width = current_display_info.font_width; - u_int16_t s_height = current_display_info.font_height; - //the location in the screen bmp where we will place the character glyph - u_int16_t d_x=x * current_display_info.font_width + X_OFFSET; - u_int16_t d_y=y * current_display_info.font_height; - BITMAP fnt=bitmapFnt; - - if (matrix_size>10 && bmpFntSmall.u32Width>0 && try_smaller_font || y==0) - Convert2SmallGlyph(&fnt, &s_left,&s_top,&s_width,&s_height, &d_x, &d_y, x,y, c, page); - - if (y==0)//If there is no symbol on first line, assume this is statisctics screen. - try_smaller_font=true; - - //if (cntr<40) - // printf("Using direct canvas memory mode! size:%d:%d stride:\r\n ",bmpBuff.u32Width,bmpBuff.u32Height,getRowStride(bmpBuff.u32Width , PIXEL_FORMAT_BitsPerPixel)); - if (PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_1555) - copyRectARGB1555(fnt.pData,fnt.u32Width,fnt.u32Height, - bmpBuff.pData,bmpBuff.u32Width, bmpBuff.u32Height, - s_left,s_top,s_width,s_height, - d_x,d_y); - else if (PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_I4) - copyRectI4(fnt.pData,fnt.u32Width,fnt.u32Height, - bmpBuff.pData,bmpBuff.u32Width, bmpBuff.u32Height, - s_left,s_top,s_width,s_height, - d_x,d_y); - else if (PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_8888) - copyRectRGBA8888(fnt.pData,fnt.u32Width,fnt.u32Height, - bmpBuff.pData,bmpBuff.u32Width, bmpBuff.u32Height, - s_left,s_top,s_width,s_height, - d_x,d_y); - else - copyRectI8(fnt.pData,fnt.u32Width,fnt.u32Height, - bmpBuff.pData,bmpBuff.u32Width, bmpBuff.u32Height, - s_left,s_top,s_width,s_height, - d_x,d_y); - - - }else{ - } - } - } - - step2=get_time_ms(); +static void draw_screenBMP() { + uint64_t step2 = 0; + if (cntr++ < 0) // skip in the beginning to show to font preview + return; + + if (!DrawOSD && (get_time_ms() - LastDrawn) < 200) // No need to redraw text on screen + // so often, lets keep low CPU load + return; + + if ((get_time_ms() - LastDrawn) < + MinTimeBetweenScreenRefresh) { // Set some delay to keep CPU load low + stat_skipped_frames++; + return; + } + + if ((get_time_ms() - LastCleared) < 2) { + // at least 2ms to reload some data after clearscreen, otherwise the + // screen will blink? but if there is too few chars to show we may never + // render it printf("%lu DrawSkipped after clear LastDrawn:%lu | + // %lu%\r\n",(uint32_t)get_time_ms()%10000, (uint32_t)LastDrawn%10000 , + // (uint32_t) LastCleared%10000); return ; + } + + LastDrawn = get_time_ms(); + + if (bmpBuff.pData == NULL) { + + bmpBuff.enPixelFormat = PIXEL_FORMAT_DEFAULT; + bmpBuff.u32Width = OVERLAY_WIDTH; // current_display_info.font_width * + // current_display_info.char_width; + bmpBuff.u32Height = OVERLAY_HEIGHT; // current_display_info.font_height * + // current_display_info.char_height; + // bmpBuff.pData = malloc( bmpBuff.u32Height * bmpBuff.u32Width / 8); + if (useDirectBMPBuffer) { + bmpBuff.pData = get_directBMP(osds[FULL_OVERLAY_ID].hand); + // clear the image, since it contains the last one + memset(bmpBuff.pData, PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_I4 ? 0xFF : 0x00, + bmpBuff.u32Height * getRowStride(bmpBuff.u32Width, PIXEL_FORMAT_BitsPerPixel)); + } else + bmpBuff.pData = malloc( + bmpBuff.u32Height * getRowStride(bmpBuff.u32Width, PIXEL_FORMAT_BitsPerPixel)); + + } else + bmpBuff.pData = memset(bmpBuff.pData, PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_I4 ? 0xFF : 0x00, + bmpBuff.u32Height * getRowStride(bmpBuff.u32Width, PIXEL_FORMAT_BitsPerPixel)); + // bmpBuff.pData = memset(bmpBuff.pData, 0xFF , bmpBuff.u32Height * + // getRowStride(bmpBuff.u32Width , PIXEL_FORMAT_BitsPerPixel)); + + bmpBuff.enPixelFormat = PIXEL_FORMAT_DEFAULT; // PIXEL_FORMAT_DEFAULT ;//PIXEL_FORMAT_1555; + + if (DrawOSD) { // If we only need message without icons + + bool try_smaller_font = false; + for (int y = 0; y < current_display_info.char_height; y++) { + + for (int x = 0; x < current_display_info.char_width; x++) { + + if (AbortNow) { // There is request to close app, do not copy to + // buffer since it may be disposed already. + printf("Drawing aborted! \r\n"); + return; + } + + uint16_t c = character_map[x][y]; + + // if (ReplaceWidgets_Slow(&x,&y)) // Logic moved to InjectChars + // continue; + + if (c != 0 && bitmapFnt.pData != NULL) { // If there is now font, no drawing + uint8_t page = 0; + if (c > 255) { + page = (c >> 8) & 0x03; + c = c & 0xFF; + } + + // Find the coordinates if the the rectangle in the Font + // Bitmap + u_int16_t s_left = page * current_display_info.font_width; + u_int16_t s_top = current_display_info.font_height * c; + u_int16_t s_width = current_display_info.font_width; + u_int16_t s_height = current_display_info.font_height; + // the location in the screen bmp where we will place the + // character glyph + u_int16_t d_x = x * current_display_info.font_width + X_OFFSET; + u_int16_t d_y = y * current_display_info.font_height; + BITMAP fnt = bitmapFnt; + + if (matrix_size > 10 && bmpFntSmall.u32Width > 0 && try_smaller_font || y == 0) + Convert2SmallGlyph( + &fnt, &s_left, &s_top, &s_width, &s_height, &d_x, &d_y, x, y, c, page); + + if (y == 0) // If there is no symbol on first line, assume + // this is statisctics screen. + try_smaller_font = true; + + // if (cntr<40) + // printf("Using direct canvas memory mode! size:%d:%d + // stride:\r\n + // ",bmpBuff.u32Width,bmpBuff.u32Height,getRowStride(bmpBuff.u32Width + // , PIXEL_FORMAT_BitsPerPixel)); + if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_1555) + copyRectARGB1555(fnt.pData, fnt.u32Width, fnt.u32Height, bmpBuff.pData, + bmpBuff.u32Width, bmpBuff.u32Height, s_left, s_top, s_width, s_height, + d_x, d_y); + else if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_I4) + copyRectI4(fnt.pData, fnt.u32Width, fnt.u32Height, bmpBuff.pData, + bmpBuff.u32Width, bmpBuff.u32Height, s_left, s_top, s_width, s_height, + d_x, d_y); + else if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_8888) + copyRectRGBA8888(fnt.pData, fnt.u32Width, fnt.u32Height, bmpBuff.pData, + bmpBuff.u32Width, bmpBuff.u32Height, s_left, s_top, s_width, s_height, + d_x, d_y); + else + copyRectI8(fnt.pData, fnt.u32Width, fnt.u32Height, bmpBuff.pData, + bmpBuff.u32Width, bmpBuff.u32Height, s_left, s_top, s_width, s_height, + d_x, d_y); + + } else { + } + } + } + + step2 = get_time_ms(); #if !defined(_x86) && !defined(__ROCKCHIP__) - - if (AHI_Enabled==2) - draw_AHI(); - - if (AHI_Enabled==1 || AHI_Enabled>2) - draw_Ladder(); - -#endif - }//if DrawOSD - else{ - step2=get_time_ms(); - } - - //strcpy(osds[FULL_OVERLAY_ID].text,"$M $B Test");//"$M $B Test"); - DrawTextOnOSDBitmap(NULL); - - stat_screen_refresh_count++; - uint64_t step3=get_time_ms(); + + if (AHI_Enabled == 2) + draw_AHI(); + + if (AHI_Enabled == 1 || AHI_Enabled > 2) + draw_Ladder(); + +#endif + } // if DrawOSD + else { + step2 = get_time_ms(); + } + + // strcpy(osds[FULL_OVERLAY_ID].text,"$M $B Test");//"$M $B Test"); + DrawTextOnOSDBitmap(NULL); + + stat_screen_refresh_count++; + uint64_t step3 = get_time_ms(); #if defined(_x86) || defined(__ROCKCHIP__) - if (bmp_x86==NULL)//lets cache it - bmp_x86 = malloc(bmpBuff.u32Width * bmpBuff.u32Height * 4); // Allocate memory for RGBA data - - if (PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_1555) - Convert1555ToRGBA( bmpBuff.pData, bmp_x86, bmpBuff.u32Width, bmpBuff.u32Height); - else if (PIXEL_FORMAT_DEFAULT==4) //I8 one byte format - ConvertI8ToRGBA( bmpBuff.pData, bmp_x86, bmpBuff.u32Width, bmpBuff.u32Height,&g_stPaletteTable); - else if (PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_I4) //I4 half byte format - ConvertI4ToRGBA( bmpBuff.pData, bmp_x86, bmpBuff.u32Width, bmpBuff.u32Height,&g_stPaletteTable); - else if (PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_8888) //I4 half byte format - //memcpy(bmp_x86,bmpBuff.pData, bmpBuff.u32Width * bmpBuff.u32Height * 4);//Do not need to copy... - bmp_x86=bmpBuff.pData; - - if (DrawOSD){ - //ClearScreen(); - Render(bmp_x86,bmpBuff.u32Width, bmpBuff.u32Height); - - if (AHI_Enabled==2) - draw_AHI(); - if (AHI_Enabled==1 || AHI_Enabled>2) - draw_Ladder(); - if (RCWidgetX>0) - drawRC_Channels(RCWidgetX, RCWidgetY, channels[0], channels[1], channels[2], channels[3]); - - //strcpy(air_unit_info_msg,"30fps/MCS1 7Mb reset test message that can be 80 characters long that are enough"); - if (strlen(air_unit_info_msg)>1){ - int osd_font_size=osds[FULL_OVERLAY_ID].size - 6; //Some offset needed to keep the same with air rendering - uint64_t timems=get_time_ms(); - int width=getTextWidth(air_unit_info_msg,osd_font_size); - - int posX=0,posY=0; - if (msg_layout%4==0)// left - posX=4; - if (msg_layout%4==1)// center - posX=(bmpBuff.u32Width - width) /2; - if (msg_layout%4==2)// right - posX=(bmpBuff.u32Width - width) - 42; - if (msg_layout%4==3)//moving - posX=20 + ((timems/16)%(bmpBuff.u32Width - width - 40))& ~1; - posY=(msg_layout/4)== 0 ? osd_font_size : (bmpBuff.u32Height ) - 6;//Uppper or lower line - - drawText(air_unit_info_msg, posX , posY, getcolor(msg_colour), /*font_size*/ osd_font_size, false,0); - } - - FlushDrawing(); - } - + if (bmp_x86 == NULL) // lets cache it + bmp_x86 = malloc(bmpBuff.u32Width * bmpBuff.u32Height * 4); // Allocate memory for RGBA data + + if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_1555) + Convert1555ToRGBA(bmpBuff.pData, bmp_x86, bmpBuff.u32Width, bmpBuff.u32Height); + else if (PIXEL_FORMAT_DEFAULT == 4) // I8 one byte format + ConvertI8ToRGBA( + bmpBuff.pData, bmp_x86, bmpBuff.u32Width, bmpBuff.u32Height, &g_stPaletteTable); + else if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_I4) // I4 half byte format + ConvertI4ToRGBA( + bmpBuff.pData, bmp_x86, bmpBuff.u32Width, bmpBuff.u32Height, &g_stPaletteTable); + else if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_8888) // I4 half byte format + // memcpy(bmp_x86,bmpBuff.pData, bmpBuff.u32Width * bmpBuff.u32Height * + // 4);//Do not need to copy... + bmp_x86 = bmpBuff.pData; + + if (DrawOSD) { + // ClearScreen(); + Render(bmp_x86, bmpBuff.u32Width, bmpBuff.u32Height); + + if (AHI_Enabled == 2) + draw_AHI(); + if (AHI_Enabled == 1 || AHI_Enabled > 2) + draw_Ladder(); + if (RCWidgetX > 0) + drawRC_Channels( + RCWidgetX, RCWidgetY, channels[0], channels[1], channels[2], channels[3]); + + // strcpy(air_unit_info_msg,"30fps/MCS1 7Mb reset test message that can + // be 80 characters long that are enough"); + if (strlen(air_unit_info_msg) > 1) { + int osd_font_size = osds[FULL_OVERLAY_ID].size - + 6; // Some offset needed to keep the same with air rendering + uint64_t timems = get_time_ms(); + int width = getTextWidth(air_unit_info_msg, osd_font_size); + + int posX = 0, posY = 0; + if (msg_layout % 4 == 0) // left + posX = 4; + if (msg_layout % 4 == 1) // center + posX = (bmpBuff.u32Width - width) / 2; + if (msg_layout % 4 == 2) // right + posX = (bmpBuff.u32Width - width) - 42; + if (msg_layout % 4 == 3) // moving + posX = 20 + ((timems / 16) % (bmpBuff.u32Width - width - 40)) & ~1; + posY = (msg_layout / 4) == 0 ? osd_font_size + : (bmpBuff.u32Height) - 6; // Uppper or lower line + + drawText(air_unit_info_msg, posX, posY, getcolor(msg_colour), + /*font_size*/ osd_font_size, false, 0); + } + + FlushDrawing(); + } #elif __GOKE__ - if (DrawOSD) - set_bitmap(osds[FULL_OVERLAY_ID].hand, &bmpBuff); + if (DrawOSD) + set_bitmap(osds[FULL_OVERLAY_ID].hand, &bmpBuff); #else - int id=0; - // printf("%lu set_bitmapB for:%d | %d ms\r\n",(uint32_t)get_time_ms()%10000, (uint32_t)(get_time_ms() - LastDrawn)); - if (DrawOSD) - if (useDirectBMPBuffer){ - int s32Ret = MI_RGN_UpdateCanvas(osds[FULL_OVERLAY_ID].hand); - bmpBuff.pData=NULL;//we must reset it so that we get it the next iteration to draw! - if (verbose&& s32Ret!=0) - printf("MI_RGN_UpdateCanvas failed: %d!\n",s32Ret); - }else - set_bitmap(osds[FULL_OVERLAY_ID].hand, &bmpBuff); - - //printf("%lu set_bitmapB for:%u | %u | %u ms\r\n",(uint32_t)get_time_ms()%10000, (uint32_t)(get_time_ms() - LastDrawn) , (uint32_t)(get_time_ms() - step2),(uint32_t)(get_time_ms() - step3)); + int id = 0; + // printf("%lu set_bitmapB for:%d | %d + // ms\r\n",(uint32_t)get_time_ms()%10000, (uint32_t)(get_time_ms() - + // LastDrawn)); + if (DrawOSD) + if (useDirectBMPBuffer) { + int s32Ret = MI_RGN_UpdateCanvas(osds[FULL_OVERLAY_ID].hand); + bmpBuff.pData = NULL; // we must reset it so that we get it the next + // iteration to draw! + if (verbose && s32Ret != 0) + printf("MI_RGN_UpdateCanvas failed: %d!\n", s32Ret); + } else + set_bitmap(osds[FULL_OVERLAY_ID].hand, &bmpBuff); + + // printf("%lu set_bitmapB for:%u | %u | %u + // ms\r\n",(uint32_t)get_time_ms()%10000, (uint32_t)(get_time_ms() - + // LastDrawn) , (uint32_t)(get_time_ms() - + // step2),(uint32_t)(get_time_ms() + // - step3)); #endif - stat_draw_overlay_1+=(uint32_t)(get_time_ms() - LastDrawn); - stat_draw_overlay_2+=(uint32_t)(get_time_ms() - step2); - stat_draw_overlay_3+=(uint32_t)(get_time_ms() - step3); + stat_draw_overlay_1 += (uint32_t)(get_time_ms() - LastDrawn); + stat_draw_overlay_2 += (uint32_t)(get_time_ms() - step2); + stat_draw_overlay_3 += (uint32_t)(get_time_ms() - step3); - //free(bitmap.pData); + // free(bitmap.pData); } // --------------------------------------------------- -// ---- Functions to process MSP messages +// ---- Functions to process MSP messages // --------------------------------------------------- -static void draw_character(uint32_t x, uint32_t y, uint16_t c) -{ - //draw_character_on_console(y,x,c); - if (x > current_display_info.char_width - 1 || y > current_display_info.char_height - 1) - { - return; - } +static void draw_character(uint32_t x, uint32_t y, uint16_t c) { + // draw_character_on_console(y,x,c); + if (x > current_display_info.char_width - 1 || y > current_display_info.char_height - 1) { + return; + } - character_map[x][y] = c; + character_map[x][y] = c; } -static void clear_screen() -{ - if (cntr++<0 ) - return ; - //ClearScreen(); - //BetaFlight needs this. INAV can be configured to skip it - if (!DrawOSD || font_pages == 1 || font_pages>2 || (get_time_ms() - LastCleared)>300) {//no faster than 0.5 per second - memset(character_map, 0, sizeof(character_map)); - if (bmpBuff.pData!=NULL)//Set whole BMP as transparant, Palette index 0xF if 4bit - memset(bmpBuff.pData, PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_I4 ? 0xFF : 0x00 , bmpBuff.u32Height * getRowStride(bmpBuff.u32Width , PIXEL_FORMAT_BitsPerPixel)); - //bmpBuff.pData = memset(bmpBuff.pData, 0xFF , (bmpBuff.u32Height * bmpBuff.u32Width * PIXEL_FORMAT_BitsPerPixel / 8) ); - - LastCleared=(get_time_ms()); - //printf("%lu Clear screen\n",(uint32_t)(LastCleared%10000)); - //LastDrawn=(get_time_ms())+500;///give 200ms no refresh to load data in buffer - }else - if (verbose) - printf("%lu Clear screen skipped\r\n",(uint32_t)((uint32_t)get_time_ms())%10000 ); - //LastDrawn=(get_time_ms())+200;//give 120ms more to load data +static void clear_screen() { + if (cntr++ < 0) + return; + // ClearScreen(); + // BetaFlight needs this. INAV can be configured to skip it + if (!DrawOSD || font_pages == 1 || font_pages > 2 || + (get_time_ms() - LastCleared) > 300) { // no faster than 0.5 per second + memset(character_map, 0, sizeof(character_map)); + if (bmpBuff.pData != NULL) // Set whole BMP as transparant, Palette index 0xF if 4bit + memset(bmpBuff.pData, PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_I4 ? 0xFF : 0x00, + bmpBuff.u32Height * getRowStride(bmpBuff.u32Width, PIXEL_FORMAT_BitsPerPixel)); + // bmpBuff.pData = memset(bmpBuff.pData, 0xFF , (bmpBuff.u32Height * + // bmpBuff.u32Width * PIXEL_FORMAT_BitsPerPixel / 8) ); + + LastCleared = (get_time_ms()); + // printf("%lu Clear screen\n",(uint32_t)(LastCleared%10000)); + // LastDrawn=(get_time_ms())+500;///give 200ms no refresh to load data + // in buffer + } else if (verbose) + printf("%u Clear screen skipped\r\n", (uint32_t)((uint32_t)get_time_ms()) % 10000); + // LastDrawn=(get_time_ms())+200;//give 120ms more to load data } -static int draws=0; -static void draw_complete() -{ - stat_MSP_draw_complete_count++; - draws++; - draw_screenBMP(); - - if (draws<2 && bitmapFnt.pData==NULL){ - char msg[200]; - sprintf(msg,"&F38 &L43 Identifying Flight Controller...",font_load_name); - SetOSDMsg(msg); - } + +static int draws = 0; + +static void draw_complete() { + stat_MSP_draw_complete_count++; + draws++; + draw_screenBMP(); + + if (draws < 2 && bitmapFnt.pData == NULL) { + char msg[200]; + sprintf(msg, "&F38 &L43 Identifying Flight Controller...", font_load_name); + SetOSDMsg(msg); + } #ifdef _x86 - // sfRenderWindow_display(window); -#endif - DEBUG_PRINT("draw complete!\n"); - + // sfRenderWindow_display(window); +#endif + DEBUG_PRINT("draw complete!\n"); } - -static void msp_callback(msp_msg_t *msp_message) -{ - displayport_process_message(display_driver, msp_message); +static void msp_callback(msp_msg_t *msp_message) { + displayport_process_message(display_driver, msp_message); } -static int set_mode_global_counter=0; + +static int set_mode_global_counter = 0; + static void set_options(uint8_t font, msp_hd_options_e is_hd) { - /* - if(is_hd) { - current_display_info = hd_display_info; - } else { - current_display_info = sd_display_info; - } - */ - //we need FullHD option?! - if (verbose&&set_mode_global_counter++<10) - printf("FC set mode:%d\r\n",is_hd); + /* + if(is_hd) { + current_display_info = hd_display_info; + } else { + current_display_info = sd_display_info; + } + */ + // we need FullHD option?! + if (verbose && set_mode_global_counter++ < 10) + printf("FC set mode:%d\r\n", is_hd); } - /** Load and Convert PNG to BMP format, 4bit per pixel. * Allocates memory, return width and height */ -unsigned char* loadPngToBMP(const char* filename, unsigned int* width, unsigned int* height) { - unsigned char* pngData; - unsigned int error = lodepng_decode32_file(&pngData, width, height, filename); - - if (error) { - printf("Error %u: %s\n", error, lodepng_error_text(error)); - return NULL; - } - - // Calculate BMP stride (row size aligned to 4 bytes) - unsigned int bmpStride = (*width * 4 + 3) & ~3; - bmpStride = getRowStride(*width,PIXEL_FORMAT_BitsPerPixel); - - // Allocate memory for BMP data - unsigned int bmpSize = bmpStride * (*height); - unsigned char* bmpData = (unsigned char*)malloc(bmpSize); - if (!bmpData) { - printf("Failed to allocate memory for BMP data\n"); - free(pngData); - return NULL; - } - - if (PIXEL_FORMAT_DEFAULT==3)//I4 - convertRGBAToI4( pngData, *width , *height, bmpData, &g_stPaletteTable); - else if (PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_8888){ - // memcpy(bmpData,pngData,bmpSize); - convertRGBAToARGB( pngData, *width , *height, (uint32_t*)bmpData); +unsigned char *loadPngToBMP(const char *filename, unsigned int *width, unsigned int *height) { + unsigned char *pngData; + unsigned int error = lodepng_decode32_file(&pngData, width, height, filename); + + if (error) { + printf("Error %u: %s\n", error, lodepng_error_text(error)); + return NULL; + } + + // Calculate BMP stride (row size aligned to 4 bytes) + unsigned int bmpStride = (*width * 4 + 3) & ~3; + bmpStride = getRowStride(*width, PIXEL_FORMAT_BitsPerPixel); + + // Allocate memory for BMP data + unsigned int bmpSize = bmpStride * (*height); + unsigned char *bmpData = (unsigned char *)malloc(bmpSize); + if (!bmpData) { + printf("Failed to allocate memory for BMP data\n"); + free(pngData); + return NULL; + } + + if (PIXEL_FORMAT_DEFAULT == 3) // I4 + convertRGBAToI4(pngData, *width, *height, bmpData, &g_stPaletteTable); + else if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_8888) { + // memcpy(bmpData,pngData,bmpSize); + convertRGBAToARGB(pngData, *width, *height, (uint32_t *)bmpData); #if defined(_x86) || defined(__ROCKCHIP__) - premultiplyAlpha((uint32_t*) bmpData, *width, *height);//RGBA format needs to be converted when using transparency? -#endif - }else - convertRGBAToARGB1555( pngData, *width , *height, (uint16_t*)bmpData); + premultiplyAlpha((uint32_t *)bmpData, *width, + *height); // RGBA format needs to be converted when + // using transparency? +#endif + } else + convertRGBAToARGB1555(pngData, *width, *height, (uint16_t *)bmpData); - // Clean up - free(pngData); + // Clean up + free(pngData); - return bmpData; + return bmpData; } -int GetMajesticVideoConfig(int *Width){ +int GetMajesticVideoConfig(int *Width) { - FILE *file; - char line[256]; - bool inVideo0Section = false; - char sizeValue[50]; // Buffer to store the size value - int width, height; + FILE *file; + char line[256]; + bool inVideo0Section = false; + char sizeValue[50]; // Buffer to store the size value + int width, height; - // Open the configuration file -#ifdef _x86 - file = fopen("majestic.yaml", "r"); + // Open the configuration file +#ifdef _x86 + file = fopen("majestic.yaml", "r"); #else - file = fopen("/etc/majestic.yaml", "r"); + file = fopen("/etc/majestic.yaml", "r"); #endif - if (file == NULL) { - printf("Could not open majestic.yaml.\n"); - return 0; - } - - // Read the file line by line - while (fgets(line, sizeof(line), file)) { - // Check if we've entered the video0 section - if (strstr(line, "video0:") != NULL) - inVideo0Section = true; - - // If we're in the video0 section, look for the size parameter - if (inVideo0Section && strlen(line)>10) { - // Skip leading whitespace - char *ptr = line; - while (isspace((unsigned char)*ptr)) { - ptr++; - } - // Check if the first non-whitespace character is not '#' - if (*ptr != '#') { - if (strstr(line, "size:") != NULL) { - // Extract the value after "size:" - sscanf(line, " size: %49s", sizeValue); // Extract the size value with a buffer limit - break; // Exit the loop once the size is found - } - } - } - - // If another section starts, exit the video0 section - if (line[0] != ' ' && line[0] != '#' && strstr(line, ":") != NULL && strstr(line, "video0:") == NULL) { - inVideo0Section = false; - } - } - - // Close the file - fclose(file); - - // Print the extracted size value - if (strlen(sizeValue) > 0) { - // Use sscanf to parse the size value into width and height - if (sscanf(sizeValue, "%dx%d", &width, &height) == 2) { - printf("Majestic width:%d,height:%d\n", width, height); - *Width=width; - } else { - printf("Failed to parse video size in Majestic, assume 720p! %s\n",sizeValue); - *Width=1280; - height = 720; - } - - } else { - printf("Size parameter not found in Video0 section.\n"); - } - return height; + if (file == NULL) { + printf("Could not open majestic.yaml.\n"); + return 0; + } + + // Read the file line by line + while (fgets(line, sizeof(line), file)) { + // Check if we've entered the video0 section + if (strstr(line, "video0:") != NULL) + inVideo0Section = true; + + // If we're in the video0 section, look for the size parameter + if (inVideo0Section && strlen(line) > 10) { + // Skip leading whitespace + char *ptr = line; + while (isspace((unsigned char)*ptr)) { + ptr++; + } + // Check if the first non-whitespace character is not '#' + if (*ptr != '#') { + if (strstr(line, "size:") != NULL) { + // Extract the value after "size:" + sscanf(line, " size: %49s", + sizeValue); // Extract the size value with a buffer + // limit + break; // Exit the loop once the size is found + } + } + } + + // If another section starts, exit the video0 section + if (line[0] != ' ' && line[0] != '#' && strstr(line, ":") != NULL && + strstr(line, "video0:") == NULL) { + inVideo0Section = false; + } + } + + // Close the file + fclose(file); + + // Print the extracted size value + if (strlen(sizeValue) > 0) { + // Use sscanf to parse the size value into width and height + if (sscanf(sizeValue, "%dx%d", &width, &height) == 2) { + printf("Majestic width:%d,height:%d\n", width, height); + *Width = width; + } else { + printf("Failed to parse video size in Majestic, assume 720p! %s\n", sizeValue); + *Width = 1280; + height = 720; + } + + } else { + printf("Size parameter not found in Video0 section.\n"); + } + return height; } - + void getExecutablePath(char *buffer, size_t bufferSize) { - ssize_t len = readlink("/proc/self/exe", buffer, bufferSize - 1); - if (len != -1) { - buffer[len] = '\0'; - } else { - fprintf(stderr, "Failed to determine executable path.\n"); - exit(EXIT_FAILURE); - } + ssize_t len = readlink("/proc/self/exe", buffer, bufferSize - 1); + if (len != -1) { + buffer[len] = '\0'; + } else { + fprintf(stderr, "Failed to determine executable path.\n"); + exit(EXIT_FAILURE); + } } - - char *font_path; char *font_suffix; - -int height=0; + +int height = 0; char font_type[20]; -//Try to get the font name for different FC -//if font.png file is present, assumes it is for the correct FC SW Type (BF/INAV or Ardu) -void getFontName(char *FontName ){ +// Try to get the font name for different FC +// if font.png file is present, assumes it is for the correct FC SW Type +// (BF/INAV or Ardu) +void getFontName(char *FontName) {} + +bool LoadFont() { + char font_type[10] = ""; + char executablePath[1024]; + getExecutablePath(executablePath, sizeof(executablePath)); + char *executableDir = dirname(executablePath); + font_path = "/usr/share/fonts/"; +#ifdef _x86 + font_path = executableDir; //.bmp + int l = strlen(font_path); + font_path[l] = '/'; + font_path[l + 1] = 0; +#endif + if (strncmp(current_fc_identifier, "BTFL", 4) == 0) + strcpy(font_type, "_btfl"); + if (strncmp(current_fc_identifier, "INAV", 4) == 0) + strcpy(font_type, "_inav"); + if (strncmp(current_fc_identifier, "ARDU", 4) == 0) + strcpy(font_type, "_ardu"); + + // snprintf(font_load_name, 255, "%sfont%s.png", font_path, font_suffix); + snprintf(font_load_name, 255, "%sfont%s%s.png", font_path, font_type, font_suffix); + + // Check if the file exists in the correct location, if not, try in legacy + // old location! + if (access(font_load_name, F_OK) != 0) { + printf("Font file not found in %s folder! Trying in /usr/bin/ => ", font_path); + font_path = "/usr/bin/"; + snprintf(font_load_name, 255, "%sfont%s.png", font_path, font_suffix); + } + + printf("Loading %s for %dp mode\r\n", font_load_name, height); + + if (bitmapFnt.pData != NULL) // if called by mistake + free(bitmapFnt.pData); + + bitmapFnt.pData = + (void *)loadPngToBMP(font_load_name, &bitmapFnt.u32Width, &bitmapFnt.u32Height); + bitmapFnt.enPixelFormat = PIXEL_FORMAT_DEFAULT; // E_MI_RGN_PIXEL_FORMAT_I8; //I8 + + if (bitmapFnt.u32Width == 0 || bitmapFnt.u32Height == 0) { + printf("Can't find font file: %s \r\n OSD Disabled! \r\n", font_load_name); + return false; + } + + font_pages = bitmapFnt.u32Width / current_display_info.font_width; + printf("Font file res %d:%d pages:%d\r\n", bitmapFnt.u32Width, bitmapFnt.u32Height, font_pages); + + if (matrix_size == 1) { // Predefined size for matrix, standard + current_display_info.char_width = 50; + current_display_info.char_height = 18; + } else if (font_pages > 2) { // BetaFlight!!! + current_display_info.char_width = 53; // 53 + current_display_info.char_height = 20; + } else { // INAV + current_display_info.char_width = 53; // 53 + current_display_info.char_height = 20; + } + // new mode, showing smaller icons in FHD mode + if (matrix_size > 10) { + snprintf(font_load_name, 255, "%sfont%s%s.png", font_path, font_type, "_hd"); + printf("Loading small size glyphs %s for %dp mode\r\n", font_load_name, height); + + if (bmpFntSmall.pData != NULL) // if called by mistake + free(bmpFntSmall.pData); + + bmpFntSmall.pData = + (void *)loadPngToBMP(font_load_name, &bmpFntSmall.u32Width, &bmpFntSmall.u32Height); + bmpFntSmall.enPixelFormat = PIXEL_FORMAT_DEFAULT; // E_MI_RGN_PIXEL_FORMAT_I8; //I8 + } + printf("Glyph size: %d:%d on a %d:%d matrix. Overlay %d:%d \r\n", + current_display_info.font_width, current_display_info.font_height, + current_display_info.char_width, current_display_info.char_height, OVERLAY_WIDTH, + OVERLAY_HEIGHT); +} +int majestic_width; +int majestic_height; +int fd_mem; +static void InitMSPHook() { + memset(character_map, 0, sizeof(character_map)); + font_suffix = ""; -} + PIXEL_FORMAT_DEFAULT = PIXEL_FORMAT_1555; // ARGB1555 format, 16 bits per pixel + PIXEL_FORMAT_BitsPerPixel = 16; -bool LoadFont(){ - char font_type[10]=""; - char executablePath[1024]; - getExecutablePath(executablePath, sizeof(executablePath)); - char *executableDir = dirname(executablePath); - font_path = "/usr/share/fonts/"; - #ifdef _x86 - font_path = executableDir;//.bmp - int l=strlen(font_path); - font_path[l]='/'; - font_path[l+1]=0; - #endif - if(strncmp(current_fc_identifier, "BTFL", 4) == 0) - strcpy(font_type,"_btfl"); - if(strncmp(current_fc_identifier, "INAV", 4) == 0) - strcpy(font_type,"_inav"); - if(strncmp(current_fc_identifier, "ARDU", 4) == 0) - strcpy(font_type,"_ardu"); - - - //snprintf(font_load_name, 255, "%sfont%s.png", font_path, font_suffix); - snprintf(font_load_name, 255, "%sfont%s%s.png", font_path, font_type, font_suffix); - - // Check if the file exists in the correct location, if not, try in legacy old location! - if (access(font_load_name, F_OK) != 0) { - printf("Font file not found in %s folder! Trying in /usr/bin/ => ",font_path); - font_path="/usr/bin/"; - snprintf(font_load_name, 255, "%sfont%s.png", font_path, font_suffix); - } - - printf("Loading %s for %dp mode\r\n", font_load_name, height); - - if (bitmapFnt.pData!=NULL)//if called by mistake - free(bitmapFnt.pData); - - bitmapFnt.pData=(void *)loadPngToBMP(font_load_name,&bitmapFnt.u32Width,&bitmapFnt.u32Height); - bitmapFnt.enPixelFormat = PIXEL_FORMAT_DEFAULT ;//E_MI_RGN_PIXEL_FORMAT_I8; //I8 - - - if (bitmapFnt.u32Width==0 || bitmapFnt.u32Height==0){ - printf("Can't find font file : %s \r\n OSD Disabled! \r\n",font_load_name); - return false; - } - - font_pages = bitmapFnt.u32Width/current_display_info.font_width; - printf("Font file res %d:%d pages:%d\r\n", bitmapFnt.u32Width,bitmapFnt.u32Height, font_pages); - - if (matrix_size==1){//Predefined size for matrix, standard - current_display_info.char_width = 50; - current_display_info.char_height = 18; - }else if (font_pages>2){//BetaFlight!!! - current_display_info.char_width = 53;//53 - current_display_info.char_height = 20; - }else{//INAV - current_display_info.char_width = 53;//53 - current_display_info.char_height = 20; - } - //new mode, showing smaller icons in FHD mode - if (matrix_size>10){ - snprintf(font_load_name, 255, "%sfont%s%s.png", font_path, font_type, "_hd"); - printf("Loading small size glyphs %s for %dp mode\r\n", font_load_name, height); - - if (bmpFntSmall.pData!=NULL)//if called by mistake - free(bmpFntSmall.pData); - - bmpFntSmall.pData=(void *)loadPngToBMP(font_load_name,&bmpFntSmall.u32Width,&bmpFntSmall.u32Height); - bmpFntSmall.enPixelFormat = PIXEL_FORMAT_DEFAULT ;//E_MI_RGN_PIXEL_FORMAT_I8; //I8 - } - printf("Glyph size:%d:%d on a %d:%d matrix. Overlay %d:%d \r\n",current_display_info.font_width,current_display_info.font_height, - current_display_info.char_width,current_display_info.char_height, - OVERLAY_WIDTH,OVERLAY_HEIGHT); -} +#ifdef __SIGMASTAR__ + PIXEL_FORMAT_DEFAULT = PIXEL_FORMAT_I4; // I4 format, 4 bits per pixel + PIXEL_FORMAT_BitsPerPixel = 4; +#endif +#if defined(_x86) || defined(__ROCKCHIP__) + // enable this to simulate I4 Bitmap Processing on SigmaStar + // PIXEL_FORMAT_DEFAULT=PIXEL_FORMAT_I4;//I4 format, 4 bits per pixel + // PIXEL_FORMAT_BitsPerPixel = 4; + // Default 32 bit rendering on the ground + PIXEL_FORMAT_DEFAULT = PIXEL_FORMAT_8888; // ARGB format, 32 bits per pixel + PIXEL_FORMAT_BitsPerPixel = 32; +#endif -int majestic_width; -int majestic_height; -int fd_mem; -static void InitMSPHook(){ - - memset(character_map, 0, sizeof(character_map)); - - font_suffix=""; - - - PIXEL_FORMAT_DEFAULT=PIXEL_FORMAT_1555;//ARGB1555 format, 16 bits per pixel - PIXEL_FORMAT_BitsPerPixel = 16; - - #ifdef __SIGMASTAR__ - PIXEL_FORMAT_DEFAULT=PIXEL_FORMAT_I4;//I4 format, 4 bits per pixel - PIXEL_FORMAT_BitsPerPixel = 4; - #endif - #if defined(_x86) || defined(__ROCKCHIP__) - //enable this to simulate I4 Bitmap Processing on SigmaStar - //PIXEL_FORMAT_DEFAULT=PIXEL_FORMAT_I4;//I4 format, 4 bits per pixel - //PIXEL_FORMAT_BitsPerPixel = 4; - - //Default 32 bit rendering on the ground - PIXEL_FORMAT_DEFAULT=PIXEL_FORMAT_8888;//ARGB format, 32 bits per pixel - PIXEL_FORMAT_BitsPerPixel = 32; - #endif - - - height = GetMajesticVideoConfig(&majestic_width); - majestic_height=height; - #if defined(_x86) || defined(__ROCKCHIP__) - if (DrawOSD) - Init(&OVERLAY_WIDTH, &OVERLAY_HEIGHT); - height=OVERLAY_HEIGHT; - printf("OSD is %ix%i pixels\n",OVERLAY_WIDTH,OVERLAY_HEIGHT); - #endif - - //Get video resolution - if (height<1000 && height>400){ - font_suffix = "_hd"; - current_display_info = hd_display_info; - }else{ - current_display_info = fhd_display_info; - font_suffix = ""; - } - - - if (DrawOSD){ - LoadFont(); - } - current_display_info.char_width = 53; - current_display_info.char_height = 20; - OVERLAY_WIDTH = current_display_info.font_width * (current_display_info.char_width);//must be multiple of 8 !!! - OVERLAY_WIDTH = (OVERLAY_WIDTH + 7) & ~7; - if (matrix_size>10 && OVERLAY_WIDTH < (1920-(53*2))) { - printf("Matrix size not supported on resolutions smaller than 1920x1080p!\r\n"); - matrix_size=0; - } -/* -On sigmastar the BMP row stride is aligned to 8 bytes, that is 16 pixels in PIXEL_FORMAT_I4 -*/ - if (PIXEL_FORMAT_DEFAULT==PIXEL_FORMAT_I4) - OVERLAY_WIDTH = (OVERLAY_WIDTH + 15) & ~15;//for sigmastar I4 must be multiple of 16, since this is 8 bytes - - if(DrawOSD) - OVERLAY_HEIGHT =current_display_info.font_height * (current_display_info.char_height); - //else - // OVERLAY_HEIGHT =current_display_info.font_height*2;//We do not need the whole screen, let's use only top part of the screen for drawing - - printf("Glyph size:%d:%d on a %d:%d matrix. Overlay %d:%d \r\n",current_display_info.font_width,current_display_info.font_height, - current_display_info.char_width,current_display_info.char_height, - OVERLAY_WIDTH,OVERLAY_HEIGHT - ); - - int rgn=0; - - osds = mmap(NULL, sizeof(*osds) * MAX_OSD, - PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0); - - for (int id = 0; id < MAX_OSD; id++){ - osds[id].hand = id; - osds[id].size = DEF_SIZE; - osds[id].posx = DEF_POSX; - osds[id].posy = DEF_POSY; - osds[id].updt = 0; - strcpy(osds[id].font, DEF_FONT); - osds[id].text[0] = '\0'; - } - - - - #ifdef __SIGMASTAR__ - int s32Ret = MI_RGN_Init(&g_stPaletteTable); - if (verbose) - printf("MI_RGN_Init results: %d \r\n", s32Ret); - if (s32Ret) - fprintf(stderr, "[%s:%d]RGN_Init failed with %#x!\n", __func__, __LINE__, s32Ret); - #endif - - int XOffs=(majestic_width - OVERLAY_WIDTH)/2; - if (XOffs<0) - XOffs=8; - XOffs = (XOffs + 7) & ~7;//multiple of 8 - - int YOffs=0; - if (matrix_size==8) - YOffs=(majestic_height - OVERLAY_HEIGHT)/2;//vertical center - - if (matrix_size==9) - YOffs=(majestic_height - OVERLAY_HEIGHT);//vertical bottom - - //THIS IS NEEDED, the main region to draw inside - if (DrawOSD) - rgn=create_region(&osds[FULL_OVERLAY_ID].hand, XOffs, YOffs, OVERLAY_WIDTH, OVERLAY_HEIGHT); - if (verbose) - printf("Create_region PixelFormat:%d Size: %d:%d X_Offset:%d Y_Offset:%d results: %d \r\n", PIXEL_FORMAT_DEFAULT, OVERLAY_WIDTH,OVERLAY_HEIGHT, XOffs,YOffs, rgn); - - if (DrawOSD){ //Show Font Preview + height = GetMajesticVideoConfig(&majestic_width); + majestic_height = height; +#if defined(_x86) || defined(__ROCKCHIP__) + if (DrawOSD) + Init(&OVERLAY_WIDTH, &OVERLAY_HEIGHT); + height = OVERLAY_HEIGHT; + printf("OSD is %ix%i pixels\n", OVERLAY_WIDTH, OVERLAY_HEIGHT); +#endif + + // Get video resolution + if (height < 1000 && height > 400) { + font_suffix = "_hd"; + current_display_info = hd_display_info; + } else { + current_display_info = fhd_display_info; + font_suffix = ""; + } + + if (DrawOSD) { + LoadFont(); + } + + current_display_info.char_width = 53; + current_display_info.char_height = 20; + OVERLAY_WIDTH = current_display_info.font_width * + (current_display_info.char_width); // must be multiple of 8 !!! + OVERLAY_WIDTH = (OVERLAY_WIDTH + 7) & ~7; + if (matrix_size > 10 && OVERLAY_WIDTH < (1920 - (53 * 2))) { + printf("Matrix size not supported on resolutions smaller than " + "1920x1080p!\r\n"); + matrix_size = 0; + } + /* + On sigmastar the BMP row stride is aligned to 8 bytes, that is 16 pixels in + PIXEL_FORMAT_I4 + */ + if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_I4) + OVERLAY_WIDTH = (OVERLAY_WIDTH + 15) & ~15; // for sigmastar I4 must be multiple of + // 16, since this is 8 bytes + + if (DrawOSD) + OVERLAY_HEIGHT = current_display_info.font_height * (current_display_info.char_height); + // else + // OVERLAY_HEIGHT =current_display_info.font_height*2;//We do not need + // the whole screen, let's use only top part of the screen for drawing + + printf("Glyph size:%d:%d on a %d:%d matrix. Overlay %d:%d \r\n", + current_display_info.font_width, current_display_info.font_height, + current_display_info.char_width, current_display_info.char_height, OVERLAY_WIDTH, + OVERLAY_HEIGHT); + + int rgn = 0; + + osds = mmap( + NULL, sizeof(*osds) * MAX_OSD, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0); + + for (int id = 0; id < MAX_OSD; id++) { + osds[id].hand = id; + osds[id].size = DEF_SIZE; + osds[id].posx = DEF_POSX; + osds[id].posy = DEF_POSY; + osds[id].updt = 0; + strcpy(osds[id].font, DEF_FONT); + osds[id].text[0] = '\0'; + } + +#ifdef __SIGMASTAR__ + int s32Ret = MI_RGN_Init(&g_stPaletteTable); + if (verbose) + printf("MI_RGN_Init results: %d \r\n", s32Ret); + if (s32Ret) + fprintf(stderr, "[%s:%d]RGN_Init failed with %#x!\n", __func__, __LINE__, s32Ret); +#endif + + int XOffs = (majestic_width - OVERLAY_WIDTH) / 2; + if (XOffs < 0) + XOffs = 8; + XOffs = (XOffs + 7) & ~7; // multiple of 8 + + int YOffs = 0; + if (matrix_size == 8) + YOffs = (majestic_height - OVERLAY_HEIGHT) / 2; // vertical center + + if (matrix_size == 9) + YOffs = (majestic_height - OVERLAY_HEIGHT); // vertical bottom + + // THIS IS NEEDED, the main region to draw inside + if (DrawOSD) + rgn = + create_region(&osds[FULL_OVERLAY_ID].hand, XOffs, YOffs, OVERLAY_WIDTH, OVERLAY_HEIGHT); + if (verbose) + printf("Create_region PixelFormat:%d Size: %d:%d X_Offset:%d Y_Offset:%d " + "results: %d \r\n", + PIXEL_FORMAT_DEFAULT, OVERLAY_WIDTH, OVERLAY_HEIGHT, XOffs, YOffs, rgn); + + if (DrawOSD) { // Show Font Preview #ifdef _x86 - cntr= - 20; //skip first 40 draw requests from the FC to show the preview, about 1 seconds -#else - cntr= - 80; //skip first 80 draw requests from the FC to show the preview, about 2 seconds -#endif - BITMAP bitmap; - int prepared=0; - - //LOAD PNG TEST, if there is font file loaded, preview it - if (/*true*/bitmapFnt.pData!=NULL){//Split and show a review of the selected font for several seconds - prepared=1; - - bitmap.enPixelFormat = PIXEL_FORMAT_DEFAULT; - int preview_height=current_display_info.font_height * current_display_info.char_height; - int cols=bitmapFnt.u32Height / preview_height;/*OVERLAY_HEIGH*/; - int rows=preview_height/ current_display_info.font_height; - int fontPageHeight=rows * current_display_info.font_height;//OVERLAY_HEIGHT;; - bitmap.u32Height = OVERLAY_HEIGHT;//preview_height;//rows * current_display_info.font_height;//OVERLAY_HEIGHT; - bitmap.u32Width = OVERLAY_WIDTH;//bitmapFnt.u32Width * cols; - bitmap.pData = (unsigned char*)malloc(bitmap.u32Height * getRowStride(bitmap.u32Width , PIXEL_FORMAT_BitsPerPixel)); - memset(bitmap.pData, 0, bitmap.u32Height * getRowStride(bitmap.u32Width , PIXEL_FORMAT_BitsPerPixel)); - - if (bitmapFnt.u32Width*(cols+1) > bitmap.u32Width + bitmapFnt.u32Width ) - cols = (bitmap.u32Width / bitmapFnt.u32Width) -1; - - if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_I4)//i4 sigmastar - for (int i=0; i< cols ; i++ ) - copyRectI4(bitmapFnt.pData,bitmapFnt.u32Width,bitmapFnt.u32Height, - bitmap.pData,bitmap.u32Width, bitmap.u32Height, - 0,i * fontPageHeight, bitmapFnt.u32Width, fontPageHeight, - i*bitmapFnt.u32Width,0); - else if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_8888)//10 - for (int i=0; i< cols ; i++ ) - copyRectRGBA8888(bitmapFnt.pData,bitmapFnt.u32Width,bitmapFnt.u32Height, - bitmap.pData,bitmap.u32Width, bitmap.u32Height, - 0,i * fontPageHeight, bitmapFnt.u32Width, fontPageHeight, - i*bitmapFnt.u32Width,0); - else //assume PIXEL_FORMAT_1555 - for (int i=0; idraw_character = &draw_character; - display_driver->clear_screen = &clear_screen; - display_driver->draw_complete = &draw_complete; - display_driver->set_options = &set_options; - - msp_state_t *msp_state = calloc(1, sizeof(msp_state_t)); - msp_state->cb = &msp_callback; - + cntr = -20; // skip first 40 draw requests from the FC to show the + // preview, about 1 seconds +#else + cntr = -80; // skip first 80 draw requests from the FC to show the + // preview, about 2 seconds +#endif + BITMAP bitmap; + int prepared = 0; + + // LOAD PNG TEST, if there is font file loaded, preview it + if (/*true*/ bitmapFnt.pData != NULL) { // Split and show a review of the + // selected font for several seconds + prepared = 1; + + bitmap.enPixelFormat = PIXEL_FORMAT_DEFAULT; + int preview_height = + current_display_info.font_height * current_display_info.char_height; + int cols = bitmapFnt.u32Height / preview_height; /*OVERLAY_HEIGH*/ + ; + int rows = preview_height / current_display_info.font_height; + int fontPageHeight = rows * current_display_info.font_height; // OVERLAY_HEIGHT;; + bitmap.u32Height = OVERLAY_HEIGHT; // preview_height;//rows * + // current_display_info.font_height;//OVERLAY_HEIGHT; + bitmap.u32Width = OVERLAY_WIDTH; // bitmapFnt.u32Width * cols; + bitmap.pData = (unsigned char *)malloc( + bitmap.u32Height * getRowStride(bitmap.u32Width, PIXEL_FORMAT_BitsPerPixel)); + memset(bitmap.pData, 0, + bitmap.u32Height * getRowStride(bitmap.u32Width, PIXEL_FORMAT_BitsPerPixel)); + + if (bitmapFnt.u32Width * (cols + 1) > bitmap.u32Width + bitmapFnt.u32Width) + cols = (bitmap.u32Width / bitmapFnt.u32Width) - 1; + + if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_I4) // i4 sigmastar + for (int i = 0; i < cols; i++) + copyRectI4(bitmapFnt.pData, bitmapFnt.u32Width, bitmapFnt.u32Height, + bitmap.pData, bitmap.u32Width, bitmap.u32Height, 0, i * fontPageHeight, + bitmapFnt.u32Width, fontPageHeight, i * bitmapFnt.u32Width, 0); + else if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_8888) // 10 + for (int i = 0; i < cols; i++) + copyRectRGBA8888(bitmapFnt.pData, bitmapFnt.u32Width, bitmapFnt.u32Height, + bitmap.pData, bitmap.u32Width, bitmap.u32Height, 0, i * fontPageHeight, + bitmapFnt.u32Width, fontPageHeight, i * bitmapFnt.u32Width, 0); + else // assume PIXEL_FORMAT_1555 + for (int i = 0; i < cols; i++) + copyRectARGB1555(bitmapFnt.pData, bitmapFnt.u32Width, bitmapFnt.u32Height, + bitmap.pData, bitmap.u32Width, bitmap.u32Height, 0, i * fontPageHeight, + bitmapFnt.u32Width, fontPageHeight, i * bitmapFnt.u32Width, 0); + + /* Test load BMP image and show it on the screen + bitmap.pData = loadPngToBMPI4(img, &bitmap.u32Width, + &bitmap.u32Height); + bitmap.enPixelFormat-PIXEL_FORMAT_DEFAULT; + */ -} +#ifdef __SIGMASTAR__ + if (verbose) + printf("Set SS Font Review %d:%d", bitmap.u32Width, bitmap.u32Height); + // For some reason this fails...?! + // set_bitmap(osds[FULL_OVERLAY_ID].hand, &bitmap);//bitmap must + // match region dimensions! + + // works in one step + // set_bitmapEx(osds[FULL_OVERLAY_ID].hand, &bitmap, + // PIXEL_FORMAT_BitsPerPixel); + + // This is how direct image memory works in sigmastar + void *bmp = get_directBMP(osds[FULL_OVERLAY_ID].hand); + memcpy(bmp, bitmap.pData, + bitmap.u32Height * getRowStride(bitmap.u32Width, PIXEL_FORMAT_BitsPerPixel)); + MI_RGN_UpdateCanvas(osds[FULL_OVERLAY_ID].hand); + + if (true) { + useDirectBMPBuffer = true; + printf("USING DIRECT VIDEO MEM MODE!!!\r\n"); -static void CloseMSP(){ - int deinit=0; - int s32Ret=0; - #ifdef __SIGMASTAR__ + } else + useDirectBMPBuffer = false; - //s32Ret = MI_RGN_Destroy(&osds[FULL_OVERLAY_ID].hand); - s32Ret = unload_region(&osds[FULL_OVERLAY_ID].hand); +#elif __GOKE__ + if (verbose) + printf("Set Goke Font Review %d:%d\r\n", bitmap.u32Width, bitmap.u32Height); + + set_bitmap(osds[FULL_OVERLAY_ID].hand, + &bitmap); // bitmap must match region dimensions! +#elif defined(_x86) || defined(__ROCKCHIP__) + // sfRenderWindow_clear(window, sfColor_fromRGB(255, 255, 0)); + + unsigned char *rgbaData = + malloc(bitmap.u32Width * bitmap.u32Height * 4); // Allocate memory for RGBA data + if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_I4) + ConvertI4ToRGBA( + bitmap.pData, rgbaData, bitmap.u32Width, bitmap.u32Height, &g_stPaletteTable); + else if (PIXEL_FORMAT_DEFAULT == PIXEL_FORMAT_8888) + memcpy(rgbaData, bitmap.pData, bitmap.u32Width * bitmap.u32Height * 4); + else + Convert1555ToRGBA(bitmap.pData, rgbaData, bitmap.u32Width, bitmap.u32Height); + + Render(rgbaData, bitmap.u32Width, bitmap.u32Height); + // Render(bitmapFnt.pData,bitmapFnt.u32Width,700);//test + FlushDrawing(); + free(rgbaData); + // cairo_surface_destroy(image_surface); + // image_surface = NULL; - deinit = MI_RGN_DeInit(); - if (deinit) - printf("[%s:%d]RGN_DeInit failed with %#x!\n", __func__, __LINE__, s32Ret); - #endif - #if defined(_x86) || defined(__ROCKCHIP__) - Close(); - #endif +#endif + // free(bitmap.pData); + } else { // no font file still, show message on screen + cntr = 0; + char msgbuff[120]; + sprintf(msgbuff, "&F48 &L23 Waiting for data on %s ...", _port_name); + SetOSDMsg(msgbuff); + draw_screenBMP(); + } + + if (prepared) { + if (verbose) + printf("set_LOGO with u32Height:%d enPixelFormat %d\n", bitmap.u32Height, + bitmap.enPixelFormat); + + free(bitmap.pData); + } + } + + display_driver = calloc(1, sizeof(displayport_vtable_t)); + display_driver->draw_character = &draw_character; + display_driver->clear_screen = &clear_screen; + display_driver->draw_complete = &draw_complete; + display_driver->set_options = &set_options; + + msp_state_t *msp_state = calloc(1, sizeof(msp_state_t)); + msp_state->cb = &msp_callback; +} + +static void CloseMSP() { + int deinit = 0; + int s32Ret = 0; +#ifdef __SIGMASTAR__ + // s32Ret = MI_RGN_Destroy(&osds[FULL_OVERLAY_ID].hand); + s32Ret = unload_region(&osds[FULL_OVERLAY_ID].hand); + + deinit = MI_RGN_DeInit(); + if (deinit) + printf("[%s:%d]RGN_DeInit failed with %#x!\n", __func__, __LINE__, s32Ret); +#endif +#if defined(_x86) || defined(__ROCKCHIP__) + Close(); +#endif - munmap(osds, sizeof(*osds) * MAX_OSD); + munmap(osds, sizeof(*osds) * MAX_OSD); - if (bitmapFnt.pData!=NULL) - free(bitmapFnt.pData); - if (bmpBuff.pData!=NULL&& !useDirectBMPBuffer) - free(bmpBuff.pData); - if (bmpFntSmall.pData!=NULL) - free(bmpFntSmall.pData); - - int res_mun=munmap(osds, sizeof(*osds) * MAX_OSD); + if (bitmapFnt.pData != NULL) + free(bitmapFnt.pData); + if (bmpBuff.pData != NULL && !useDirectBMPBuffer) + free(bmpBuff.pData); + if (bmpFntSmall.pData != NULL) + free(bmpFntSmall.pData); - printf("RGN_Destroy=%X, RGN_DeInit:%X\n",s32Ret, deinit); + int res_mun = munmap(osds, sizeof(*osds) * MAX_OSD); + printf("RGN_Destroy=%X, RGN_DeInit:%X\n", s32Ret, deinit); } diff --git a/osd/font/font.c b/osd/font/font.c index c684d23..7641f96 100644 --- a/osd/font/font.c +++ b/osd/font/font.c @@ -1,227 +1,223 @@ +#include +#include #include #include #include -#include -#include #include // #include #include "../libspng/spng.h" -#include "font.h" #include "../util/debug.h" +#include "font.h" #define BYTES_PER_PIXEL 4 #define HD_FONT_WIDTH 24 /* Font helper methods */ -void get_font_path_with_extension(char *font_path_dest, const char *font_path, const char *extension, uint8_t len, uint8_t is_hd, const char *font_variant) -{ - char name_buf[len]; - char res_buf[len]; - - if (font_variant != NULL && strlen(font_variant) > 0) - { - snprintf(name_buf, len, "%s_%s", font_path, font_variant); - } else { - snprintf(name_buf, len, "%s", font_path); - } - - if (is_hd) - { - // surely there's a better way... - snprintf(res_buf, len, "%s", "_hd"); - } else { - snprintf(res_buf, len, "%s", ""); - } - snprintf(font_path_dest, len, "%s%s%s", name_buf, res_buf, extension); - DEBUG_PRINT("Font path: %s\n", font_path_dest); +void get_font_path_with_extension(char *font_path_dest, const char *font_path, + const char *extension, uint8_t len, uint8_t is_hd, const char *font_variant) { + char name_buf[len]; + char res_buf[len]; + + if (font_variant != NULL && strlen(font_variant) > 0) { + snprintf(name_buf, len, "%s_%s", font_path, font_variant); + } else { + snprintf(name_buf, len, "%s", font_path); + } + + if (is_hd) { + // surely there's a better way... + snprintf(res_buf, len, "%s", "_hd"); + } else { + snprintf(res_buf, len, "%s", ""); + } + snprintf(font_path_dest, len, "%s%s%s", name_buf, res_buf, extension); + DEBUG_PRINT("Font path: %s\n", font_path_dest); } -static int open_font(const char *filename, display_info_t *display_info, const char *font_variant) -{ - char file_path[255]; - int is_hd = (display_info->font_width == HD_FONT_WIDTH) ? 1 : 0; - get_font_path_with_extension(file_path, filename, ".png", 255, is_hd, font_variant); - DEBUG_PRINT("Opening font: %s\n", file_path); - struct stat st; - memset(&st, 0, sizeof(st)); - stat(file_path, &st); - size_t filesize = st.st_size; - if(!(filesize > 0)) { - DEBUG_PRINT("Font file did not exist: %s\n", file_path); - return -1; - } - - FILE *fd = fopen(file_path, "rb"); - if (!fd) { - DEBUG_PRINT("Could not open file %s\n", file_path); - return -1; - } - - spng_ctx *ctx = spng_ctx_new(0); - DEBUG_PRINT("Allocated PNG context\n"); - // Set some kind of reasonable PNG limit so we don't get blown up - size_t limit = 1024 * 1024 * 64; - spng_set_chunk_limits(ctx, limit, limit); - DEBUG_PRINT("Set PNG chunk limits\n"); - spng_set_png_file(ctx, fd); - DEBUG_PRINT("Set PNG file\n"); - - struct spng_ihdr ihdr; - int ret = spng_get_ihdr(ctx, &ihdr); - DEBUG_PRINT("Got PNG header\n"); - - if(ret) - { - printf("spng_get_ihdr() error: %s\n", spng_strerror(ret)); - goto err; - } - - if(ihdr.height != display_info->font_height * NUM_CHARS) { - printf("font invalid height, got %d wanted %d\n", ihdr.height, display_info->font_height * NUM_CHARS); - goto err; - } - - if(ihdr.width % display_info->font_width != 0) { - printf("font invalid width, not a multiple of %d\n", display_info->font_width); - goto err; - } - - DEBUG_PRINT("Image pixel size %d x %d\n", ihdr.width, ihdr.height); - - int num_pages = ihdr.width / display_info->font_width; - - DEBUG_PRINT("Font has %d pages\n", num_pages); - - size_t image_size = 0; - int fmt = SPNG_FMT_RGBA8; - ret = spng_decoded_image_size(ctx, fmt, &image_size); - if(ret) { - goto err; - } - - DEBUG_PRINT("Allocating image size %d\n", image_size); - - void* font_data = malloc(image_size); - ret = spng_decode_image(ctx, font_data, image_size, SPNG_FMT_RGBA8, 0); - if(ret) { - printf("Failed to decode PNG!\n"); - free(font_data); - goto err; - } - - for(int page = 0; page < num_pages; page++) { - DEBUG_PRINT("Loading font page %d of %d, placing %x\n", page, num_pages, display_info->fonts); - display_info->fonts[page] = malloc(display_info->font_width * display_info->font_height * NUM_CHARS * BYTES_PER_PIXEL); - DEBUG_PRINT("Allocated %d bytes for font page buf at%x\n", display_info->font_width * display_info->font_height * NUM_CHARS * BYTES_PER_PIXEL, display_info->fonts[page]); - for(int char_num = 0; char_num < NUM_CHARS; char_num++) { - for(int y = 0; y < display_info->font_height; y++) { - // Copy each character line at a time into the correct font buffer - int char_width_bytes = display_info->font_width * BYTES_PER_PIXEL; - int char_size_bytes_dest = (display_info->font_width * display_info->font_height * BYTES_PER_PIXEL); - int char_size_bytes_src = (ihdr.width * display_info->font_height * BYTES_PER_PIXEL); - memcpy((uint8_t *)display_info->fonts[page] + (char_num * char_size_bytes_dest) + (y * char_width_bytes), (uint8_t *)font_data + (char_num * char_size_bytes_src) + (ihdr.width * y * BYTES_PER_PIXEL) + (page * char_width_bytes), char_width_bytes); - } - } - } - - free(font_data); - spng_ctx_free(ctx); - fclose(fd); - return 0; - err: - spng_ctx_free(ctx); - fclose(fd); - return -1; +static int open_font(const char *filename, display_info_t *display_info, const char *font_variant) { + char file_path[255]; + int is_hd = (display_info->font_width == HD_FONT_WIDTH) ? 1 : 0; + get_font_path_with_extension(file_path, filename, ".png", 255, is_hd, font_variant); + DEBUG_PRINT("Opening font: %s\n", file_path); + struct stat st; + memset(&st, 0, sizeof(st)); + stat(file_path, &st); + size_t filesize = st.st_size; + if (!(filesize > 0)) { + DEBUG_PRINT("Font file did not exist: %s\n", file_path); + return -1; + } + + FILE *fd = fopen(file_path, "rb"); + if (!fd) { + DEBUG_PRINT("Could not open file %s\n", file_path); + return -1; + } + + spng_ctx *ctx = spng_ctx_new(0); + DEBUG_PRINT("Allocated PNG context\n"); + // Set some kind of reasonable PNG limit so we don't get blown up + size_t limit = 1024 * 1024 * 64; + spng_set_chunk_limits(ctx, limit, limit); + DEBUG_PRINT("Set PNG chunk limits\n"); + spng_set_png_file(ctx, fd); + DEBUG_PRINT("Set PNG file\n"); + + struct spng_ihdr ihdr; + int ret = spng_get_ihdr(ctx, &ihdr); + DEBUG_PRINT("Got PNG header\n"); + + if (ret) { + printf("spng_get_ihdr() error: %s\n", spng_strerror(ret)); + goto err; + } + + if (ihdr.height != display_info->font_height * NUM_CHARS) { + printf("font invalid height, got %d wanted %d\n", ihdr.height, + display_info->font_height * NUM_CHARS); + goto err; + } + + if (ihdr.width % display_info->font_width != 0) { + printf("font invalid width, not a multiple of %d\n", display_info->font_width); + goto err; + } + + DEBUG_PRINT("Image pixel size %d x %d\n", ihdr.width, ihdr.height); + + int num_pages = ihdr.width / display_info->font_width; + + DEBUG_PRINT("Font has %d pages\n", num_pages); + + size_t image_size = 0; + int fmt = SPNG_FMT_RGBA8; + ret = spng_decoded_image_size(ctx, fmt, &image_size); + if (ret) { + goto err; + } + + DEBUG_PRINT("Allocating image size %d\n", image_size); + + void *font_data = malloc(image_size); + ret = spng_decode_image(ctx, font_data, image_size, SPNG_FMT_RGBA8, 0); + if (ret) { + printf("Failed to decode PNG!\n"); + free(font_data); + goto err; + } + + for (int page = 0; page < num_pages; page++) { + DEBUG_PRINT( + "Loading font page %d of %d, placing %x\n", page, num_pages, display_info->fonts); + display_info->fonts[page] = malloc( + display_info->font_width * display_info->font_height * NUM_CHARS * BYTES_PER_PIXEL); + DEBUG_PRINT("Allocated %d bytes for font page buf at%x\n", + display_info->font_width * display_info->font_height * NUM_CHARS * BYTES_PER_PIXEL, + display_info->fonts[page]); + for (int char_num = 0; char_num < NUM_CHARS; char_num++) { + for (int y = 0; y < display_info->font_height; y++) { + // Copy each character line at a time into the correct font + // buffer + int char_width_bytes = display_info->font_width * BYTES_PER_PIXEL; + int char_size_bytes_dest = + (display_info->font_width * display_info->font_height * BYTES_PER_PIXEL); + int char_size_bytes_src = + (ihdr.width * display_info->font_height * BYTES_PER_PIXEL); + memcpy((uint8_t *)display_info->fonts[page] + (char_num * char_size_bytes_dest) + + (y * char_width_bytes), + (uint8_t *)font_data + (char_num * char_size_bytes_src) + + (ihdr.width * y * BYTES_PER_PIXEL) + (page * char_width_bytes), + char_width_bytes); + } + } + } + + free(font_data); + spng_ctx_free(ctx); + fclose(fd); + return 0; +err: + spng_ctx_free(ctx); + fclose(fd); + return -1; } void load_font(display_info_t *display_info, const char *font_variant) { - // Note: load_font will not replace an existing font. - if(display_info->fonts[0] == NULL) { - int loaded_font = 0; - DEBUG_PRINT("IN LOAD_FONT\n"); - // create a copy of font_variant - char font_variant_lower[5] = ""; - if (font_variant != NULL) - { - DEBUG_PRINT("Lowercasing variant\n"); - size_t length = strlen(font_variant); - for (size_t i = 0; i < length && i < 4; i++) // Ensure not to exceed array bounds - { - font_variant_lower[i] = tolower(font_variant[i]); - } - } - else - { - DEBUG_PRINT("Font variant is NULL\n"); - } - - DEBUG_PRINT("Loading font %s\n", font_variant_lower); - - char *fallback_font_variant = ""; - if (strcmp(font_variant_lower, "btfl") == 0) - { - DEBUG_PRINT("Setting fallback font variant to bf\n"); - fallback_font_variant = "bf"; - } - else if (strcmp(font_variant_lower, "ultr") == 0) - { - DEBUG_PRINT("Setting fallback font variant to ultra\n"); - fallback_font_variant = "ultra"; - } - - // try the three paths for the current font - DEBUG_PRINT("Loading from: %s %s\n", SDCARD_FONT_PATH, font_variant_lower); - loaded_font = open_font(SDCARD_FONT_PATH, display_info, font_variant_lower); - if (loaded_font < 0 && strcmp(fallback_font_variant, "") != 0) - { - DEBUG_PRINT("Loading fallback variant from: %s %s\n", SDCARD_FONT_PATH, fallback_font_variant); - loaded_font = open_font(SDCARD_FONT_PATH, display_info, fallback_font_variant); - } - if (loaded_font < 0) - { - DEBUG_PRINT("Loading from: %s %s\n", FALLBACK_FONT_PATH, font_variant_lower); - loaded_font = open_font(FALLBACK_FONT_PATH, display_info, font_variant_lower); - } - if (loaded_font < 0 && strcmp(fallback_font_variant, "") != 0) - { - DEBUG_PRINT("Loading fallback variant from: %s %s\n", FALLBACK_FONT_PATH, fallback_font_variant); - loaded_font = open_font(FALLBACK_FONT_PATH, display_info, fallback_font_variant); - } - if (loaded_font < 0) - { - DEBUG_PRINT("Loading from: %s %s\n", ENTWARE_FONT_PATH, font_variant_lower); - loaded_font = open_font(ENTWARE_FONT_PATH, display_info, font_variant_lower); - } - - - // finally, if we have no fonts for this FC, fallback to the default font - if (loaded_font) - { - DEBUG_PRINT("Loading generic from: %s\n", SDCARD_FONT_PATH); - loaded_font = open_font(SDCARD_FONT_PATH, display_info, ""); - if (loaded_font < 0) - { - DEBUG_PRINT("Loading generic from: %s\n", FALLBACK_FONT_PATH); - loaded_font = open_font(FALLBACK_FONT_PATH, display_info, ""); - } - if (loaded_font < 0) - { - DEBUG_PRINT("Loading generic from: %s\n", ENTWARE_FONT_PATH); - loaded_font = open_font(ENTWARE_FONT_PATH, display_info, ""); - } - } - } + // Note: load_font will not replace an existing font. + if (display_info->fonts[0] == NULL) { + int loaded_font = 0; + DEBUG_PRINT("IN LOAD_FONT\n"); + // create a copy of font_variant + char font_variant_lower[5] = ""; + if (font_variant != NULL) { + DEBUG_PRINT("Lowercasing variant\n"); + size_t length = strlen(font_variant); + for (size_t i = 0; i < length && i < 4; i++) // Ensure not to exceed array bounds + { + font_variant_lower[i] = tolower(font_variant[i]); + } + } else { + DEBUG_PRINT("Font variant is NULL\n"); + } + + DEBUG_PRINT("Loading font %s\n", font_variant_lower); + + char *fallback_font_variant = ""; + if (strcmp(font_variant_lower, "btfl") == 0) { + DEBUG_PRINT("Setting fallback font variant to bf\n"); + fallback_font_variant = "bf"; + } else if (strcmp(font_variant_lower, "ultr") == 0) { + DEBUG_PRINT("Setting fallback font variant to ultra\n"); + fallback_font_variant = "ultra"; + } + + // try the three paths for the current font + DEBUG_PRINT("Loading from: %s %s\n", SDCARD_FONT_PATH, font_variant_lower); + loaded_font = open_font(SDCARD_FONT_PATH, display_info, font_variant_lower); + if (loaded_font < 0 && strcmp(fallback_font_variant, "") != 0) { + DEBUG_PRINT( + "Loading fallback variant from: %s %s\n", SDCARD_FONT_PATH, fallback_font_variant); + loaded_font = open_font(SDCARD_FONT_PATH, display_info, fallback_font_variant); + } + if (loaded_font < 0) { + DEBUG_PRINT("Loading from: %s %s\n", FALLBACK_FONT_PATH, font_variant_lower); + loaded_font = open_font(FALLBACK_FONT_PATH, display_info, font_variant_lower); + } + if (loaded_font < 0 && strcmp(fallback_font_variant, "") != 0) { + DEBUG_PRINT("Loading fallback variant from: %s %s\n", FALLBACK_FONT_PATH, + fallback_font_variant); + loaded_font = open_font(FALLBACK_FONT_PATH, display_info, fallback_font_variant); + } + if (loaded_font < 0) { + DEBUG_PRINT("Loading from: %s %s\n", ENTWARE_FONT_PATH, font_variant_lower); + loaded_font = open_font(ENTWARE_FONT_PATH, display_info, font_variant_lower); + } + + // finally, if we have no fonts for this FC, fallback to the default + // font + if (loaded_font) { + DEBUG_PRINT("Loading generic from: %s\n", SDCARD_FONT_PATH); + loaded_font = open_font(SDCARD_FONT_PATH, display_info, ""); + if (loaded_font < 0) { + DEBUG_PRINT("Loading generic from: %s\n", FALLBACK_FONT_PATH); + loaded_font = open_font(FALLBACK_FONT_PATH, display_info, ""); + } + if (loaded_font < 0) { + DEBUG_PRINT("Loading generic from: %s\n", ENTWARE_FONT_PATH); + loaded_font = open_font(ENTWARE_FONT_PATH, display_info, ""); + } + } + } } void close_font(display_info_t *display_info) { - for(int i = 0; i < NUM_FONT_PAGES; i++) { - if(display_info->fonts[i] != NULL) { - free(display_info->fonts[i]); - display_info->fonts[i] = NULL; - } - } + for (int i = 0; i < NUM_FONT_PAGES; i++) { + if (display_info->fonts[i] != NULL) { + free(display_info->fonts[i]); + display_info->fonts[i] = NULL; + } + } } - diff --git a/osd/font/font.h b/osd/font/font.h index b806f0a..afa906a 100644 --- a/osd/font/font.h +++ b/osd/font/font.h @@ -10,17 +10,17 @@ #define FALLBACK_FONT NULL -typedef enum -{ - FONT_VARIANT_GENERIC, - FONT_VARIANT_BETAFLIGHT, - FONT_VARIANT_INAV, - FONT_VARIANT_ARDUPILOT, - FONT_VARIANT_KISS_ULTRA, - FONT_VARIANT_QUICKSILVER, - FONT_VARIANT_COUNT +typedef enum { + FONT_VARIANT_GENERIC, + FONT_VARIANT_BETAFLIGHT, + FONT_VARIANT_INAV, + FONT_VARIANT_ARDUPILOT, + FONT_VARIANT_KISS_ULTRA, + FONT_VARIANT_QUICKSILVER, + FONT_VARIANT_COUNT } font_variant_e; void load_font(display_info_t *display_info, const char *font_variant); void close_font(display_info_t *display_info); -void get_font_path_with_extension(char *font_path_dest, const char *font_path, const char *extension, uint8_t len, uint8_t is_hd, const char *font_variant); +void get_font_path_with_extension(char *font_path_dest, const char *font_path, + const char *extension, uint8_t len, uint8_t is_hd, const char *font_variant); diff --git a/osd/lz4/lz4.c b/osd/lz4/lz4.c index 8796f78..2676687 100644 --- a/osd/lz4/lz4.c +++ b/osd/lz4/lz4.c @@ -8,9 +8,9 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. @@ -28,21 +28,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. You can contact the author at : - - LZ4 homepage : http://www.lz4.org - - LZ4 source repository : https://github.com/lz4/lz4 + - LZ4 homepage : http://www.lz4.org + - LZ4 source repository : https://github.com/lz4/lz4 */ /*-************************************ -* Tuning parameters -**************************************/ + * Tuning parameters + **************************************/ /* * LZ4_HEAPMODE : * Select how stateless compression functions like `LZ4_compress_default()` * allocate memory for their hash table, - * in memory stack (0:default, fastest), or in memory heap (1:requires malloc()). + * in memory stack (0:default, fastest), or in memory heap (1:requires + * malloc()). */ #ifndef LZ4_HEAPMODE -# define LZ4_HEAPMODE 0 +#define LZ4_HEAPMODE 0 #endif /* @@ -57,53 +58,54 @@ */ #define LZ4_ACCELERATION_MAX 65537 - /*-************************************ -* CPU Feature Detection -**************************************/ + * CPU Feature Detection + **************************************/ /* LZ4_FORCE_MEMORY_ACCESS - * By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable. - * Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal. - * The below switch allow to select different access method for improved performance. - * Method 0 (default) : use `memcpy()`. Safe and portable. - * Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable). - * This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`. - * Method 2 : direct access. This method is portable but violate C standard. - * It can generate buggy code on targets which assembly generation depends on alignment. - * But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6) - * See https://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details. - * Prefer these methods in priority order (0 > 1 > 2) + * By default, access to unaligned memory is controlled by `memcpy()`, which is + * safe and portable. Unfortunately, on some target/compiler combinations, the + * generated assembly is sub-optimal. The below switch allow to select different + * access method for improved performance. Method 0 (default) : use `memcpy()`. + * Safe and portable. Method 1 : `__packed` statement. It depends on compiler + * extension (ie, not portable). This method is safe if your compiler supports + * it, and *generally* as fast or faster than `memcpy`. Method 2 : direct + * access. This method is portable but violate C standard. It can generate buggy + * code on targets which assembly generation depends on alignment. But in some + * circumstances, it's the only known way to get the most performance (ie GCC + + * ARMv6) See + * https://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html + * for details. Prefer these methods in priority order (0 > 1 > 2) */ -#ifndef LZ4_FORCE_MEMORY_ACCESS /* can be defined externally */ -# if defined(__GNUC__) && \ - ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) \ - || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) ) -# define LZ4_FORCE_MEMORY_ACCESS 2 -# elif (defined(__INTEL_COMPILER) && !defined(_WIN32)) || defined(__GNUC__) -# define LZ4_FORCE_MEMORY_ACCESS 1 -# endif +#ifndef LZ4_FORCE_MEMORY_ACCESS /* can be defined externally */ +#if defined(__GNUC__) && \ + (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || \ + defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)) +#define LZ4_FORCE_MEMORY_ACCESS 2 +#elif (defined(__INTEL_COMPILER) && !defined(_WIN32)) || defined(__GNUC__) +#define LZ4_FORCE_MEMORY_ACCESS 1 +#endif #endif /* * LZ4_FORCE_SW_BITCOUNT - * Define this parameter if your target system or compiler does not support hardware bit count + * Define this parameter if your target system or compiler does not support + * hardware bit count */ -#if defined(_MSC_VER) && defined(_WIN32_WCE) /* Visual Studio for WinCE doesn't support Hardware bit count */ -# undef LZ4_FORCE_SW_BITCOUNT /* avoid double def */ -# define LZ4_FORCE_SW_BITCOUNT +#if defined(_MSC_VER) && defined(_WIN32_WCE) /* Visual Studio for WinCE doesn't support Hardware \ + bit count */ +#undef LZ4_FORCE_SW_BITCOUNT /* avoid double def */ +#define LZ4_FORCE_SW_BITCOUNT #endif - - /*-************************************ -* Dependency -**************************************/ + * Dependency + **************************************/ /* * LZ4_SRC_INCLUDED: * Amalgamation flag, whether lz4.c is included */ #ifndef LZ4_SRC_INCLUDED -# define LZ4_SRC_INCLUDED 1 +#define LZ4_SRC_INCLUDED 1 #endif #ifndef LZ4_STATIC_LINKING_ONLY @@ -111,37 +113,38 @@ #endif #ifndef LZ4_DISABLE_DEPRECATE_WARNINGS -#define LZ4_DISABLE_DEPRECATE_WARNINGS /* due to LZ4_decompress_safe_withPrefix64k */ +#define LZ4_DISABLE_DEPRECATE_WARNINGS /* due to \ + LZ4_decompress_safe_withPrefix64k \ + */ #endif -#define LZ4_STATIC_LINKING_ONLY /* LZ4_DISTANCE_MAX */ +#define LZ4_STATIC_LINKING_ONLY /* LZ4_DISTANCE_MAX */ #include "lz4.h" /* see also "memory routines" below */ - /*-************************************ -* Compiler Options -**************************************/ -#if defined(_MSC_VER) && (_MSC_VER >= 1400) /* Visual Studio 2005+ */ -# include /* only present in VS2005+ */ -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ -# pragma warning(disable : 6237) /* disable: C6237: conditional expression is always 0 */ -#endif /* _MSC_VER */ + * Compiler Options + **************************************/ +#if defined(_MSC_VER) && (_MSC_VER >= 1400) /* Visual Studio 2005+ */ +#include /* only present in VS2005+ */ +#pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ +#pragma warning(disable : 6237) /* disable: C6237: conditional expression is always 0 */ +#endif /* _MSC_VER */ #ifndef LZ4_FORCE_INLINE -# ifdef _MSC_VER /* Visual Studio */ -# define LZ4_FORCE_INLINE static __forceinline -# else -# if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */ -# ifdef __GNUC__ -# define LZ4_FORCE_INLINE static inline __attribute__((always_inline)) -# else -# define LZ4_FORCE_INLINE static inline -# endif -# else -# define LZ4_FORCE_INLINE static -# endif /* __STDC_VERSION__ */ -# endif /* _MSC_VER */ +#ifdef _MSC_VER /* Visual Studio */ +#define LZ4_FORCE_INLINE static __forceinline +#else +#if defined(__cplusplus) || defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */ +#ifdef __GNUC__ +#define LZ4_FORCE_INLINE static inline __attribute__((always_inline)) +#else +#define LZ4_FORCE_INLINE static inline +#endif +#else +#define LZ4_FORCE_INLINE static +#endif /* __STDC_VERSION__ */ +#endif /* _MSC_VER */ #endif /* LZ4_FORCE_INLINE */ /* LZ4_FORCE_O2 and LZ4_FORCE_INLINE @@ -159,36 +162,36 @@ * of LZ4_wildCopy8 does not affect the compression speed. */ #if defined(__PPC64__) && defined(__LITTLE_ENDIAN__) && defined(__GNUC__) && !defined(__clang__) -# define LZ4_FORCE_O2 __attribute__((optimize("O2"))) -# undef LZ4_FORCE_INLINE -# define LZ4_FORCE_INLINE static __inline __attribute__((optimize("O2"),always_inline)) +#define LZ4_FORCE_O2 __attribute__((optimize("O2"))) +#undef LZ4_FORCE_INLINE +#define LZ4_FORCE_INLINE static __inline __attribute__((optimize("O2"), always_inline)) #else -# define LZ4_FORCE_O2 +#define LZ4_FORCE_O2 #endif -#if (defined(__GNUC__) && (__GNUC__ >= 3)) || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) || defined(__clang__) -# define expect(expr,value) (__builtin_expect ((expr),(value)) ) +#if (defined(__GNUC__) && (__GNUC__ >= 3)) || \ + (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) || defined(__clang__) +#define expect(expr, value) (__builtin_expect((expr), (value))) #else -# define expect(expr,value) (expr) +#define expect(expr, value) (expr) #endif #ifndef likely -#define likely(expr) expect((expr) != 0, 1) +#define likely(expr) expect((expr) != 0, 1) #endif #ifndef unlikely -#define unlikely(expr) expect((expr) != 0, 0) +#define unlikely(expr) expect((expr) != 0, 0) #endif /* Should the alignment test prove unreliable, for some reason, * it can be disabled by setting LZ4_ALIGN_TEST to 0 */ -#ifndef LZ4_ALIGN_TEST /* can be externally provided */ -# define LZ4_ALIGN_TEST 1 +#ifndef LZ4_ALIGN_TEST /* can be externally provided */ +#define LZ4_ALIGN_TEST 1 #endif - /*-************************************ -* Memory routines -**************************************/ + * Memory routines + **************************************/ /*! LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION : * Disable relatively high-level LZ4/HC functions that use dynamic memory @@ -200,502 +203,662 @@ * * The following public functions are removed when this symbol is defined. * - lz4 : LZ4_createStream, LZ4_freeStream, - * LZ4_createStreamDecode, LZ4_freeStreamDecode, LZ4_create (deprecated) + * LZ4_createStreamDecode, LZ4_freeStreamDecode, LZ4_create + * (deprecated) * - lz4hc : LZ4_createStreamHC, LZ4_freeStreamHC, * LZ4_createHC (deprecated), LZ4_freeHC (deprecated) * - lz4frame, lz4file : All LZ4F_* functions */ #if defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) -# define ALLOC(s) lz4_error_memory_allocation_is_disabled -# define ALLOC_AND_ZERO(s) lz4_error_memory_allocation_is_disabled -# define FREEMEM(p) lz4_error_memory_allocation_is_disabled +#define ALLOC(s) lz4_error_memory_allocation_is_disabled +#define ALLOC_AND_ZERO(s) lz4_error_memory_allocation_is_disabled +#define FREEMEM(p) lz4_error_memory_allocation_is_disabled #elif defined(LZ4_USER_MEMORY_FUNCTIONS) /* memory management functions can be customized by user project. * Below functions must exist somewhere in the Project * and be available at link time */ -void* LZ4_malloc(size_t s); -void* LZ4_calloc(size_t n, size_t s); -void LZ4_free(void* p); -# define ALLOC(s) LZ4_malloc(s) -# define ALLOC_AND_ZERO(s) LZ4_calloc(1,s) -# define FREEMEM(p) LZ4_free(p) +void *LZ4_malloc(size_t s); +void *LZ4_calloc(size_t n, size_t s); +void LZ4_free(void *p); +#define ALLOC(s) LZ4_malloc(s) +#define ALLOC_AND_ZERO(s) LZ4_calloc(1, s) +#define FREEMEM(p) LZ4_free(p) #else -# include /* malloc, calloc, free */ -# define ALLOC(s) malloc(s) -# define ALLOC_AND_ZERO(s) calloc(1,s) -# define FREEMEM(p) free(p) +#include /* malloc, calloc, free */ +#define ALLOC(s) malloc(s) +#define ALLOC_AND_ZERO(s) calloc(1, s) +#define FREEMEM(p) free(p) #endif -#if ! LZ4_FREESTANDING -# include /* memset, memcpy */ +#if !LZ4_FREESTANDING +#include /* memset, memcpy */ #endif #if !defined(LZ4_memset) -# define LZ4_memset(p,v,s) memset((p),(v),(s)) +#define LZ4_memset(p, v, s) memset((p), (v), (s)) #endif -#define MEM_INIT(p,v,s) LZ4_memset((p),(v),(s)) - +#define MEM_INIT(p, v, s) LZ4_memset((p), (v), (s)) /*-************************************ -* Common Constants -**************************************/ + * Common Constants + **************************************/ #define MINMATCH 4 #define WILDCOPYLENGTH 8 -#define LASTLITERALS 5 /* see ../doc/lz4_Block_format.md#parsing-restrictions */ -#define MFLIMIT 12 /* see ../doc/lz4_Block_format.md#parsing-restrictions */ -#define MATCH_SAFEGUARD_DISTANCE ((2*WILDCOPYLENGTH) - MINMATCH) /* ensure it's possible to write 2 x wildcopyLength without overflowing output buffer */ +#define LASTLITERALS \ + 5 /* see ../doc/lz4_Block_format.md#parsing-restrictions \ + */ +#define MFLIMIT 12 /* see ../doc/lz4_Block_format.md#parsing-restrictions */ +#define MATCH_SAFEGUARD_DISTANCE \ + ((2 * WILDCOPYLENGTH) - MINMATCH) /* ensure it's possible to write 2 x wildcopyLength \ + without overflowing output buffer */ #define FASTLOOP_SAFE_DISTANCE 64 -static const int LZ4_minLength = (MFLIMIT+1); +static const int LZ4_minLength = (MFLIMIT + 1); -#define KB *(1 <<10) -#define MB *(1 <<20) -#define GB *(1U<<30) +#define KB *(1 << 10) +#define MB *(1 << 20) +#define GB *(1U << 30) #define LZ4_DISTANCE_ABSOLUTE_MAX 65535 -#if (LZ4_DISTANCE_MAX > LZ4_DISTANCE_ABSOLUTE_MAX) /* max supported by LZ4 format */ -# error "LZ4_DISTANCE_MAX is too big : must be <= 65535" +#if (LZ4_DISTANCE_MAX > LZ4_DISTANCE_ABSOLUTE_MAX) /* max supported by LZ4 format */ +#error "LZ4_DISTANCE_MAX is too big : must be <= 65535" #endif -#define ML_BITS 4 -#define ML_MASK ((1U<=1) -# include + * Error detection + **************************************/ +#if defined(LZ4_DEBUG) && (LZ4_DEBUG >= 1) +#include #else -# ifndef assert -# define assert(condition) ((void)0) -# endif +#ifndef assert +#define assert(condition) ((void)0) +#endif #endif -#define LZ4_STATIC_ASSERT(c) { enum { LZ4_static_assert = 1/(int)(!!(c)) }; } /* use after variable declarations */ - -#if defined(LZ4_DEBUG) && (LZ4_DEBUG>=2) -# include - static int g_debuglog_enable = 1; -# define DEBUGLOG(l, ...) { \ - if ((g_debuglog_enable) && (l<=LZ4_DEBUG)) { \ - fprintf(stderr, __FILE__ " %i: ", __LINE__); \ - fprintf(stderr, __VA_ARGS__); \ - fprintf(stderr, " \n"); \ - } } +#define LZ4_STATIC_ASSERT(c) \ + { \ + enum { LZ4_static_assert = 1 / (int)(!!(c)) }; \ + } /* use after variable declarations */ + +#if defined(LZ4_DEBUG) && (LZ4_DEBUG >= 2) +#include +static int g_debuglog_enable = 1; +#define DEBUGLOG(l, ...) \ + { \ + if ((g_debuglog_enable) && (l <= LZ4_DEBUG)) { \ + fprintf(stderr, __FILE__ " %i: ", __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, " \n"); \ + } \ + } #else -# define DEBUGLOG(l, ...) {} /* disabled */ +#define DEBUGLOG(l, ...) \ + {} /* disabled */ #endif -static int LZ4_isAligned(const void* ptr, size_t alignment) -{ - return ((size_t)ptr & (alignment -1)) == 0; +static int LZ4_isAligned(const void *ptr, size_t alignment) { + return ((size_t)ptr & (alignment - 1)) == 0; } - /*-************************************ -* Types -**************************************/ + * Types + **************************************/ #include -#if defined(__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) -# include - typedef uint8_t BYTE; - typedef uint16_t U16; - typedef uint32_t U32; - typedef int32_t S32; - typedef uint64_t U64; - typedef uintptr_t uptrval; +#if defined(__cplusplus) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) +#include +typedef uint8_t BYTE; +typedef uint16_t U16; +typedef uint32_t U32; +typedef int32_t S32; +typedef uint64_t U64; +typedef uintptr_t uptrval; #else -# if UINT_MAX != 4294967295UL -# error "LZ4 code (when not C++ or C99) assumes that sizeof(int) == 4" -# endif - typedef unsigned char BYTE; - typedef unsigned short U16; - typedef unsigned int U32; - typedef signed int S32; - typedef unsigned long long U64; - typedef size_t uptrval; /* generally true, except OpenVMS-64 */ +#if UINT_MAX != 4294967295UL +#error "LZ4 code (when not C++ or C99) assumes that sizeof(int) == 4" +#endif +typedef unsigned char BYTE; +typedef unsigned short U16; +typedef unsigned int U32; +typedef signed int S32; +typedef unsigned long long U64; +typedef size_t uptrval; /* generally true, except OpenVMS-64 */ #endif #if defined(__x86_64__) - typedef U64 reg_t; /* 64-bits in x32 mode */ +typedef U64 reg_t; /* 64-bits in x32 mode */ #else - typedef size_t reg_t; /* 32-bits in x32 mode */ +typedef size_t reg_t; /* 32-bits in x32 mode */ #endif -typedef enum { - notLimited = 0, - limitedOutput = 1, - fillOutput = 2 -} limitedOutput_directive; - +typedef enum { notLimited = 0, limitedOutput = 1, fillOutput = 2 } limitedOutput_directive; /*-************************************ -* Reading and writing into memory -**************************************/ + * Reading and writing into memory + **************************************/ /** * LZ4 relies on memcpy with a constant size being inlined. In freestanding * environments, the compiler can't assume the implementation of memcpy() is * standard compliant, so it can't apply its specialized memcpy() inlining * logic. When possible, use __builtin_memcpy() to tell the compiler to analyze - * memcpy() as if it were standard compliant, so it can inline it in freestanding - * environments. This is needed when decompressing the Linux Kernel, for example. + * memcpy() as if it were standard compliant, so it can inline it in + * freestanding environments. This is needed when decompressing the Linux + * Kernel, for example. */ #if !defined(LZ4_memcpy) -# if defined(__GNUC__) && (__GNUC__ >= 4) -# define LZ4_memcpy(dst, src, size) __builtin_memcpy(dst, src, size) -# else -# define LZ4_memcpy(dst, src, size) memcpy(dst, src, size) -# endif +#if defined(__GNUC__) && (__GNUC__ >= 4) +#define LZ4_memcpy(dst, src, size) __builtin_memcpy(dst, src, size) +#else +#define LZ4_memcpy(dst, src, size) memcpy(dst, src, size) +#endif #endif #if !defined(LZ4_memmove) -# if defined(__GNUC__) && (__GNUC__ >= 4) -# define LZ4_memmove __builtin_memmove -# else -# define LZ4_memmove memmove -# endif +#if defined(__GNUC__) && (__GNUC__ >= 4) +#define LZ4_memmove __builtin_memmove +#else +#define LZ4_memmove memmove +#endif #endif -static unsigned LZ4_isLittleEndian(void) -{ - const union { U32 u; BYTE c[4]; } one = { 1 }; /* don't use static : performance detrimental */ - return one.c[0]; -} +static unsigned LZ4_isLittleEndian(void) { + const union { + U32 u; + BYTE c[4]; + } one = {1}; /* don't use static : performance detrimental */ + return one.c[0]; +} -#if defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS==2) +#if defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS == 2) /* lie to the compiler about data alignment; use with caution */ -static U16 LZ4_read16(const void* memPtr) { return *(const U16*) memPtr; } -static U32 LZ4_read32(const void* memPtr) { return *(const U32*) memPtr; } -static reg_t LZ4_read_ARCH(const void* memPtr) { return *(const reg_t*) memPtr; } +static U16 LZ4_read16(const void *memPtr) { return *(const U16 *)memPtr; } + +static U32 LZ4_read32(const void *memPtr) { return *(const U32 *)memPtr; } -static void LZ4_write16(void* memPtr, U16 value) { *(U16*)memPtr = value; } -static void LZ4_write32(void* memPtr, U32 value) { *(U32*)memPtr = value; } +static reg_t LZ4_read_ARCH(const void *memPtr) { return *(const reg_t *)memPtr; } -#elif defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS==1) +static void LZ4_write16(void *memPtr, U16 value) { *(U16 *)memPtr = value; } -/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */ +static void LZ4_write32(void *memPtr, U32 value) { *(U32 *)memPtr = value; } + +#elif defined(LZ4_FORCE_MEMORY_ACCESS) && (LZ4_FORCE_MEMORY_ACCESS == 1) + +/* __pack instructions are safer, but compiler specific, hence potentially + * problematic for some compilers */ /* currently only defined for gcc and icc */ -typedef struct { U16 u16; } __attribute__((packed)) LZ4_unalign16; -typedef struct { U32 u32; } __attribute__((packed)) LZ4_unalign32; -typedef struct { reg_t uArch; } __attribute__((packed)) LZ4_unalignST; +typedef struct { + U16 u16; +} __attribute__((packed)) LZ4_unalign16; -static U16 LZ4_read16(const void* ptr) { return ((const LZ4_unalign16*)ptr)->u16; } -static U32 LZ4_read32(const void* ptr) { return ((const LZ4_unalign32*)ptr)->u32; } -static reg_t LZ4_read_ARCH(const void* ptr) { return ((const LZ4_unalignST*)ptr)->uArch; } +typedef struct { + U32 u32; +} __attribute__((packed)) LZ4_unalign32; -static void LZ4_write16(void* memPtr, U16 value) { ((LZ4_unalign16*)memPtr)->u16 = value; } -static void LZ4_write32(void* memPtr, U32 value) { ((LZ4_unalign32*)memPtr)->u32 = value; } +typedef struct { + reg_t uArch; +} __attribute__((packed)) LZ4_unalignST; -#else /* safe and portable access using memcpy() */ +static U16 LZ4_read16(const void *ptr) { return ((const LZ4_unalign16 *)ptr)->u16; } -static U16 LZ4_read16(const void* memPtr) -{ - U16 val; LZ4_memcpy(&val, memPtr, sizeof(val)); return val; -} +static U32 LZ4_read32(const void *ptr) { return ((const LZ4_unalign32 *)ptr)->u32; } -static U32 LZ4_read32(const void* memPtr) -{ - U32 val; LZ4_memcpy(&val, memPtr, sizeof(val)); return val; -} +static reg_t LZ4_read_ARCH(const void *ptr) { return ((const LZ4_unalignST *)ptr)->uArch; } + +static void LZ4_write16(void *memPtr, U16 value) { ((LZ4_unalign16 *)memPtr)->u16 = value; } + +static void LZ4_write32(void *memPtr, U32 value) { ((LZ4_unalign32 *)memPtr)->u32 = value; } -static reg_t LZ4_read_ARCH(const void* memPtr) -{ - reg_t val; LZ4_memcpy(&val, memPtr, sizeof(val)); return val; +#else /* safe and portable access using memcpy() */ + +static U16 LZ4_read16(const void *memPtr) { + U16 val; + LZ4_memcpy(&val, memPtr, sizeof(val)); + return val; } -static void LZ4_write16(void* memPtr, U16 value) -{ - LZ4_memcpy(memPtr, &value, sizeof(value)); +static U32 LZ4_read32(const void *memPtr) { + U32 val; + LZ4_memcpy(&val, memPtr, sizeof(val)); + return val; } -static void LZ4_write32(void* memPtr, U32 value) -{ - LZ4_memcpy(memPtr, &value, sizeof(value)); +static reg_t LZ4_read_ARCH(const void *memPtr) { + reg_t val; + LZ4_memcpy(&val, memPtr, sizeof(val)); + return val; } -#endif /* LZ4_FORCE_MEMORY_ACCESS */ +static void LZ4_write16(void *memPtr, U16 value) { LZ4_memcpy(memPtr, &value, sizeof(value)); } +static void LZ4_write32(void *memPtr, U32 value) { LZ4_memcpy(memPtr, &value, sizeof(value)); } -static U16 LZ4_readLE16(const void* memPtr) -{ - if (LZ4_isLittleEndian()) { - return LZ4_read16(memPtr); - } else { - const BYTE* p = (const BYTE*)memPtr; - return (U16)((U16)p[0] + (p[1]<<8)); - } +#endif /* LZ4_FORCE_MEMORY_ACCESS */ + +static U16 LZ4_readLE16(const void *memPtr) { + if (LZ4_isLittleEndian()) { + return LZ4_read16(memPtr); + } else { + const BYTE *p = (const BYTE *)memPtr; + return (U16)((U16)p[0] + (p[1] << 8)); + } } -static void LZ4_writeLE16(void* memPtr, U16 value) -{ - if (LZ4_isLittleEndian()) { - LZ4_write16(memPtr, value); - } else { - BYTE* p = (BYTE*)memPtr; - p[0] = (BYTE) value; - p[1] = (BYTE)(value>>8); - } +static void LZ4_writeLE16(void *memPtr, U16 value) { + if (LZ4_isLittleEndian()) { + LZ4_write16(memPtr, value); + } else { + BYTE *p = (BYTE *)memPtr; + p[0] = (BYTE)value; + p[1] = (BYTE)(value >> 8); + } } -/* customized variant of memcpy, which can overwrite up to 8 bytes beyond dstEnd */ +/* customized variant of memcpy, which can overwrite up to 8 bytes beyond dstEnd + */ LZ4_FORCE_INLINE -void LZ4_wildCopy8(void* dstPtr, const void* srcPtr, void* dstEnd) -{ - BYTE* d = (BYTE*)dstPtr; - const BYTE* s = (const BYTE*)srcPtr; - BYTE* const e = (BYTE*)dstEnd; +void LZ4_wildCopy8(void *dstPtr, const void *srcPtr, void *dstEnd) { + BYTE *d = (BYTE *)dstPtr; + const BYTE *s = (const BYTE *)srcPtr; + BYTE *const e = (BYTE *)dstEnd; - do { LZ4_memcpy(d,s,8); d+=8; s+=8; } while (d= 16. */ -LZ4_FORCE_INLINE void -LZ4_wildCopy32(void* dstPtr, const void* srcPtr, void* dstEnd) -{ - BYTE* d = (BYTE*)dstPtr; - const BYTE* s = (const BYTE*)srcPtr; - BYTE* const e = (BYTE*)dstEnd; +LZ4_FORCE_INLINE void LZ4_wildCopy32(void *dstPtr, const void *srcPtr, void *dstEnd) { + BYTE *d = (BYTE *)dstPtr; + const BYTE *s = (const BYTE *)srcPtr; + BYTE *const e = (BYTE *)dstEnd; - do { LZ4_memcpy(d,s,16); LZ4_memcpy(d+16,s+16,16); d+=32; s+=32; } while (d= dstPtr + MINMATCH * - there is at least 8 bytes available to write after dstEnd */ -LZ4_FORCE_INLINE void -LZ4_memcpy_using_offset(BYTE* dstPtr, const BYTE* srcPtr, BYTE* dstEnd, const size_t offset) -{ - BYTE v[8]; - - assert(dstEnd >= dstPtr + MINMATCH); - - switch(offset) { - case 1: - MEM_INIT(v, *srcPtr, 8); - break; - case 2: - LZ4_memcpy(v, srcPtr, 2); - LZ4_memcpy(&v[2], srcPtr, 2); -#if defined(_MSC_VER) && (_MSC_VER <= 1933) /* MSVC 2022 ver 17.3 or earlier */ -# pragma warning(push) -# pragma warning(disable : 6385) /* warning C6385: Reading invalid data from 'v'. */ +LZ4_FORCE_INLINE void LZ4_memcpy_using_offset( + BYTE *dstPtr, const BYTE *srcPtr, BYTE *dstEnd, const size_t offset) { + BYTE v[8]; + + assert(dstEnd >= dstPtr + MINMATCH); + + switch (offset) { + case 1: + MEM_INIT(v, *srcPtr, 8); + break; + case 2: + LZ4_memcpy(v, srcPtr, 2); + LZ4_memcpy(&v[2], srcPtr, 2); +#if defined(_MSC_VER) && (_MSC_VER <= 1933) /* MSVC 2022 ver 17.3 or earlier \ + */ +#pragma warning(push) +#pragma warning(disable : 6385) /* warning C6385: Reading invalid data from 'v'. */ #endif - LZ4_memcpy(&v[4], v, 4); -#if defined(_MSC_VER) && (_MSC_VER <= 1933) /* MSVC 2022 ver 17.3 or earlier */ -# pragma warning(pop) + LZ4_memcpy(&v[4], v, 4); +#if defined(_MSC_VER) && (_MSC_VER <= 1933) /* MSVC 2022 ver 17.3 or earlier \ + */ +#pragma warning(pop) #endif - break; - case 4: - LZ4_memcpy(v, srcPtr, 4); - LZ4_memcpy(&v[4], srcPtr, 4); - break; - default: - LZ4_memcpy_using_offset_base(dstPtr, srcPtr, dstEnd, offset); - return; - } - - LZ4_memcpy(dstPtr, v, 8); - dstPtr += 8; - while (dstPtr < dstEnd) { - LZ4_memcpy(dstPtr, v, 8); - dstPtr += 8; - } + break; + case 4: + LZ4_memcpy(v, srcPtr, 4); + LZ4_memcpy(&v[4], srcPtr, 4); + break; + default: + LZ4_memcpy_using_offset_base(dstPtr, srcPtr, dstEnd, offset); + return; + } + + LZ4_memcpy(dstPtr, v, 8); + dstPtr += 8; + while (dstPtr < dstEnd) { + LZ4_memcpy(dstPtr, v, 8); + dstPtr += 8; + } } #endif - /*-************************************ -* Common functions -**************************************/ -static unsigned LZ4_NbCommonBytes (reg_t val) -{ - assert(val != 0); - if (LZ4_isLittleEndian()) { - if (sizeof(val) == 8) { -# if defined(_MSC_VER) && (_MSC_VER >= 1800) && (defined(_M_AMD64) && !defined(_M_ARM64EC)) && !defined(LZ4_FORCE_SW_BITCOUNT) + * Common functions + **************************************/ +static unsigned LZ4_NbCommonBytes(reg_t val) { + assert(val != 0); + if (LZ4_isLittleEndian()) { + if (sizeof(val) == 8) { +#if defined(_MSC_VER) && (_MSC_VER >= 1800) && (defined(_M_AMD64) && !defined(_M_ARM64EC)) && \ + !defined(LZ4_FORCE_SW_BITCOUNT) /*-************************************************************************************************* -* ARM64EC is a Microsoft-designed ARM64 ABI compatible with AMD64 applications on ARM64 Windows 11. -* The ARM64EC ABI does not support AVX/AVX2/AVX512 instructions, nor their relevant intrinsics -* including _tzcnt_u64. Therefore, we need to neuter the _tzcnt_u64 code path for ARM64EC. -****************************************************************************************************/ -# if defined(__clang__) && (__clang_major__ < 10) - /* Avoid undefined clang-cl intrinsics issue. - * See https://github.com/lz4/lz4/pull/1017 for details. */ - return (unsigned)__builtin_ia32_tzcnt_u64(val) >> 3; -# else - /* x64 CPUS without BMI support interpret `TZCNT` as `REP BSF` */ - return (unsigned)_tzcnt_u64(val) >> 3; -# endif -# elif defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT) - unsigned long r = 0; - _BitScanForward64(&r, (U64)val); - return (unsigned)r >> 3; -# elif (defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 3) || \ - ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \ - !defined(LZ4_FORCE_SW_BITCOUNT) - return (unsigned)__builtin_ctzll((U64)val) >> 3; -# else - const U64 m = 0x0101010101010101ULL; - val ^= val - 1; - return (unsigned)(((U64)((val & (m - 1)) * m)) >> 56); -# endif - } else /* 32 bits */ { -# if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(LZ4_FORCE_SW_BITCOUNT) - unsigned long r; - _BitScanForward(&r, (U32)val); - return (unsigned)r >> 3; -# elif (defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 3) || \ - ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \ - !defined(__TINYC__) && !defined(LZ4_FORCE_SW_BITCOUNT) - return (unsigned)__builtin_ctz((U32)val) >> 3; -# else - const U32 m = 0x01010101; - return (unsigned)((((val - 1) ^ val) & (m - 1)) * m) >> 24; -# endif - } - } else /* Big Endian CPU */ { - if (sizeof(val)==8) { -# if (defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 3) || \ - ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \ - !defined(__TINYC__) && !defined(LZ4_FORCE_SW_BITCOUNT) - return (unsigned)__builtin_clzll((U64)val) >> 3; -# else + * ARM64EC is a Microsoft-designed ARM64 ABI compatible with AMD64 applications + *on ARM64 Windows 11. The ARM64EC ABI does not support AVX/AVX2/AVX512 + *instructions, nor their relevant intrinsics including _tzcnt_u64. Therefore, + *we need to neuter the _tzcnt_u64 code path for ARM64EC. + ****************************************************************************************************/ +#if defined(__clang__) && (__clang_major__ < 10) + /* Avoid undefined clang-cl intrinsics issue. + * See https://github.com/lz4/lz4/pull/1017 for details. */ + return (unsigned)__builtin_ia32_tzcnt_u64(val) >> 3; +#else + /* x64 CPUS without BMI support interpret `TZCNT` as `REP BSF` */ + return (unsigned)_tzcnt_u64(val) >> 3; +#endif +#elif defined(_MSC_VER) && defined(_WIN64) && !defined(LZ4_FORCE_SW_BITCOUNT) + unsigned long r = 0; + _BitScanForward64(&r, (U64)val); + return (unsigned)r >> 3; +#elif (defined(__clang__) || \ + (defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \ + !defined(LZ4_FORCE_SW_BITCOUNT) + return (unsigned)__builtin_ctzll((U64)val) >> 3; +#else + const U64 m = 0x0101010101010101ULL; + val ^= val - 1; + return (unsigned)(((U64)((val & (m - 1)) * m)) >> 56); +#endif + } else /* 32 bits */ { +#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(LZ4_FORCE_SW_BITCOUNT) + unsigned long r; + _BitScanForward(&r, (U32)val); + return (unsigned)r >> 3; +#elif (defined(__clang__) || \ + (defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \ + !defined(__TINYC__) && !defined(LZ4_FORCE_SW_BITCOUNT) + return (unsigned)__builtin_ctz((U32)val) >> 3; +#else + const U32 m = 0x01010101; + return (unsigned)((((val - 1) ^ val) & (m - 1)) * m) >> 24; +#endif + } + } else /* Big Endian CPU */ { + if (sizeof(val) == 8) { +#if (defined(__clang__) || \ + (defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \ + !defined(__TINYC__) && !defined(LZ4_FORCE_SW_BITCOUNT) + return (unsigned)__builtin_clzll((U64)val) >> 3; +#else #if 1 - /* this method is probably faster, - * but adds a 128 bytes lookup table */ - static const unsigned char ctz7_tab[128] = { - 7, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, - 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, - 5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, - 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, - 6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, - 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, - 5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, - 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, - }; - U64 const mask = 0x0101010101010101ULL; - U64 const t = (((val >> 8) - mask) | val) & mask; - return ctz7_tab[(t * 0x0080402010080402ULL) >> 57]; + /* this method is probably faster, + * but adds a 128 bytes lookup table */ + static const unsigned char ctz7_tab[128] = { + 7, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 4, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 5, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 4, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 6, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 4, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 5, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 4, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1, + 0, + }; + U64 const mask = 0x0101010101010101ULL; + U64 const t = (((val >> 8) - mask) | val) & mask; + return ctz7_tab[(t * 0x0080402010080402ULL) >> 57]; #else - /* this method doesn't consume memory space like the previous one, - * but it contains several branches, - * that may end up slowing execution */ - static const U32 by32 = sizeof(val)*4; /* 32 on 64 bits (goal), 16 on 32 bits. - Just to avoid some static analyzer complaining about shift by 32 on 32-bits target. - Note that this code path is never triggered in 32-bits mode. */ - unsigned r; - if (!(val>>by32)) { r=4; } else { r=0; val>>=by32; } - if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; } - r += (!val); - return r; + /* this method doesn't consume memory space like the previous one, + * but it contains several branches, + * that may end up slowing execution */ + static const U32 by32 = sizeof(val) * 4; /* 32 on 64 bits (goal), 16 on 32 bits. + Just to avoid some static analyzer complaining about shift by 32 on 32-bits + target. Note that this code path is never triggered in 32-bits mode. */ + unsigned r; + if (!(val >> by32)) { + r = 4; + } else { + r = 0; + val >>= by32; + } + if (!(val >> 16)) { + r += 2; + val >>= 8; + } else { + val >>= 24; + } + r += (!val); + return r; #endif -# endif - } else /* 32 bits */ { -# if (defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 3) || \ - ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \ - !defined(LZ4_FORCE_SW_BITCOUNT) - return (unsigned)__builtin_clz((U32)val) >> 3; -# else - val >>= 8; - val = ((((val + 0x00FFFF00) | 0x00FFFFFF) + val) | - (val + 0x00FF0000)) >> 24; - return (unsigned)val ^ 3; -# endif - } - } +#endif + } else /* 32 bits */ { +#if (defined(__clang__) || \ + (defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))))) && \ + !defined(LZ4_FORCE_SW_BITCOUNT) + return (unsigned)__builtin_clz((U32)val) >> 3; +#else + val >>= 8; + val = ((((val + 0x00FFFF00) | 0x00FFFFFF) + val) | (val + 0x00FF0000)) >> 24; + return (unsigned)val ^ 3; +#endif + } + } } - #define STEPSIZE sizeof(reg_t) -LZ4_FORCE_INLINE -unsigned LZ4_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* pInLimit) -{ - const BYTE* const pStart = pIn; - - if (likely(pIn < pInLimit-(STEPSIZE-1))) { - reg_t const diff = LZ4_read_ARCH(pMatch) ^ LZ4_read_ARCH(pIn); - if (!diff) { - pIn+=STEPSIZE; pMatch+=STEPSIZE; - } else { - return LZ4_NbCommonBytes(diff); - } } - while (likely(pIn < pInLimit-(STEPSIZE-1))) { - reg_t const diff = LZ4_read_ARCH(pMatch) ^ LZ4_read_ARCH(pIn); - if (!diff) { pIn+=STEPSIZE; pMatch+=STEPSIZE; continue; } - pIn += LZ4_NbCommonBytes(diff); - return (unsigned)(pIn - pStart); - } - - if ((STEPSIZE==8) && (pIn<(pInLimit-3)) && (LZ4_read32(pMatch) == LZ4_read32(pIn))) { pIn+=4; pMatch+=4; } - if ((pIn<(pInLimit-1)) && (LZ4_read16(pMatch) == LZ4_read16(pIn))) { pIn+=2; pMatch+=2; } - if ((pIn compression run slower on incompressible data */ - + * Local Constants + **************************************/ +static const int LZ4_64Klimit = ((64 KB) + (MFLIMIT - 1)); +static const U32 LZ4_skipTrigger = 6; /* Increase this value ==> compression run + slower on incompressible data */ /*-************************************ -* Local Structures and types -**************************************/ + * Local Structures and types + **************************************/ typedef enum { clearedTable = 0, byPtr, byU32, byU16 } tableType_t; /** @@ -722,103 +885,124 @@ typedef enum { clearedTable = 0, byPtr, byU32, byU16 } tableType_t; * ->dictCtx->hashTable. */ typedef enum { noDict = 0, withPrefix64k, usingExtDict, usingDictCtx } dict_directive; -typedef enum { noDictIssue = 0, dictSmall } dictIssue_directive; +typedef enum { noDictIssue = 0, dictSmall } dictIssue_directive; /*-************************************ -* Local Utils -**************************************/ -int LZ4_versionNumber (void) { return LZ4_VERSION_NUMBER; } -const char* LZ4_versionString(void) { return LZ4_VERSION_STRING; } -int LZ4_compressBound(int isize) { return LZ4_COMPRESSBOUND(isize); } -int LZ4_sizeofState(void) { return sizeof(LZ4_stream_t); } + * Local Utils + **************************************/ +int LZ4_versionNumber(void) { return LZ4_VERSION_NUMBER; } + +const char *LZ4_versionString(void) { return LZ4_VERSION_STRING; } + +int LZ4_compressBound(int isize) { return LZ4_COMPRESSBOUND(isize); } +int LZ4_sizeofState(void) { return sizeof(LZ4_stream_t); } /*-**************************************** -* Internal Definitions, used only in Tests -*******************************************/ -#if defined (__cplusplus) + * Internal Definitions, used only in Tests + *******************************************/ +#if defined(__cplusplus) extern "C" { #endif -int LZ4_compress_forceExtDict (LZ4_stream_t* LZ4_dict, const char* source, char* dest, int srcSize); +int LZ4_compress_forceExtDict(LZ4_stream_t *LZ4_dict, const char *source, char *dest, int srcSize); -int LZ4_decompress_safe_forceExtDict(const char* source, char* dest, - int compressedSize, int maxOutputSize, - const void* dictStart, size_t dictSize); -int LZ4_decompress_safe_partial_forceExtDict(const char* source, char* dest, - int compressedSize, int targetOutputSize, int dstCapacity, - const void* dictStart, size_t dictSize); -#if defined (__cplusplus) +int LZ4_decompress_safe_forceExtDict(const char *source, char *dest, int compressedSize, + int maxOutputSize, const void *dictStart, size_t dictSize); +int LZ4_decompress_safe_partial_forceExtDict(const char *source, char *dest, int compressedSize, + int targetOutputSize, int dstCapacity, const void *dictStart, size_t dictSize); +#if defined(__cplusplus) } #endif /*-****************************** -* Compression functions -********************************/ -LZ4_FORCE_INLINE U32 LZ4_hash4(U32 sequence, tableType_t const tableType) -{ - if (tableType == byU16) - return ((sequence * 2654435761U) >> ((MINMATCH*8)-(LZ4_HASHLOG+1))); - else - return ((sequence * 2654435761U) >> ((MINMATCH*8)-LZ4_HASHLOG)); -} - -LZ4_FORCE_INLINE U32 LZ4_hash5(U64 sequence, tableType_t const tableType) -{ - const U32 hashLog = (tableType == byU16) ? LZ4_HASHLOG+1 : LZ4_HASHLOG; - if (LZ4_isLittleEndian()) { - const U64 prime5bytes = 889523592379ULL; - return (U32)(((sequence << 24) * prime5bytes) >> (64 - hashLog)); - } else { - const U64 prime8bytes = 11400714785074694791ULL; - return (U32)(((sequence >> 24) * prime8bytes) >> (64 - hashLog)); - } -} - -LZ4_FORCE_INLINE U32 LZ4_hashPosition(const void* const p, tableType_t const tableType) -{ - if ((sizeof(reg_t)==8) && (tableType != byU16)) return LZ4_hash5(LZ4_read_ARCH(p), tableType); - return LZ4_hash4(LZ4_read32(p), tableType); -} - -LZ4_FORCE_INLINE void LZ4_clearHash(U32 h, void* tableBase, tableType_t const tableType) -{ - switch (tableType) - { - default: /* fallthrough */ - case clearedTable: { /* illegal! */ assert(0); return; } - case byPtr: { const BYTE** hashTable = (const BYTE**)tableBase; hashTable[h] = NULL; return; } - case byU32: { U32* hashTable = (U32*) tableBase; hashTable[h] = 0; return; } - case byU16: { U16* hashTable = (U16*) tableBase; hashTable[h] = 0; return; } - } -} - -LZ4_FORCE_INLINE void LZ4_putIndexOnHash(U32 idx, U32 h, void* tableBase, tableType_t const tableType) -{ - switch (tableType) - { - default: /* fallthrough */ - case clearedTable: /* fallthrough */ - case byPtr: { /* illegal! */ assert(0); return; } - case byU32: { U32* hashTable = (U32*) tableBase; hashTable[h] = idx; return; } - case byU16: { U16* hashTable = (U16*) tableBase; assert(idx < 65536); hashTable[h] = (U16)idx; return; } - } + * Compression functions + ********************************/ +LZ4_FORCE_INLINE U32 LZ4_hash4(U32 sequence, tableType_t const tableType) { + if (tableType == byU16) + return ((sequence * 2654435761U) >> ((MINMATCH * 8) - (LZ4_HASHLOG + 1))); + else + return ((sequence * 2654435761U) >> ((MINMATCH * 8) - LZ4_HASHLOG)); +} + +LZ4_FORCE_INLINE U32 LZ4_hash5(U64 sequence, tableType_t const tableType) { + const U32 hashLog = (tableType == byU16) ? LZ4_HASHLOG + 1 : LZ4_HASHLOG; + if (LZ4_isLittleEndian()) { + const U64 prime5bytes = 889523592379ULL; + return (U32)(((sequence << 24) * prime5bytes) >> (64 - hashLog)); + } else { + const U64 prime8bytes = 11400714785074694791ULL; + return (U32)(((sequence >> 24) * prime8bytes) >> (64 - hashLog)); + } +} + +LZ4_FORCE_INLINE U32 LZ4_hashPosition(const void *const p, tableType_t const tableType) { + if ((sizeof(reg_t) == 8) && (tableType != byU16)) + return LZ4_hash5(LZ4_read_ARCH(p), tableType); + return LZ4_hash4(LZ4_read32(p), tableType); +} + +LZ4_FORCE_INLINE void LZ4_clearHash(U32 h, void *tableBase, tableType_t const tableType) { + switch (tableType) { + default: /* fallthrough */ + case clearedTable: { /* illegal! */ + assert(0); + return; + } + case byPtr: { + const BYTE **hashTable = (const BYTE **)tableBase; + hashTable[h] = NULL; + return; + } + case byU32: { + U32 *hashTable = (U32 *)tableBase; + hashTable[h] = 0; + return; + } + case byU16: { + U16 *hashTable = (U16 *)tableBase; + hashTable[h] = 0; + return; + } + } +} + +LZ4_FORCE_INLINE void LZ4_putIndexOnHash( + U32 idx, U32 h, void *tableBase, tableType_t const tableType) { + switch (tableType) { + default: /* fallthrough */ + case clearedTable: /* fallthrough */ + case byPtr: { /* illegal! */ + assert(0); + return; + } + case byU32: { + U32 *hashTable = (U32 *)tableBase; + hashTable[h] = idx; + return; + } + case byU16: { + U16 *hashTable = (U16 *)tableBase; + assert(idx < 65536); + hashTable[h] = (U16)idx; + return; + } + } } /* LZ4_putPosition*() : only used in byPtr mode */ -LZ4_FORCE_INLINE void LZ4_putPositionOnHash(const BYTE* p, U32 h, - void* tableBase, tableType_t const tableType) -{ - const BYTE** const hashTable = (const BYTE**)tableBase; - assert(tableType == byPtr); (void)tableType; - hashTable[h] = p; +LZ4_FORCE_INLINE void LZ4_putPositionOnHash( + const BYTE *p, U32 h, void *tableBase, tableType_t const tableType) { + const BYTE **const hashTable = (const BYTE **)tableBase; + assert(tableType == byPtr); + (void)tableType; + hashTable[h] = p; } -LZ4_FORCE_INLINE void LZ4_putPosition(const BYTE* p, void* tableBase, tableType_t tableType) -{ - U32 const h = LZ4_hashPosition(p, tableType); - LZ4_putPositionOnHash(p, h, tableBase, tableType); +LZ4_FORCE_INLINE void LZ4_putPosition(const BYTE *p, void *tableBase, tableType_t tableType) { + U32 const h = LZ4_hashPosition(p, tableType); + LZ4_putPositionOnHash(p, h, tableBase, tableType); } /* LZ4_getIndexOnHash() : @@ -827,75 +1011,72 @@ LZ4_FORCE_INLINE void LZ4_putPosition(const BYTE* p, void* tableBase, tableType_ * Assumption 1 : only valid if tableType == byU32 or byU16. * Assumption 2 : h is presumed valid (within limits of hash table) */ -LZ4_FORCE_INLINE U32 LZ4_getIndexOnHash(U32 h, const void* tableBase, tableType_t tableType) -{ - LZ4_STATIC_ASSERT(LZ4_MEMORY_USAGE > 2); - if (tableType == byU32) { - const U32* const hashTable = (const U32*) tableBase; - assert(h < (1U << (LZ4_MEMORY_USAGE-2))); - return hashTable[h]; - } - if (tableType == byU16) { - const U16* const hashTable = (const U16*) tableBase; - assert(h < (1U << (LZ4_MEMORY_USAGE-1))); - return hashTable[h]; - } - assert(0); return 0; /* forbidden case */ -} - -static const BYTE* LZ4_getPositionOnHash(U32 h, const void* tableBase, tableType_t tableType) -{ - assert(tableType == byPtr); (void)tableType; - { const BYTE* const* hashTable = (const BYTE* const*) tableBase; return hashTable[h]; } -} - -LZ4_FORCE_INLINE const BYTE* -LZ4_getPosition(const BYTE* p, - const void* tableBase, tableType_t tableType) -{ - U32 const h = LZ4_hashPosition(p, tableType); - return LZ4_getPositionOnHash(h, tableBase, tableType); -} - -LZ4_FORCE_INLINE void -LZ4_prepareTable(LZ4_stream_t_internal* const cctx, - const int inputSize, - const tableType_t tableType) { - /* If the table hasn't been used, it's guaranteed to be zeroed out, and is - * therefore safe to use no matter what mode we're in. Otherwise, we figure - * out if it's safe to leave as is or whether it needs to be reset. - */ - if ((tableType_t)cctx->tableType != clearedTable) { - assert(inputSize >= 0); - if ((tableType_t)cctx->tableType != tableType - || ((tableType == byU16) && cctx->currentOffset + (unsigned)inputSize >= 0xFFFFU) - || ((tableType == byU32) && cctx->currentOffset > 1 GB) - || tableType == byPtr - || inputSize >= 4 KB) - { - DEBUGLOG(4, "LZ4_prepareTable: Resetting table in %p", cctx); - MEM_INIT(cctx->hashTable, 0, LZ4_HASHTABLESIZE); - cctx->currentOffset = 0; - cctx->tableType = (U32)clearedTable; - } else { - DEBUGLOG(4, "LZ4_prepareTable: Re-use hash table (no reset)"); - } - } - - /* Adding a gap, so all previous entries are > LZ4_DISTANCE_MAX back, - * is faster than compressing without a gap. - * However, compressing with currentOffset == 0 is faster still, - * so we preserve that case. - */ - if (cctx->currentOffset != 0 && tableType == byU32) { - DEBUGLOG(5, "LZ4_prepareTable: adding 64KB to currentOffset"); - cctx->currentOffset += 64 KB; - } - - /* Finally, clear history */ - cctx->dictCtx = NULL; - cctx->dictionary = NULL; - cctx->dictSize = 0; +LZ4_FORCE_INLINE U32 LZ4_getIndexOnHash(U32 h, const void *tableBase, tableType_t tableType) { + LZ4_STATIC_ASSERT(LZ4_MEMORY_USAGE > 2); + if (tableType == byU32) { + const U32 *const hashTable = (const U32 *)tableBase; + assert(h < (1U << (LZ4_MEMORY_USAGE - 2))); + return hashTable[h]; + } + if (tableType == byU16) { + const U16 *const hashTable = (const U16 *)tableBase; + assert(h < (1U << (LZ4_MEMORY_USAGE - 1))); + return hashTable[h]; + } + assert(0); + return 0; /* forbidden case */ +} + +static const BYTE *LZ4_getPositionOnHash(U32 h, const void *tableBase, tableType_t tableType) { + assert(tableType == byPtr); + (void)tableType; + { + const BYTE *const *hashTable = (const BYTE *const *)tableBase; + return hashTable[h]; + } +} + +LZ4_FORCE_INLINE const BYTE *LZ4_getPosition( + const BYTE *p, const void *tableBase, tableType_t tableType) { + U32 const h = LZ4_hashPosition(p, tableType); + return LZ4_getPositionOnHash(h, tableBase, tableType); +} + +LZ4_FORCE_INLINE void LZ4_prepareTable( + LZ4_stream_t_internal *const cctx, const int inputSize, const tableType_t tableType) { + /* If the table hasn't been used, it's guaranteed to be zeroed out, and is + * therefore safe to use no matter what mode we're in. Otherwise, we figure + * out if it's safe to leave as is or whether it needs to be reset. + */ + if ((tableType_t)cctx->tableType != clearedTable) { + assert(inputSize >= 0); + if ((tableType_t)cctx->tableType != tableType || + ((tableType == byU16) && cctx->currentOffset + (unsigned)inputSize >= 0xFFFFU) || + ((tableType == byU32) && cctx->currentOffset > 1 GB) || tableType == byPtr || + inputSize >= 4 KB) { + DEBUGLOG(4, "LZ4_prepareTable: Resetting table in %p", cctx); + MEM_INIT(cctx->hashTable, 0, LZ4_HASHTABLESIZE); + cctx->currentOffset = 0; + cctx->tableType = (U32)clearedTable; + } else { + DEBUGLOG(4, "LZ4_prepareTable: Re-use hash table (no reset)"); + } + } + + /* Adding a gap, so all previous entries are > LZ4_DISTANCE_MAX back, + * is faster than compressing without a gap. + * However, compressing with currentOffset == 0 is faster still, + * so we preserve that case. + */ + if (cctx->currentOffset != 0 && tableType == byU32) { + DEBUGLOG(5, "LZ4_prepareTable: adding 64KB to currentOffset"); + cctx->currentOffset += 64 KB; + } + + /* Finally, clear history */ + cctx->dictCtx = NULL; + cctx->dictionary = NULL; + cctx->dictSize = 0; } /** LZ4_compress_generic() : @@ -904,476 +1085,526 @@ LZ4_prepareTable(LZ4_stream_t_internal* const cctx, * - source != NULL * - inputSize > 0 */ -LZ4_FORCE_INLINE int LZ4_compress_generic_validated( - LZ4_stream_t_internal* const cctx, - const char* const source, - char* const dest, - const int inputSize, - int* inputConsumed, /* only written when outputDirective == fillOutput */ - const int maxOutputSize, - const limitedOutput_directive outputDirective, - const tableType_t tableType, - const dict_directive dictDirective, - const dictIssue_directive dictIssue, - const int acceleration) -{ - int result; - const BYTE* ip = (const BYTE*)source; - - U32 const startIndex = cctx->currentOffset; - const BYTE* base = (const BYTE*)source - startIndex; - const BYTE* lowLimit; - - const LZ4_stream_t_internal* dictCtx = (const LZ4_stream_t_internal*) cctx->dictCtx; - const BYTE* const dictionary = - dictDirective == usingDictCtx ? dictCtx->dictionary : cctx->dictionary; - const U32 dictSize = - dictDirective == usingDictCtx ? dictCtx->dictSize : cctx->dictSize; - const U32 dictDelta = - (dictDirective == usingDictCtx) ? startIndex - dictCtx->currentOffset : 0; /* make indexes in dictCtx comparable with indexes in current context */ - - int const maybe_extMem = (dictDirective == usingExtDict) || (dictDirective == usingDictCtx); - U32 const prefixIdxLimit = startIndex - dictSize; /* used when dictDirective == dictSmall */ - const BYTE* const dictEnd = dictionary ? dictionary + dictSize : dictionary; - const BYTE* anchor = (const BYTE*) source; - const BYTE* const iend = ip + inputSize; - const BYTE* const mflimitPlusOne = iend - MFLIMIT + 1; - const BYTE* const matchlimit = iend - LASTLITERALS; - - /* the dictCtx currentOffset is indexed on the start of the dictionary, - * while a dictionary in the current context precedes the currentOffset */ - const BYTE* dictBase = (dictionary == NULL) ? NULL : - (dictDirective == usingDictCtx) ? - dictionary + dictSize - dictCtx->currentOffset : - dictionary + dictSize - startIndex; - - BYTE* op = (BYTE*) dest; - BYTE* const olimit = op + maxOutputSize; - - U32 offset = 0; - U32 forwardH; - - DEBUGLOG(5, "LZ4_compress_generic_validated: srcSize=%i, tableType=%u", inputSize, tableType); - assert(ip != NULL); - if (tableType == byU16) assert(inputSize= 1); - - lowLimit = (const BYTE*)source - (dictDirective == withPrefix64k ? dictSize : 0); - - /* Update context state */ - if (dictDirective == usingDictCtx) { - /* Subsequent linked blocks can't use the dictionary. */ - /* Instead, they use the block we just compressed. */ - cctx->dictCtx = NULL; - cctx->dictSize = (U32)inputSize; - } else { - cctx->dictSize += (U32)inputSize; - } - cctx->currentOffset += (U32)inputSize; - cctx->tableType = (U32)tableType; - - if (inputSizehashTable, byPtr); - } else { - LZ4_putIndexOnHash(startIndex, h, cctx->hashTable, tableType); - } } - ip++; forwardH = LZ4_hashPosition(ip, tableType); - - /* Main Loop */ - for ( ; ; ) { - const BYTE* match; - BYTE* token; - const BYTE* filledIp; - - /* Find a match */ - if (tableType == byPtr) { - const BYTE* forwardIp = ip; - int step = 1; - int searchMatchNb = acceleration << LZ4_skipTrigger; - do { - U32 const h = forwardH; - ip = forwardIp; - forwardIp += step; - step = (searchMatchNb++ >> LZ4_skipTrigger); - - if (unlikely(forwardIp > mflimitPlusOne)) goto _last_literals; - assert(ip < mflimitPlusOne); - - match = LZ4_getPositionOnHash(h, cctx->hashTable, tableType); - forwardH = LZ4_hashPosition(forwardIp, tableType); - LZ4_putPositionOnHash(ip, h, cctx->hashTable, tableType); - - } while ( (match+LZ4_DISTANCE_MAX < ip) - || (LZ4_read32(match) != LZ4_read32(ip)) ); - - } else { /* byU32, byU16 */ - - const BYTE* forwardIp = ip; - int step = 1; - int searchMatchNb = acceleration << LZ4_skipTrigger; - do { - U32 const h = forwardH; - U32 const current = (U32)(forwardIp - base); - U32 matchIndex = LZ4_getIndexOnHash(h, cctx->hashTable, tableType); - assert(matchIndex <= current); - assert(forwardIp - base < (ptrdiff_t)(2 GB - 1)); - ip = forwardIp; - forwardIp += step; - step = (searchMatchNb++ >> LZ4_skipTrigger); - - if (unlikely(forwardIp > mflimitPlusOne)) goto _last_literals; - assert(ip < mflimitPlusOne); - - if (dictDirective == usingDictCtx) { - if (matchIndex < startIndex) { - /* there was no match, try the dictionary */ - assert(tableType == byU32); - matchIndex = LZ4_getIndexOnHash(h, dictCtx->hashTable, byU32); - match = dictBase + matchIndex; - matchIndex += dictDelta; /* make dictCtx index comparable with current context */ - lowLimit = dictionary; - } else { - match = base + matchIndex; - lowLimit = (const BYTE*)source; - } - } else if (dictDirective == usingExtDict) { - if (matchIndex < startIndex) { - DEBUGLOG(7, "extDict candidate: matchIndex=%5u < startIndex=%5u", matchIndex, startIndex); - assert(startIndex - matchIndex >= MINMATCH); - assert(dictBase); - match = dictBase + matchIndex; - lowLimit = dictionary; - } else { - match = base + matchIndex; - lowLimit = (const BYTE*)source; - } - } else { /* single continuous memory segment */ - match = base + matchIndex; - } - forwardH = LZ4_hashPosition(forwardIp, tableType); - LZ4_putIndexOnHash(current, h, cctx->hashTable, tableType); - - DEBUGLOG(7, "candidate at pos=%u (offset=%u \n", matchIndex, current - matchIndex); - if ((dictIssue == dictSmall) && (matchIndex < prefixIdxLimit)) { continue; } /* match outside of valid area */ - assert(matchIndex < current); - if ( ((tableType != byU16) || (LZ4_DISTANCE_MAX < LZ4_DISTANCE_ABSOLUTE_MAX)) - && (matchIndex+LZ4_DISTANCE_MAX < current)) { - continue; - } /* too far */ - assert((current - matchIndex) <= LZ4_DISTANCE_MAX); /* match now expected within distance */ - - if (LZ4_read32(match) == LZ4_read32(ip)) { - if (maybe_extMem) offset = current - matchIndex; - break; /* match found */ - } - - } while(1); - } - - /* Catch up */ - filledIp = ip; - while (((ip>anchor) & (match > lowLimit)) && (unlikely(ip[-1]==match[-1]))) { ip--; match--; } - - /* Encode Literals */ - { unsigned const litLength = (unsigned)(ip - anchor); - token = op++; - if ((outputDirective == limitedOutput) && /* Check output buffer overflow */ - (unlikely(op + litLength + (2 + 1 + LASTLITERALS) + (litLength/255) > olimit)) ) { - return 0; /* cannot compress within `dst` budget. Stored indexes in hash table are nonetheless fine */ - } - if ((outputDirective == fillOutput) && - (unlikely(op + (litLength+240)/255 /* litlen */ + litLength /* literals */ + 2 /* offset */ + 1 /* token */ + MFLIMIT - MINMATCH /* min last literals so last match is <= end - MFLIMIT */ > olimit))) { - op--; - goto _last_literals; - } - if (litLength >= RUN_MASK) { - int len = (int)(litLength - RUN_MASK); - *token = (RUN_MASK<= 255 ; len-=255) *op++ = 255; - *op++ = (BYTE)len; - } - else *token = (BYTE)(litLength< olimit)) { - /* the match was too close to the end, rewind and go to last literals */ - op = token; - goto _last_literals; - } - - /* Encode Offset */ - if (maybe_extMem) { /* static test */ - DEBUGLOG(6, " with offset=%u (ext if > %i)", offset, (int)(ip - (const BYTE*)source)); - assert(offset <= LZ4_DISTANCE_MAX && offset > 0); - LZ4_writeLE16(op, (U16)offset); op+=2; - } else { - DEBUGLOG(6, " with offset=%u (same segment)", (U32)(ip - match)); - assert(ip-match <= LZ4_DISTANCE_MAX); - LZ4_writeLE16(op, (U16)(ip - match)); op+=2; - } - - /* Encode MatchLength */ - { unsigned matchCode; - - if ( (dictDirective==usingExtDict || dictDirective==usingDictCtx) - && (lowLimit==dictionary) /* match within extDict */ ) { - const BYTE* limit = ip + (dictEnd-match); - assert(dictEnd > match); - if (limit > matchlimit) limit = matchlimit; - matchCode = LZ4_count(ip+MINMATCH, match+MINMATCH, limit); - ip += (size_t)matchCode + MINMATCH; - if (ip==limit) { - unsigned const more = LZ4_count(limit, (const BYTE*)source, matchlimit); - matchCode += more; - ip += more; - } - DEBUGLOG(6, " with matchLength=%u starting in extDict", matchCode+MINMATCH); - } else { - matchCode = LZ4_count(ip+MINMATCH, match+MINMATCH, matchlimit); - ip += (size_t)matchCode + MINMATCH; - DEBUGLOG(6, " with matchLength=%u", matchCode+MINMATCH); - } - - if ((outputDirective) && /* Check output buffer overflow */ - (unlikely(op + (1 + LASTLITERALS) + (matchCode+240)/255 > olimit)) ) { - if (outputDirective == fillOutput) { - /* Match description too long : reduce it */ - U32 newMatchCode = 15 /* in token */ - 1 /* to avoid needing a zero byte */ + ((U32)(olimit - op) - 1 - LASTLITERALS) * 255; - ip -= matchCode - newMatchCode; - assert(newMatchCode < matchCode); - matchCode = newMatchCode; - if (unlikely(ip <= filledIp)) { - /* We have already filled up to filledIp so if ip ends up less than filledIp - * we have positions in the hash table beyond the current position. This is - * a problem if we reuse the hash table. So we have to remove these positions - * from the hash table. - */ - const BYTE* ptr; - DEBUGLOG(5, "Clearing %u positions", (U32)(filledIp - ip)); - for (ptr = ip; ptr <= filledIp; ++ptr) { - U32 const h = LZ4_hashPosition(ptr, tableType); - LZ4_clearHash(h, cctx->hashTable, tableType); - } - } - } else { - assert(outputDirective == limitedOutput); - return 0; /* cannot compress within `dst` budget. Stored indexes in hash table are nonetheless fine */ - } - } - if (matchCode >= ML_MASK) { - *token += ML_MASK; - matchCode -= ML_MASK; - LZ4_write32(op, 0xFFFFFFFF); - while (matchCode >= 4*255) { - op+=4; - LZ4_write32(op, 0xFFFFFFFF); - matchCode -= 4*255; - } - op += matchCode / 255; - *op++ = (BYTE)(matchCode % 255); - } else - *token += (BYTE)(matchCode); - } - /* Ensure we have enough space for the last literals. */ - assert(!(outputDirective == fillOutput && op + 1 + LASTLITERALS > olimit)); - - anchor = ip; - - /* Test end of chunk */ - if (ip >= mflimitPlusOne) break; - - /* Fill table */ - { U32 const h = LZ4_hashPosition(ip-2, tableType); - if (tableType == byPtr) { - LZ4_putPositionOnHash(ip-2, h, cctx->hashTable, byPtr); - } else { - U32 const idx = (U32)((ip-2) - base); - LZ4_putIndexOnHash(idx, h, cctx->hashTable, tableType); - } } - - /* Test next position */ - if (tableType == byPtr) { - - match = LZ4_getPosition(ip, cctx->hashTable, tableType); - LZ4_putPosition(ip, cctx->hashTable, tableType); - if ( (match+LZ4_DISTANCE_MAX >= ip) - && (LZ4_read32(match) == LZ4_read32(ip)) ) - { token=op++; *token=0; goto _next_match; } - - } else { /* byU32, byU16 */ - - U32 const h = LZ4_hashPosition(ip, tableType); - U32 const current = (U32)(ip-base); - U32 matchIndex = LZ4_getIndexOnHash(h, cctx->hashTable, tableType); - assert(matchIndex < current); - if (dictDirective == usingDictCtx) { - if (matchIndex < startIndex) { - /* there was no match, try the dictionary */ - assert(tableType == byU32); - matchIndex = LZ4_getIndexOnHash(h, dictCtx->hashTable, byU32); - match = dictBase + matchIndex; - lowLimit = dictionary; /* required for match length counter */ - matchIndex += dictDelta; - } else { - match = base + matchIndex; - lowLimit = (const BYTE*)source; /* required for match length counter */ - } - } else if (dictDirective==usingExtDict) { - if (matchIndex < startIndex) { - assert(dictBase); - match = dictBase + matchIndex; - lowLimit = dictionary; /* required for match length counter */ - } else { - match = base + matchIndex; - lowLimit = (const BYTE*)source; /* required for match length counter */ - } - } else { /* single memory segment */ - match = base + matchIndex; - } - LZ4_putIndexOnHash(current, h, cctx->hashTable, tableType); - assert(matchIndex < current); - if ( ((dictIssue==dictSmall) ? (matchIndex >= prefixIdxLimit) : 1) - && (((tableType==byU16) && (LZ4_DISTANCE_MAX == LZ4_DISTANCE_ABSOLUTE_MAX)) ? 1 : (matchIndex+LZ4_DISTANCE_MAX >= current)) - && (LZ4_read32(match) == LZ4_read32(ip)) ) { - token=op++; - *token=0; - if (maybe_extMem) offset = current - matchIndex; - DEBUGLOG(6, "seq.start:%i, literals=%u, match.start:%i", - (int)(anchor-(const BYTE*)source), 0, (int)(ip-(const BYTE*)source)); - goto _next_match; - } - } - - /* Prepare next loop */ - forwardH = LZ4_hashPosition(++ip, tableType); - - } +LZ4_FORCE_INLINE int LZ4_compress_generic_validated(LZ4_stream_t_internal *const cctx, + const char *const source, char *const dest, const int inputSize, + int *inputConsumed, /* only written when outputDirective == fillOutput */ + const int maxOutputSize, const limitedOutput_directive outputDirective, + const tableType_t tableType, const dict_directive dictDirective, + const dictIssue_directive dictIssue, const int acceleration) { + int result; + const BYTE *ip = (const BYTE *)source; + + U32 const startIndex = cctx->currentOffset; + const BYTE *base = (const BYTE *)source - startIndex; + const BYTE *lowLimit; + + const LZ4_stream_t_internal *dictCtx = (const LZ4_stream_t_internal *)cctx->dictCtx; + const BYTE *const dictionary = + dictDirective == usingDictCtx ? dictCtx->dictionary : cctx->dictionary; + const U32 dictSize = dictDirective == usingDictCtx ? dictCtx->dictSize : cctx->dictSize; + const U32 dictDelta = (dictDirective == usingDictCtx) ? startIndex - dictCtx->currentOffset + : 0; /* make indexes in dictCtx comparable + with indexes in current context */ + + int const maybe_extMem = (dictDirective == usingExtDict) || (dictDirective == usingDictCtx); + U32 const prefixIdxLimit = startIndex - dictSize; /* used when dictDirective == dictSmall */ + const BYTE *const dictEnd = dictionary ? dictionary + dictSize : dictionary; + const BYTE *anchor = (const BYTE *)source; + const BYTE *const iend = ip + inputSize; + const BYTE *const mflimitPlusOne = iend - MFLIMIT + 1; + const BYTE *const matchlimit = iend - LASTLITERALS; + + /* the dictCtx currentOffset is indexed on the start of the dictionary, + * while a dictionary in the current context precedes the currentOffset */ + const BYTE *dictBase = (dictionary == NULL) ? NULL + : (dictDirective == usingDictCtx) + ? dictionary + dictSize - dictCtx->currentOffset + : dictionary + dictSize - startIndex; + + BYTE *op = (BYTE *)dest; + BYTE *const olimit = op + maxOutputSize; + + U32 offset = 0; + U32 forwardH; + + DEBUGLOG(5, "LZ4_compress_generic_validated: srcSize=%i, tableType=%u", inputSize, tableType); + assert(ip != NULL); + if (tableType == byU16) + assert(inputSize < LZ4_64Klimit); /* Size too large (not within 64K limit) */ + if (tableType == byPtr) + assert(dictDirective == noDict); /* only supported use case with byPtr */ + /* If init conditions are not met, we don't have to mark stream + * as having dirty context, since no action was taken yet */ + if (outputDirective == fillOutput && maxOutputSize < 1) { + return 0; + } /* Impossible to store anything */ + assert(acceleration >= 1); + + lowLimit = (const BYTE *)source - (dictDirective == withPrefix64k ? dictSize : 0); + + /* Update context state */ + if (dictDirective == usingDictCtx) { + /* Subsequent linked blocks can't use the dictionary. */ + /* Instead, they use the block we just compressed. */ + cctx->dictCtx = NULL; + cctx->dictSize = (U32)inputSize; + } else { + cctx->dictSize += (U32)inputSize; + } + cctx->currentOffset += (U32)inputSize; + cctx->tableType = (U32)tableType; + + if (inputSize < LZ4_minLength) + goto _last_literals; /* Input too small, no compression (all literals) + */ + + /* First Byte */ + { + U32 const h = LZ4_hashPosition(ip, tableType); + if (tableType == byPtr) { + LZ4_putPositionOnHash(ip, h, cctx->hashTable, byPtr); + } else { + LZ4_putIndexOnHash(startIndex, h, cctx->hashTable, tableType); + } + } + ip++; + forwardH = LZ4_hashPosition(ip, tableType); + + /* Main Loop */ + for (;;) { + const BYTE *match; + BYTE *token; + const BYTE *filledIp; + + /* Find a match */ + if (tableType == byPtr) { + const BYTE *forwardIp = ip; + int step = 1; + int searchMatchNb = acceleration << LZ4_skipTrigger; + do { + U32 const h = forwardH; + ip = forwardIp; + forwardIp += step; + step = (searchMatchNb++ >> LZ4_skipTrigger); + + if (unlikely(forwardIp > mflimitPlusOne)) + goto _last_literals; + assert(ip < mflimitPlusOne); + + match = LZ4_getPositionOnHash(h, cctx->hashTable, tableType); + forwardH = LZ4_hashPosition(forwardIp, tableType); + LZ4_putPositionOnHash(ip, h, cctx->hashTable, tableType); + + } while ((match + LZ4_DISTANCE_MAX < ip) || (LZ4_read32(match) != LZ4_read32(ip))); + + } else { /* byU32, byU16 */ + + const BYTE *forwardIp = ip; + int step = 1; + int searchMatchNb = acceleration << LZ4_skipTrigger; + do { + U32 const h = forwardH; + U32 const current = (U32)(forwardIp - base); + U32 matchIndex = LZ4_getIndexOnHash(h, cctx->hashTable, tableType); + assert(matchIndex <= current); + assert(forwardIp - base < (ptrdiff_t)(2 GB - 1)); + ip = forwardIp; + forwardIp += step; + step = (searchMatchNb++ >> LZ4_skipTrigger); + + if (unlikely(forwardIp > mflimitPlusOne)) + goto _last_literals; + assert(ip < mflimitPlusOne); + + if (dictDirective == usingDictCtx) { + if (matchIndex < startIndex) { + /* there was no match, try the dictionary */ + assert(tableType == byU32); + matchIndex = LZ4_getIndexOnHash(h, dictCtx->hashTable, byU32); + match = dictBase + matchIndex; + matchIndex += dictDelta; /* make dictCtx index comparable with + current context */ + lowLimit = dictionary; + } else { + match = base + matchIndex; + lowLimit = (const BYTE *)source; + } + } else if (dictDirective == usingExtDict) { + if (matchIndex < startIndex) { + DEBUGLOG(7, + "extDict candidate: matchIndex=%5u < " + "startIndex=%5u", + matchIndex, startIndex); + assert(startIndex - matchIndex >= MINMATCH); + assert(dictBase); + match = dictBase + matchIndex; + lowLimit = dictionary; + } else { + match = base + matchIndex; + lowLimit = (const BYTE *)source; + } + } else { /* single continuous memory segment */ + match = base + matchIndex; + } + forwardH = LZ4_hashPosition(forwardIp, tableType); + LZ4_putIndexOnHash(current, h, cctx->hashTable, tableType); + + DEBUGLOG(7, "candidate at pos=%u (offset=%u \n", matchIndex, current - matchIndex); + if ((dictIssue == dictSmall) && (matchIndex < prefixIdxLimit)) { + continue; + } /* match outside of valid area */ + assert(matchIndex < current); + if (((tableType != byU16) || (LZ4_DISTANCE_MAX < LZ4_DISTANCE_ABSOLUTE_MAX)) && + (matchIndex + LZ4_DISTANCE_MAX < current)) { + continue; + } /* too far */ + assert((current - matchIndex) <= + LZ4_DISTANCE_MAX); /* match now expected within distance */ + + if (LZ4_read32(match) == LZ4_read32(ip)) { + if (maybe_extMem) + offset = current - matchIndex; + break; /* match found */ + } + + } while (1); + } + + /* Catch up */ + filledIp = ip; + while (((ip > anchor) & (match > lowLimit)) && (unlikely(ip[-1] == match[-1]))) { + ip--; + match--; + } + + /* Encode Literals */ + { + unsigned const litLength = (unsigned)(ip - anchor); + token = op++; + if ((outputDirective == limitedOutput) && /* Check output buffer overflow */ + (unlikely(op + litLength + (2 + 1 + LASTLITERALS) + (litLength / 255) > olimit))) { + return 0; /* cannot compress within `dst` budget. Stored indexes + in hash table are nonetheless fine */ + } + if ((outputDirective == fillOutput) && + (unlikely(op + (litLength + 240) / 255 /* litlen */ + litLength /* literals */ + + 2 /* offset */ + 1 /* token */ + MFLIMIT - + MINMATCH /* min last literals so last match is <= + end - MFLIMIT */ + > olimit))) { + op--; + goto _last_literals; + } + if (litLength >= RUN_MASK) { + int len = (int)(litLength - RUN_MASK); + *token = (RUN_MASK << ML_BITS); + for (; len >= 255; len -= 255) + *op++ = 255; + *op++ = (BYTE)len; + } else + *token = (BYTE)(litLength << ML_BITS); + + /* Copy Literals */ + LZ4_wildCopy8(op, anchor, op + litLength); + op += litLength; + DEBUGLOG(6, "seq.start:%i, literals=%u, match.start:%i", + (int)(anchor - (const BYTE *)source), litLength, (int)(ip - (const BYTE *)source)); + } + + _next_match: + /* at this stage, the following variables must be correctly set : + * - ip : at start of LZ operation + * - match : at start of previous pattern occurrence; can be within + * current prefix, or within extDict + * - offset : if maybe_ext_memSegment==1 (constant) + * - lowLimit : must be == dictionary to mean "match is within extDict"; + * must be == source otherwise + * - token and *token : position to write 4-bits for match length; + * higher 4-bits for literal length supposed already written + */ + + if ((outputDirective == fillOutput) && + (op + 2 /* offset */ + 1 /* token */ + MFLIMIT - + MINMATCH /* min last literals so last match is <= end - MFLIMIT + */ + > olimit)) { + /* the match was too close to the end, rewind and go to last + * literals */ + op = token; + goto _last_literals; + } + + /* Encode Offset */ + if (maybe_extMem) { /* static test */ + DEBUGLOG(6, " with offset=%u (ext if > %i)", offset, + (int)(ip - (const BYTE *)source)); + assert(offset <= LZ4_DISTANCE_MAX && offset > 0); + LZ4_writeLE16(op, (U16)offset); + op += 2; + } else { + DEBUGLOG(6, " with offset=%u (same segment)", (U32)(ip - match)); + assert(ip - match <= LZ4_DISTANCE_MAX); + LZ4_writeLE16(op, (U16)(ip - match)); + op += 2; + } + + /* Encode MatchLength */ + { + unsigned matchCode; + + if ((dictDirective == usingExtDict || dictDirective == usingDictCtx) && + (lowLimit == dictionary) /* match within extDict */) { + const BYTE *limit = ip + (dictEnd - match); + assert(dictEnd > match); + if (limit > matchlimit) + limit = matchlimit; + matchCode = LZ4_count(ip + MINMATCH, match + MINMATCH, limit); + ip += (size_t)matchCode + MINMATCH; + if (ip == limit) { + unsigned const more = LZ4_count(limit, (const BYTE *)source, matchlimit); + matchCode += more; + ip += more; + } + DEBUGLOG(6, " with matchLength=%u starting in extDict", + matchCode + MINMATCH); + } else { + matchCode = LZ4_count(ip + MINMATCH, match + MINMATCH, matchlimit); + ip += (size_t)matchCode + MINMATCH; + DEBUGLOG(6, " with matchLength=%u", matchCode + MINMATCH); + } + + if ((outputDirective) && /* Check output buffer overflow */ + (unlikely(op + (1 + LASTLITERALS) + (matchCode + 240) / 255 > olimit))) { + if (outputDirective == fillOutput) { + /* Match description too long : reduce it */ + U32 newMatchCode = 15 /* in token */ - 1 /* to avoid needing a zero byte */ + + ((U32)(olimit - op) - 1 - LASTLITERALS) * 255; + ip -= matchCode - newMatchCode; + assert(newMatchCode < matchCode); + matchCode = newMatchCode; + if (unlikely(ip <= filledIp)) { + /* We have already filled up to filledIp so if ip + * ends up less than filledIp we have positions in + * the hash table beyond the current position. This + * is a problem if we reuse the hash table. So we + * have to remove these positions from the hash + * table. + */ + const BYTE *ptr; + DEBUGLOG(5, "Clearing %u positions", (U32)(filledIp - ip)); + for (ptr = ip; ptr <= filledIp; ++ptr) { + U32 const h = LZ4_hashPosition(ptr, tableType); + LZ4_clearHash(h, cctx->hashTable, tableType); + } + } + } else { + assert(outputDirective == limitedOutput); + return 0; /* cannot compress within `dst` budget. Stored + indexes in hash table are nonetheless fine */ + } + } + if (matchCode >= ML_MASK) { + *token += ML_MASK; + matchCode -= ML_MASK; + LZ4_write32(op, 0xFFFFFFFF); + while (matchCode >= 4 * 255) { + op += 4; + LZ4_write32(op, 0xFFFFFFFF); + matchCode -= 4 * 255; + } + op += matchCode / 255; + *op++ = (BYTE)(matchCode % 255); + } else + *token += (BYTE)(matchCode); + } + /* Ensure we have enough space for the last literals. */ + assert(!(outputDirective == fillOutput && op + 1 + LASTLITERALS > olimit)); + + anchor = ip; + + /* Test end of chunk */ + if (ip >= mflimitPlusOne) + break; + + /* Fill table */ + { + U32 const h = LZ4_hashPosition(ip - 2, tableType); + if (tableType == byPtr) { + LZ4_putPositionOnHash(ip - 2, h, cctx->hashTable, byPtr); + } else { + U32 const idx = (U32)((ip - 2) - base); + LZ4_putIndexOnHash(idx, h, cctx->hashTable, tableType); + } + } + + /* Test next position */ + if (tableType == byPtr) { + + match = LZ4_getPosition(ip, cctx->hashTable, tableType); + LZ4_putPosition(ip, cctx->hashTable, tableType); + if ((match + LZ4_DISTANCE_MAX >= ip) && (LZ4_read32(match) == LZ4_read32(ip))) { + token = op++; + *token = 0; + goto _next_match; + } + + } else { /* byU32, byU16 */ + + U32 const h = LZ4_hashPosition(ip, tableType); + U32 const current = (U32)(ip - base); + U32 matchIndex = LZ4_getIndexOnHash(h, cctx->hashTable, tableType); + assert(matchIndex < current); + if (dictDirective == usingDictCtx) { + if (matchIndex < startIndex) { + /* there was no match, try the dictionary */ + assert(tableType == byU32); + matchIndex = LZ4_getIndexOnHash(h, dictCtx->hashTable, byU32); + match = dictBase + matchIndex; + lowLimit = dictionary; /* required for match length counter */ + matchIndex += dictDelta; + } else { + match = base + matchIndex; + lowLimit = (const BYTE *)source; /* required for match length counter */ + } + } else if (dictDirective == usingExtDict) { + if (matchIndex < startIndex) { + assert(dictBase); + match = dictBase + matchIndex; + lowLimit = dictionary; /* required for match length counter */ + } else { + match = base + matchIndex; + lowLimit = (const BYTE *)source; /* required for match length counter */ + } + } else { /* single memory segment */ + match = base + matchIndex; + } + LZ4_putIndexOnHash(current, h, cctx->hashTable, tableType); + assert(matchIndex < current); + if (((dictIssue == dictSmall) ? (matchIndex >= prefixIdxLimit) : 1) && + (((tableType == byU16) && (LZ4_DISTANCE_MAX == LZ4_DISTANCE_ABSOLUTE_MAX)) + ? 1 + : (matchIndex + LZ4_DISTANCE_MAX >= current)) && + (LZ4_read32(match) == LZ4_read32(ip))) { + token = op++; + *token = 0; + if (maybe_extMem) + offset = current - matchIndex; + DEBUGLOG(6, "seq.start:%i, literals=%u, match.start:%i", + (int)(anchor - (const BYTE *)source), 0, (int)(ip - (const BYTE *)source)); + goto _next_match; + } + } + + /* Prepare next loop */ + forwardH = LZ4_hashPosition(++ip, tableType); + } _last_literals: - /* Encode Last Literals */ - { size_t lastRun = (size_t)(iend - anchor); - if ( (outputDirective) && /* Check output buffer overflow */ - (op + lastRun + 1 + ((lastRun+255-RUN_MASK)/255) > olimit)) { - if (outputDirective == fillOutput) { - /* adapt lastRun to fill 'dst' */ - assert(olimit >= op); - lastRun = (size_t)(olimit-op) - 1/*token*/; - lastRun -= (lastRun + 256 - RUN_MASK) / 256; /*additional length tokens*/ - } else { - assert(outputDirective == limitedOutput); - return 0; /* cannot compress within `dst` budget. Stored indexes in hash table are nonetheless fine */ - } - } - DEBUGLOG(6, "Final literal run : %i literals", (int)lastRun); - if (lastRun >= RUN_MASK) { - size_t accumulator = lastRun - RUN_MASK; - *op++ = RUN_MASK << ML_BITS; - for(; accumulator >= 255 ; accumulator-=255) *op++ = 255; - *op++ = (BYTE) accumulator; - } else { - *op++ = (BYTE)(lastRun< 0); - DEBUGLOG(5, "LZ4_compress_generic: compressed %i bytes into %i bytes", inputSize, result); - return result; + /* Encode Last Literals */ + { + size_t lastRun = (size_t)(iend - anchor); + if ((outputDirective) && /* Check output buffer overflow */ + (op + lastRun + 1 + ((lastRun + 255 - RUN_MASK) / 255) > olimit)) { + if (outputDirective == fillOutput) { + /* adapt lastRun to fill 'dst' */ + assert(olimit >= op); + lastRun = (size_t)(olimit - op) - 1 /*token*/; + lastRun -= (lastRun + 256 - RUN_MASK) / 256; /*additional length tokens*/ + } else { + assert(outputDirective == limitedOutput); + return 0; /* cannot compress within `dst` budget. Stored indexes + in hash table are nonetheless fine */ + } + } + DEBUGLOG(6, "Final literal run : %i literals", (int)lastRun); + if (lastRun >= RUN_MASK) { + size_t accumulator = lastRun - RUN_MASK; + *op++ = RUN_MASK << ML_BITS; + for (; accumulator >= 255; accumulator -= 255) + *op++ = 255; + *op++ = (BYTE)accumulator; + } else { + *op++ = (BYTE)(lastRun << ML_BITS); + } + LZ4_memcpy(op, anchor, lastRun); + ip = anchor + lastRun; + op += lastRun; + } + + if (outputDirective == fillOutput) { + *inputConsumed = (int)(((const char *)ip) - source); + } + result = (int)(((char *)op) - dest); + assert(result > 0); + DEBUGLOG(5, "LZ4_compress_generic: compressed %i bytes into %i bytes", inputSize, result); + return result; } /** LZ4_compress_generic() : * inlined, to ensure branches are decided at compilation time; * takes care of src == (NULL, 0) * and forward the rest to LZ4_compress_generic_validated */ -LZ4_FORCE_INLINE int LZ4_compress_generic( - LZ4_stream_t_internal* const cctx, - const char* const src, - char* const dst, - const int srcSize, - int *inputConsumed, /* only written when outputDirective == fillOutput */ - const int dstCapacity, - const limitedOutput_directive outputDirective, - const tableType_t tableType, - const dict_directive dictDirective, - const dictIssue_directive dictIssue, - const int acceleration) -{ - DEBUGLOG(5, "LZ4_compress_generic: srcSize=%i, dstCapacity=%i", - srcSize, dstCapacity); - - if ((U32)srcSize > (U32)LZ4_MAX_INPUT_SIZE) { return 0; } /* Unsupported srcSize, too large (or negative) */ - if (srcSize == 0) { /* src == NULL supported if srcSize == 0 */ - if (outputDirective != notLimited && dstCapacity <= 0) return 0; /* no output, can't write anything */ - DEBUGLOG(5, "Generating an empty block"); - assert(outputDirective == notLimited || dstCapacity >= 1); - assert(dst != NULL); - dst[0] = 0; - if (outputDirective == fillOutput) { - assert (inputConsumed != NULL); - *inputConsumed = 0; - } - return 1; - } - assert(src != NULL); - - return LZ4_compress_generic_validated(cctx, src, dst, srcSize, - inputConsumed, /* only written into if outputDirective == fillOutput */ - dstCapacity, outputDirective, - tableType, dictDirective, dictIssue, acceleration); -} - - -int LZ4_compress_fast_extState(void* state, const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration) -{ - LZ4_stream_t_internal* const ctx = & LZ4_initStream(state, sizeof(LZ4_stream_t)) -> internal_donotuse; - assert(ctx != NULL); - if (acceleration < 1) acceleration = LZ4_ACCELERATION_DEFAULT; - if (acceleration > LZ4_ACCELERATION_MAX) acceleration = LZ4_ACCELERATION_MAX; - if (maxOutputSize >= LZ4_compressBound(inputSize)) { - if (inputSize < LZ4_64Klimit) { - return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, 0, notLimited, byU16, noDict, noDictIssue, acceleration); - } else { - const tableType_t tableType = ((sizeof(void*)==4) && ((uptrval)source > LZ4_DISTANCE_MAX)) ? byPtr : byU32; - return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, 0, notLimited, tableType, noDict, noDictIssue, acceleration); - } - } else { - if (inputSize < LZ4_64Klimit) { - return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, byU16, noDict, noDictIssue, acceleration); - } else { - const tableType_t tableType = ((sizeof(void*)==4) && ((uptrval)source > LZ4_DISTANCE_MAX)) ? byPtr : byU32; - return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, noDict, noDictIssue, acceleration); - } - } +LZ4_FORCE_INLINE int LZ4_compress_generic(LZ4_stream_t_internal *const cctx, const char *const src, + char *const dst, const int srcSize, + int *inputConsumed, /* only written when outputDirective == fillOutput */ + const int dstCapacity, const limitedOutput_directive outputDirective, + const tableType_t tableType, const dict_directive dictDirective, + const dictIssue_directive dictIssue, const int acceleration) { + DEBUGLOG(5, "LZ4_compress_generic: srcSize=%i, dstCapacity=%i", srcSize, dstCapacity); + + if ((U32)srcSize > (U32)LZ4_MAX_INPUT_SIZE) { + return 0; + } /* Unsupported srcSize, too large (or negative) */ + if (srcSize == 0) { /* src == NULL supported if srcSize == 0 */ + if (outputDirective != notLimited && dstCapacity <= 0) + return 0; /* no output, can't write anything */ + DEBUGLOG(5, "Generating an empty block"); + assert(outputDirective == notLimited || dstCapacity >= 1); + assert(dst != NULL); + dst[0] = 0; + if (outputDirective == fillOutput) { + assert(inputConsumed != NULL); + *inputConsumed = 0; + } + return 1; + } + assert(src != NULL); + + return LZ4_compress_generic_validated(cctx, src, dst, srcSize, + inputConsumed, /* only written into if outputDirective == fillOutput */ + dstCapacity, outputDirective, tableType, dictDirective, dictIssue, acceleration); +} + +int LZ4_compress_fast_extState(void *state, const char *source, char *dest, int inputSize, + int maxOutputSize, int acceleration) { + LZ4_stream_t_internal *const ctx = + &LZ4_initStream(state, sizeof(LZ4_stream_t))->internal_donotuse; + assert(ctx != NULL); + if (acceleration < 1) + acceleration = LZ4_ACCELERATION_DEFAULT; + if (acceleration > LZ4_ACCELERATION_MAX) + acceleration = LZ4_ACCELERATION_MAX; + if (maxOutputSize >= LZ4_compressBound(inputSize)) { + if (inputSize < LZ4_64Klimit) { + return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, 0, notLimited, byU16, + noDict, noDictIssue, acceleration); + } else { + const tableType_t tableType = + ((sizeof(void *) == 4) && ((uptrval)source > LZ4_DISTANCE_MAX)) ? byPtr : byU32; + return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, 0, notLimited, + tableType, noDict, noDictIssue, acceleration); + } + } else { + if (inputSize < LZ4_64Klimit) { + return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, maxOutputSize, + limitedOutput, byU16, noDict, noDictIssue, acceleration); + } else { + const tableType_t tableType = + ((sizeof(void *) == 4) && ((uptrval)source > LZ4_DISTANCE_MAX)) ? byPtr : byU32; + return LZ4_compress_generic(ctx, source, dest, inputSize, NULL, maxOutputSize, + limitedOutput, tableType, noDict, noDictIssue, acceleration); + } + } } /** @@ -1385,393 +1616,428 @@ int LZ4_compress_fast_extState(void* state, const char* source, char* dest, int * (see comment in lz4.h on LZ4_resetStream_fast() for a definition of * "correctly initialized"). */ -int LZ4_compress_fast_extState_fastReset(void* state, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration) -{ - LZ4_stream_t_internal* const ctx = &((LZ4_stream_t*)state)->internal_donotuse; - if (acceleration < 1) acceleration = LZ4_ACCELERATION_DEFAULT; - if (acceleration > LZ4_ACCELERATION_MAX) acceleration = LZ4_ACCELERATION_MAX; - assert(ctx != NULL); - - if (dstCapacity >= LZ4_compressBound(srcSize)) { - if (srcSize < LZ4_64Klimit) { - const tableType_t tableType = byU16; - LZ4_prepareTable(ctx, srcSize, tableType); - if (ctx->currentOffset) { - return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, 0, notLimited, tableType, noDict, dictSmall, acceleration); - } else { - return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, 0, notLimited, tableType, noDict, noDictIssue, acceleration); - } - } else { - const tableType_t tableType = ((sizeof(void*)==4) && ((uptrval)src > LZ4_DISTANCE_MAX)) ? byPtr : byU32; - LZ4_prepareTable(ctx, srcSize, tableType); - return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, 0, notLimited, tableType, noDict, noDictIssue, acceleration); - } - } else { - if (srcSize < LZ4_64Klimit) { - const tableType_t tableType = byU16; - LZ4_prepareTable(ctx, srcSize, tableType); - if (ctx->currentOffset) { - return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, dstCapacity, limitedOutput, tableType, noDict, dictSmall, acceleration); - } else { - return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, dstCapacity, limitedOutput, tableType, noDict, noDictIssue, acceleration); - } - } else { - const tableType_t tableType = ((sizeof(void*)==4) && ((uptrval)src > LZ4_DISTANCE_MAX)) ? byPtr : byU32; - LZ4_prepareTable(ctx, srcSize, tableType); - return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, dstCapacity, limitedOutput, tableType, noDict, noDictIssue, acceleration); - } - } -} - - -int LZ4_compress_fast(const char* src, char* dest, int srcSize, int dstCapacity, int acceleration) -{ - int result; +int LZ4_compress_fast_extState_fastReset( + void *state, const char *src, char *dst, int srcSize, int dstCapacity, int acceleration) { + LZ4_stream_t_internal *const ctx = &((LZ4_stream_t *)state)->internal_donotuse; + if (acceleration < 1) + acceleration = LZ4_ACCELERATION_DEFAULT; + if (acceleration > LZ4_ACCELERATION_MAX) + acceleration = LZ4_ACCELERATION_MAX; + assert(ctx != NULL); + + if (dstCapacity >= LZ4_compressBound(srcSize)) { + if (srcSize < LZ4_64Klimit) { + const tableType_t tableType = byU16; + LZ4_prepareTable(ctx, srcSize, tableType); + if (ctx->currentOffset) { + return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, 0, notLimited, tableType, + noDict, dictSmall, acceleration); + } else { + return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, 0, notLimited, tableType, + noDict, noDictIssue, acceleration); + } + } else { + const tableType_t tableType = + ((sizeof(void *) == 4) && ((uptrval)src > LZ4_DISTANCE_MAX)) ? byPtr : byU32; + LZ4_prepareTable(ctx, srcSize, tableType); + return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, 0, notLimited, tableType, + noDict, noDictIssue, acceleration); + } + } else { + if (srcSize < LZ4_64Klimit) { + const tableType_t tableType = byU16; + LZ4_prepareTable(ctx, srcSize, tableType); + if (ctx->currentOffset) { + return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, dstCapacity, + limitedOutput, tableType, noDict, dictSmall, acceleration); + } else { + return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, dstCapacity, + limitedOutput, tableType, noDict, noDictIssue, acceleration); + } + } else { + const tableType_t tableType = + ((sizeof(void *) == 4) && ((uptrval)src > LZ4_DISTANCE_MAX)) ? byPtr : byU32; + LZ4_prepareTable(ctx, srcSize, tableType); + return LZ4_compress_generic(ctx, src, dst, srcSize, NULL, dstCapacity, limitedOutput, + tableType, noDict, noDictIssue, acceleration); + } + } +} + +int LZ4_compress_fast(const char *src, char *dest, int srcSize, int dstCapacity, int acceleration) { + int result; #if (LZ4_HEAPMODE) - LZ4_stream_t* const ctxPtr = (LZ4_stream_t*)ALLOC(sizeof(LZ4_stream_t)); /* malloc-calloc always properly aligned */ - if (ctxPtr == NULL) return 0; + LZ4_stream_t *const ctxPtr = + (LZ4_stream_t *)ALLOC(sizeof(LZ4_stream_t)); /* malloc-calloc always properly aligned */ + if (ctxPtr == NULL) + return 0; #else - LZ4_stream_t ctx; - LZ4_stream_t* const ctxPtr = &ctx; + LZ4_stream_t ctx; + LZ4_stream_t *const ctxPtr = &ctx; #endif - result = LZ4_compress_fast_extState(ctxPtr, src, dest, srcSize, dstCapacity, acceleration); + result = LZ4_compress_fast_extState(ctxPtr, src, dest, srcSize, dstCapacity, acceleration); #if (LZ4_HEAPMODE) - FREEMEM(ctxPtr); + FREEMEM(ctxPtr); #endif - return result; + return result; } - -int LZ4_compress_default(const char* src, char* dst, int srcSize, int dstCapacity) -{ - return LZ4_compress_fast(src, dst, srcSize, dstCapacity, 1); +int LZ4_compress_default(const char *src, char *dst, int srcSize, int dstCapacity) { + return LZ4_compress_fast(src, dst, srcSize, dstCapacity, 1); } - /* Note!: This function leaves the stream in an unclean/broken state! * It is not safe to subsequently use the same state with a _fastReset() or * _continue() call without resetting it. */ -static int LZ4_compress_destSize_extState (LZ4_stream_t* state, const char* src, char* dst, int* srcSizePtr, int targetDstSize) -{ - void* const s = LZ4_initStream(state, sizeof (*state)); - assert(s != NULL); (void)s; - - if (targetDstSize >= LZ4_compressBound(*srcSizePtr)) { /* compression success is guaranteed */ - return LZ4_compress_fast_extState(state, src, dst, *srcSizePtr, targetDstSize, 1); - } else { - if (*srcSizePtr < LZ4_64Klimit) { - return LZ4_compress_generic(&state->internal_donotuse, src, dst, *srcSizePtr, srcSizePtr, targetDstSize, fillOutput, byU16, noDict, noDictIssue, 1); - } else { - tableType_t const addrMode = ((sizeof(void*)==4) && ((uptrval)src > LZ4_DISTANCE_MAX)) ? byPtr : byU32; - return LZ4_compress_generic(&state->internal_donotuse, src, dst, *srcSizePtr, srcSizePtr, targetDstSize, fillOutput, addrMode, noDict, noDictIssue, 1); - } } -} - - -int LZ4_compress_destSize(const char* src, char* dst, int* srcSizePtr, int targetDstSize) -{ +static int LZ4_compress_destSize_extState( + LZ4_stream_t *state, const char *src, char *dst, int *srcSizePtr, int targetDstSize) { + void *const s = LZ4_initStream(state, sizeof(*state)); + assert(s != NULL); + (void)s; + + if (targetDstSize >= LZ4_compressBound(*srcSizePtr)) { /* compression success is guaranteed */ + return LZ4_compress_fast_extState(state, src, dst, *srcSizePtr, targetDstSize, 1); + } else { + if (*srcSizePtr < LZ4_64Klimit) { + return LZ4_compress_generic(&state->internal_donotuse, src, dst, *srcSizePtr, + srcSizePtr, targetDstSize, fillOutput, byU16, noDict, noDictIssue, 1); + } else { + tableType_t const addrMode = + ((sizeof(void *) == 4) && ((uptrval)src > LZ4_DISTANCE_MAX)) ? byPtr : byU32; + return LZ4_compress_generic(&state->internal_donotuse, src, dst, *srcSizePtr, + srcSizePtr, targetDstSize, fillOutput, addrMode, noDict, noDictIssue, 1); + } + } +} + +int LZ4_compress_destSize(const char *src, char *dst, int *srcSizePtr, int targetDstSize) { #if (LZ4_HEAPMODE) - LZ4_stream_t* const ctx = (LZ4_stream_t*)ALLOC(sizeof(LZ4_stream_t)); /* malloc-calloc always properly aligned */ - if (ctx == NULL) return 0; + LZ4_stream_t *const ctx = + (LZ4_stream_t *)ALLOC(sizeof(LZ4_stream_t)); /* malloc-calloc always properly aligned */ + if (ctx == NULL) + return 0; #else - LZ4_stream_t ctxBody; - LZ4_stream_t* const ctx = &ctxBody; + LZ4_stream_t ctxBody; + LZ4_stream_t *const ctx = &ctxBody; #endif - int result = LZ4_compress_destSize_extState(ctx, src, dst, srcSizePtr, targetDstSize); + int result = LZ4_compress_destSize_extState(ctx, src, dst, srcSizePtr, targetDstSize); #if (LZ4_HEAPMODE) - FREEMEM(ctx); + FREEMEM(ctx); #endif - return result; + return result; } - - /*-****************************** -* Streaming functions -********************************/ + * Streaming functions + ********************************/ #if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) -LZ4_stream_t* LZ4_createStream(void) -{ - LZ4_stream_t* const lz4s = (LZ4_stream_t*)ALLOC(sizeof(LZ4_stream_t)); - LZ4_STATIC_ASSERT(sizeof(LZ4_stream_t) >= sizeof(LZ4_stream_t_internal)); - DEBUGLOG(4, "LZ4_createStream %p", lz4s); - if (lz4s == NULL) return NULL; - LZ4_initStream(lz4s, sizeof(*lz4s)); - return lz4s; +LZ4_stream_t *LZ4_createStream(void) { + LZ4_stream_t *const lz4s = (LZ4_stream_t *)ALLOC(sizeof(LZ4_stream_t)); + LZ4_STATIC_ASSERT(sizeof(LZ4_stream_t) >= sizeof(LZ4_stream_t_internal)); + DEBUGLOG(4, "LZ4_createStream %p", lz4s); + if (lz4s == NULL) + return NULL; + LZ4_initStream(lz4s, sizeof(*lz4s)); + return lz4s; } #endif -static size_t LZ4_stream_t_alignment(void) -{ +static size_t LZ4_stream_t_alignment(void) { #if LZ4_ALIGN_TEST - typedef struct { char c; LZ4_stream_t t; } t_a; - return sizeof(t_a) - sizeof(LZ4_stream_t); + typedef struct { + char c; + LZ4_stream_t t; + } t_a; + + return sizeof(t_a) - sizeof(LZ4_stream_t); #else - return 1; /* effectively disabled */ + return 1; /* effectively disabled */ #endif } -LZ4_stream_t* LZ4_initStream (void* buffer, size_t size) -{ - DEBUGLOG(5, "LZ4_initStream"); - if (buffer == NULL) { return NULL; } - if (size < sizeof(LZ4_stream_t)) { return NULL; } - if (!LZ4_isAligned(buffer, LZ4_stream_t_alignment())) return NULL; - MEM_INIT(buffer, 0, sizeof(LZ4_stream_t_internal)); - return (LZ4_stream_t*)buffer; +LZ4_stream_t *LZ4_initStream(void *buffer, size_t size) { + DEBUGLOG(5, "LZ4_initStream"); + if (buffer == NULL) { + return NULL; + } + if (size < sizeof(LZ4_stream_t)) { + return NULL; + } + if (!LZ4_isAligned(buffer, LZ4_stream_t_alignment())) + return NULL; + MEM_INIT(buffer, 0, sizeof(LZ4_stream_t_internal)); + return (LZ4_stream_t *)buffer; } /* resetStream is now deprecated, * prefer initStream() which is more general */ -void LZ4_resetStream (LZ4_stream_t* LZ4_stream) -{ - DEBUGLOG(5, "LZ4_resetStream (ctx:%p)", LZ4_stream); - MEM_INIT(LZ4_stream, 0, sizeof(LZ4_stream_t_internal)); +void LZ4_resetStream(LZ4_stream_t *LZ4_stream) { + DEBUGLOG(5, "LZ4_resetStream (ctx:%p)", LZ4_stream); + MEM_INIT(LZ4_stream, 0, sizeof(LZ4_stream_t_internal)); } -void LZ4_resetStream_fast(LZ4_stream_t* ctx) { - LZ4_prepareTable(&(ctx->internal_donotuse), 0, byU32); +void LZ4_resetStream_fast(LZ4_stream_t *ctx) { + LZ4_prepareTable(&(ctx->internal_donotuse), 0, byU32); } #if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) -int LZ4_freeStream (LZ4_stream_t* LZ4_stream) -{ - if (!LZ4_stream) return 0; /* support free on NULL */ - DEBUGLOG(5, "LZ4_freeStream %p", LZ4_stream); - FREEMEM(LZ4_stream); - return (0); +int LZ4_freeStream(LZ4_stream_t *LZ4_stream) { + if (!LZ4_stream) + return 0; /* support free on NULL */ + DEBUGLOG(5, "LZ4_freeStream %p", LZ4_stream); + FREEMEM(LZ4_stream); + return (0); } #endif - #define HASH_UNIT sizeof(reg_t) -int LZ4_loadDict (LZ4_stream_t* LZ4_dict, const char* dictionary, int dictSize) -{ - LZ4_stream_t_internal* const dict = &LZ4_dict->internal_donotuse; - const tableType_t tableType = byU32; - const BYTE* p = (const BYTE*)dictionary; - const BYTE* const dictEnd = p + dictSize; - U32 idx32; - - DEBUGLOG(4, "LZ4_loadDict (%i bytes from %p into %p)", dictSize, dictionary, LZ4_dict); - - /* It's necessary to reset the context, - * and not just continue it with prepareTable() - * to avoid any risk of generating overflowing matchIndex - * when compressing using this dictionary */ - LZ4_resetStream(LZ4_dict); - - /* We always increment the offset by 64 KB, since, if the dict is longer, - * we truncate it to the last 64k, and if it's shorter, we still want to - * advance by a whole window length so we can provide the guarantee that - * there are only valid offsets in the window, which allows an optimization - * in LZ4_compress_fast_continue() where it uses noDictIssue even when the - * dictionary isn't a full 64k. */ - dict->currentOffset += 64 KB; - - if (dictSize < (int)HASH_UNIT) { - return 0; - } - - if ((dictEnd - p) > 64 KB) p = dictEnd - 64 KB; - dict->dictionary = p; - dict->dictSize = (U32)(dictEnd - p); - dict->tableType = (U32)tableType; - idx32 = dict->currentOffset - dict->dictSize; - - while (p <= dictEnd-HASH_UNIT) { - U32 const h = LZ4_hashPosition(p, tableType); - LZ4_putIndexOnHash(idx32, h, dict->hashTable, tableType); - p+=3; idx32+=3; - } - - return (int)dict->dictSize; -} - -void LZ4_attach_dictionary(LZ4_stream_t* workingStream, const LZ4_stream_t* dictionaryStream) -{ - const LZ4_stream_t_internal* dictCtx = (dictionaryStream == NULL) ? NULL : - &(dictionaryStream->internal_donotuse); - - DEBUGLOG(4, "LZ4_attach_dictionary (%p, %p, size %u)", - workingStream, dictionaryStream, - dictCtx != NULL ? dictCtx->dictSize : 0); - - if (dictCtx != NULL) { - /* If the current offset is zero, we will never look in the - * external dictionary context, since there is no value a table - * entry can take that indicate a miss. In that case, we need - * to bump the offset to something non-zero. - */ - if (workingStream->internal_donotuse.currentOffset == 0) { - workingStream->internal_donotuse.currentOffset = 64 KB; - } - - /* Don't actually attach an empty dictionary. - */ - if (dictCtx->dictSize == 0) { - dictCtx = NULL; - } - } - workingStream->internal_donotuse.dictCtx = dictCtx; -} - - -static void LZ4_renormDictT(LZ4_stream_t_internal* LZ4_dict, int nextSize) -{ - assert(nextSize >= 0); - if (LZ4_dict->currentOffset + (unsigned)nextSize > 0x80000000) { /* potential ptrdiff_t overflow (32-bits mode) */ - /* rescale hash table */ - U32 const delta = LZ4_dict->currentOffset - 64 KB; - const BYTE* dictEnd = LZ4_dict->dictionary + LZ4_dict->dictSize; - int i; - DEBUGLOG(4, "LZ4_renormDictT"); - for (i=0; ihashTable[i] < delta) LZ4_dict->hashTable[i]=0; - else LZ4_dict->hashTable[i] -= delta; - } - LZ4_dict->currentOffset = 64 KB; - if (LZ4_dict->dictSize > 64 KB) LZ4_dict->dictSize = 64 KB; - LZ4_dict->dictionary = dictEnd - LZ4_dict->dictSize; - } -} - - -int LZ4_compress_fast_continue (LZ4_stream_t* LZ4_stream, - const char* source, char* dest, - int inputSize, int maxOutputSize, - int acceleration) -{ - const tableType_t tableType = byU32; - LZ4_stream_t_internal* const streamPtr = &LZ4_stream->internal_donotuse; - const char* dictEnd = streamPtr->dictSize ? (const char*)streamPtr->dictionary + streamPtr->dictSize : NULL; - - DEBUGLOG(5, "LZ4_compress_fast_continue (inputSize=%i, dictSize=%u)", inputSize, streamPtr->dictSize); - - LZ4_renormDictT(streamPtr, inputSize); /* fix index overflow */ - if (acceleration < 1) acceleration = LZ4_ACCELERATION_DEFAULT; - if (acceleration > LZ4_ACCELERATION_MAX) acceleration = LZ4_ACCELERATION_MAX; - - /* invalidate tiny dictionaries */ - if ( (streamPtr->dictSize < 4) /* tiny dictionary : not enough for a hash */ - && (dictEnd != source) /* prefix mode */ - && (inputSize > 0) /* tolerance : don't lose history, in case next invocation would use prefix mode */ - && (streamPtr->dictCtx == NULL) /* usingDictCtx */ - ) { - DEBUGLOG(5, "LZ4_compress_fast_continue: dictSize(%u) at addr:%p is too small", streamPtr->dictSize, streamPtr->dictionary); - /* remove dictionary existence from history, to employ faster prefix mode */ - streamPtr->dictSize = 0; - streamPtr->dictionary = (const BYTE*)source; - dictEnd = source; - } - - /* Check overlapping input/dictionary space */ - { const char* const sourceEnd = source + inputSize; - if ((sourceEnd > (const char*)streamPtr->dictionary) && (sourceEnd < dictEnd)) { - streamPtr->dictSize = (U32)(dictEnd - sourceEnd); - if (streamPtr->dictSize > 64 KB) streamPtr->dictSize = 64 KB; - if (streamPtr->dictSize < 4) streamPtr->dictSize = 0; - streamPtr->dictionary = (const BYTE*)dictEnd - streamPtr->dictSize; - } - } - - /* prefix mode : source data follows dictionary */ - if (dictEnd == source) { - if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset)) - return LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, withPrefix64k, dictSmall, acceleration); - else - return LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, withPrefix64k, noDictIssue, acceleration); - } - - /* external dictionary mode */ - { int result; - if (streamPtr->dictCtx) { - /* We depend here on the fact that dictCtx'es (produced by - * LZ4_loadDict) guarantee that their tables contain no references - * to offsets between dictCtx->currentOffset - 64 KB and - * dictCtx->currentOffset - dictCtx->dictSize. This makes it safe - * to use noDictIssue even when the dict isn't a full 64 KB. - */ - if (inputSize > 4 KB) { - /* For compressing large blobs, it is faster to pay the setup - * cost to copy the dictionary's tables into the active context, - * so that the compression loop is only looking into one table. - */ - LZ4_memcpy(streamPtr, streamPtr->dictCtx, sizeof(*streamPtr)); - result = LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, usingExtDict, noDictIssue, acceleration); - } else { - result = LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, usingDictCtx, noDictIssue, acceleration); - } - } else { /* small data <= 4 KB */ - if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset)) { - result = LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, usingExtDict, dictSmall, acceleration); - } else { - result = LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, limitedOutput, tableType, usingExtDict, noDictIssue, acceleration); - } - } - streamPtr->dictionary = (const BYTE*)source; - streamPtr->dictSize = (U32)inputSize; - return result; - } -} +int LZ4_loadDict(LZ4_stream_t *LZ4_dict, const char *dictionary, int dictSize) { + LZ4_stream_t_internal *const dict = &LZ4_dict->internal_donotuse; + const tableType_t tableType = byU32; + const BYTE *p = (const BYTE *)dictionary; + const BYTE *const dictEnd = p + dictSize; + U32 idx32; + + DEBUGLOG(4, "LZ4_loadDict (%i bytes from %p into %p)", dictSize, dictionary, LZ4_dict); + + /* It's necessary to reset the context, + * and not just continue it with prepareTable() + * to avoid any risk of generating overflowing matchIndex + * when compressing using this dictionary */ + LZ4_resetStream(LZ4_dict); + + /* We always increment the offset by 64 KB, since, if the dict is longer, + * we truncate it to the last 64k, and if it's shorter, we still want to + * advance by a whole window length so we can provide the guarantee that + * there are only valid offsets in the window, which allows an optimization + * in LZ4_compress_fast_continue() where it uses noDictIssue even when the + * dictionary isn't a full 64k. */ + dict->currentOffset += 64 KB; + + if (dictSize < (int)HASH_UNIT) { + return 0; + } + + if ((dictEnd - p) > 64 KB) + p = dictEnd - 64 KB; + dict->dictionary = p; + dict->dictSize = (U32)(dictEnd - p); + dict->tableType = (U32)tableType; + idx32 = dict->currentOffset - dict->dictSize; + + while (p <= dictEnd - HASH_UNIT) { + U32 const h = LZ4_hashPosition(p, tableType); + LZ4_putIndexOnHash(idx32, h, dict->hashTable, tableType); + p += 3; + idx32 += 3; + } + + return (int)dict->dictSize; +} + +void LZ4_attach_dictionary(LZ4_stream_t *workingStream, const LZ4_stream_t *dictionaryStream) { + const LZ4_stream_t_internal *dictCtx = + (dictionaryStream == NULL) ? NULL : &(dictionaryStream->internal_donotuse); + + DEBUGLOG(4, "LZ4_attach_dictionary (%p, %p, size %u)", workingStream, dictionaryStream, + dictCtx != NULL ? dictCtx->dictSize : 0); + + if (dictCtx != NULL) { + /* If the current offset is zero, we will never look in the + * external dictionary context, since there is no value a table + * entry can take that indicate a miss. In that case, we need + * to bump the offset to something non-zero. + */ + if (workingStream->internal_donotuse.currentOffset == 0) { + workingStream->internal_donotuse.currentOffset = 64 KB; + } + + /* Don't actually attach an empty dictionary. + */ + if (dictCtx->dictSize == 0) { + dictCtx = NULL; + } + } + workingStream->internal_donotuse.dictCtx = dictCtx; +} + +static void LZ4_renormDictT(LZ4_stream_t_internal *LZ4_dict, int nextSize) { + assert(nextSize >= 0); + if (LZ4_dict->currentOffset + (unsigned)nextSize > + 0x80000000) { /* potential ptrdiff_t overflow (32-bits mode) */ + /* rescale hash table */ + U32 const delta = LZ4_dict->currentOffset - 64 KB; + const BYTE *dictEnd = LZ4_dict->dictionary + LZ4_dict->dictSize; + int i; + DEBUGLOG(4, "LZ4_renormDictT"); + for (i = 0; i < LZ4_HASH_SIZE_U32; i++) { + if (LZ4_dict->hashTable[i] < delta) + LZ4_dict->hashTable[i] = 0; + else + LZ4_dict->hashTable[i] -= delta; + } + LZ4_dict->currentOffset = 64 KB; + if (LZ4_dict->dictSize > 64 KB) + LZ4_dict->dictSize = 64 KB; + LZ4_dict->dictionary = dictEnd - LZ4_dict->dictSize; + } +} + +int LZ4_compress_fast_continue(LZ4_stream_t *LZ4_stream, const char *source, char *dest, + int inputSize, int maxOutputSize, int acceleration) { + const tableType_t tableType = byU32; + LZ4_stream_t_internal *const streamPtr = &LZ4_stream->internal_donotuse; + const char *dictEnd = + streamPtr->dictSize ? (const char *)streamPtr->dictionary + streamPtr->dictSize : NULL; + + DEBUGLOG(5, "LZ4_compress_fast_continue (inputSize=%i, dictSize=%u)", inputSize, + streamPtr->dictSize); + + LZ4_renormDictT(streamPtr, inputSize); /* fix index overflow */ + if (acceleration < 1) + acceleration = LZ4_ACCELERATION_DEFAULT; + if (acceleration > LZ4_ACCELERATION_MAX) + acceleration = LZ4_ACCELERATION_MAX; + + /* invalidate tiny dictionaries */ + if ((streamPtr->dictSize < 4) /* tiny dictionary : not enough for a hash */ + && (dictEnd != source) /* prefix mode */ + && (inputSize > 0) /* tolerance : don't lose history, in case next + invocation would use prefix mode */ + && (streamPtr->dictCtx == NULL) /* usingDictCtx */ + ) { + DEBUGLOG(5, "LZ4_compress_fast_continue: dictSize(%u) at addr:%p is too small", + streamPtr->dictSize, streamPtr->dictionary); + /* remove dictionary existence from history, to employ faster prefix + * mode */ + streamPtr->dictSize = 0; + streamPtr->dictionary = (const BYTE *)source; + dictEnd = source; + } + + /* Check overlapping input/dictionary space */ + { + const char *const sourceEnd = source + inputSize; + if ((sourceEnd > (const char *)streamPtr->dictionary) && (sourceEnd < dictEnd)) { + streamPtr->dictSize = (U32)(dictEnd - sourceEnd); + if (streamPtr->dictSize > 64 KB) + streamPtr->dictSize = 64 KB; + if (streamPtr->dictSize < 4) + streamPtr->dictSize = 0; + streamPtr->dictionary = (const BYTE *)dictEnd - streamPtr->dictSize; + } + } + + /* prefix mode : source data follows dictionary */ + if (dictEnd == source) { + if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset)) + return LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, + limitedOutput, tableType, withPrefix64k, dictSmall, acceleration); + else + return LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, + limitedOutput, tableType, withPrefix64k, noDictIssue, acceleration); + } + + /* external dictionary mode */ + { + int result; + if (streamPtr->dictCtx) { + /* We depend here on the fact that dictCtx'es (produced by + * LZ4_loadDict) guarantee that their tables contain no references + * to offsets between dictCtx->currentOffset - 64 KB and + * dictCtx->currentOffset - dictCtx->dictSize. This makes it safe + * to use noDictIssue even when the dict isn't a full 64 KB. + */ + if (inputSize > 4 KB) { + /* For compressing large blobs, it is faster to pay the setup + * cost to copy the dictionary's tables into the active context, + * so that the compression loop is only looking into one table. + */ + LZ4_memcpy(streamPtr, streamPtr->dictCtx, sizeof(*streamPtr)); + result = + LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, + limitedOutput, tableType, usingExtDict, noDictIssue, acceleration); + } else { + result = + LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, + limitedOutput, tableType, usingDictCtx, noDictIssue, acceleration); + } + } else { /* small data <= 4 KB */ + if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset)) { + result = LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, + maxOutputSize, limitedOutput, tableType, usingExtDict, dictSmall, acceleration); + } else { + result = + LZ4_compress_generic(streamPtr, source, dest, inputSize, NULL, maxOutputSize, + limitedOutput, tableType, usingExtDict, noDictIssue, acceleration); + } + } + streamPtr->dictionary = (const BYTE *)source; + streamPtr->dictSize = (U32)inputSize; + return result; + } +} /* Hidden debug function, to force-test external dictionary mode */ -int LZ4_compress_forceExtDict (LZ4_stream_t* LZ4_dict, const char* source, char* dest, int srcSize) -{ - LZ4_stream_t_internal* const streamPtr = &LZ4_dict->internal_donotuse; - int result; +int LZ4_compress_forceExtDict(LZ4_stream_t *LZ4_dict, const char *source, char *dest, int srcSize) { + LZ4_stream_t_internal *const streamPtr = &LZ4_dict->internal_donotuse; + int result; - LZ4_renormDictT(streamPtr, srcSize); + LZ4_renormDictT(streamPtr, srcSize); - if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset)) { - result = LZ4_compress_generic(streamPtr, source, dest, srcSize, NULL, 0, notLimited, byU32, usingExtDict, dictSmall, 1); - } else { - result = LZ4_compress_generic(streamPtr, source, dest, srcSize, NULL, 0, notLimited, byU32, usingExtDict, noDictIssue, 1); - } + if ((streamPtr->dictSize < 64 KB) && (streamPtr->dictSize < streamPtr->currentOffset)) { + result = LZ4_compress_generic(streamPtr, source, dest, srcSize, NULL, 0, notLimited, byU32, + usingExtDict, dictSmall, 1); + } else { + result = LZ4_compress_generic(streamPtr, source, dest, srcSize, NULL, 0, notLimited, byU32, + usingExtDict, noDictIssue, 1); + } - streamPtr->dictionary = (const BYTE*)source; - streamPtr->dictSize = (U32)srcSize; + streamPtr->dictionary = (const BYTE *)source; + streamPtr->dictSize = (U32)srcSize; - return result; + return result; } - /*! LZ4_saveDict() : - * If previously compressed data block is not guaranteed to remain available at its memory location, - * save it into a safer place (char* safeBuffer). - * Note : no need to call LZ4_loadDict() afterwards, dictionary is immediately usable, - * one can therefore call LZ4_compress_fast_continue() right after. - * @return : saved dictionary size in bytes (necessarily <= dictSize), or 0 if error. + * If previously compressed data block is not guaranteed to remain available at + * its memory location, save it into a safer place (char* safeBuffer). Note : no + * need to call LZ4_loadDict() afterwards, dictionary is immediately usable, one + * can therefore call LZ4_compress_fast_continue() right after. + * @return : saved dictionary size in bytes (necessarily <= dictSize), or 0 if + * error. */ -int LZ4_saveDict (LZ4_stream_t* LZ4_dict, char* safeBuffer, int dictSize) -{ - LZ4_stream_t_internal* const dict = &LZ4_dict->internal_donotuse; +int LZ4_saveDict(LZ4_stream_t *LZ4_dict, char *safeBuffer, int dictSize) { + LZ4_stream_t_internal *const dict = &LZ4_dict->internal_donotuse; - DEBUGLOG(5, "LZ4_saveDict : dictSize=%i, safeBuffer=%p", dictSize, safeBuffer); + DEBUGLOG(5, "LZ4_saveDict : dictSize=%i, safeBuffer=%p", dictSize, safeBuffer); - if ((U32)dictSize > 64 KB) { dictSize = 64 KB; } /* useless to define a dictionary > 64 KB */ - if ((U32)dictSize > dict->dictSize) { dictSize = (int)dict->dictSize; } + if ((U32)dictSize > 64 KB) { + dictSize = 64 KB; + } /* useless to define a dictionary > 64 KB */ + if ((U32)dictSize > dict->dictSize) { + dictSize = (int)dict->dictSize; + } - if (safeBuffer == NULL) assert(dictSize == 0); - if (dictSize > 0) { - const BYTE* const previousDictEnd = dict->dictionary + dict->dictSize; - assert(dict->dictionary); - LZ4_memmove(safeBuffer, previousDictEnd - dictSize, (size_t)dictSize); - } + if (safeBuffer == NULL) + assert(dictSize == 0); + if (dictSize > 0) { + const BYTE *const previousDictEnd = dict->dictionary + dict->dictSize; + assert(dict->dictionary); + LZ4_memmove(safeBuffer, previousDictEnd - dictSize, (size_t)dictSize); + } - dict->dictionary = (const BYTE*)safeBuffer; - dict->dictSize = (U32)dictSize; + dict->dictionary = (const BYTE *)safeBuffer; + dict->dictSize = (U32)dictSize; - return dictSize; + return dictSize; } - - /*-******************************* * Decompression functions ********************************/ @@ -1779,19 +2045,21 @@ int LZ4_saveDict (LZ4_stream_t* LZ4_dict, char* safeBuffer, int dictSize) typedef enum { decode_full_block = 0, partial_decode = 1 } earlyEnd_directive; #undef MIN -#define MIN(a,b) ( (a) < (b) ? (a) : (b) ) - +#define MIN(a, b) ((a) < (b) ? (a) : (b)) /* variant for decompress_unsafe() * does not know end of input * presumes input is well formed * note : will consume at least one byte */ -size_t read_long_length_no_check(const BYTE** pp) -{ - size_t b, l = 0; - do { b = **pp; (*pp)++; l += b; } while (b==255); - DEBUGLOG(6, "read_long_length_no_check: +length=%zu using %zu input bytes", l, l/255 + 1) - return l; +size_t read_long_length_no_check(const BYTE **pp) { + size_t b, l = 0; + do { + b = **pp; + (*pp)++; + l += b; + } while (b == 255); + DEBUGLOG(6, "read_long_length_no_check: +length=%zu using %zu input bytes", l, l / 255 + 1) + return l; } /* core decoder variant for LZ4_decompress_fast*() @@ -1802,725 +2070,782 @@ size_t read_long_length_no_check(const BYTE** pp) * @return : nb of bytes read from input. * Note : this variant is not optimized for speed, just for maintenance. * the goal is to remove support of decompress_fast*() variants by v2.0 -**/ -LZ4_FORCE_INLINE int -LZ4_decompress_unsafe_generic( - const BYTE* const istart, - BYTE* const ostart, - int decompressedSize, - - size_t prefixSize, - const BYTE* const dictStart, /* only if dict==usingExtDict */ - const size_t dictSize /* note: =0 if dictStart==NULL */ - ) -{ - const BYTE* ip = istart; - BYTE* op = (BYTE*)ostart; - BYTE* const oend = ostart + decompressedSize; - const BYTE* const prefixStart = ostart - prefixSize; - - DEBUGLOG(5, "LZ4_decompress_unsafe_generic"); - if (dictStart == NULL) assert(dictSize == 0); - - while (1) { - /* start new sequence */ - unsigned token = *ip++; - - /* literals */ - { size_t ll = token >> ML_BITS; - if (ll==15) { - /* long literal length */ - ll += read_long_length_no_check(&ip); - } - if ((size_t)(oend-op) < ll) return -1; /* output buffer overflow */ - LZ4_memmove(op, ip, ll); /* support in-place decompression */ - op += ll; - ip += ll; - if ((size_t)(oend-op) < MFLIMIT) { - if (op==oend) break; /* end of block */ - DEBUGLOG(5, "invalid: literals end at distance %zi from end of block", oend-op); - /* incorrect end of block : - * last match must start at least MFLIMIT==12 bytes before end of output block */ - return -1; - } } - - /* match */ - { size_t ml = token & 15; - size_t const offset = LZ4_readLE16(ip); - ip+=2; - - if (ml==15) { - /* long literal length */ - ml += read_long_length_no_check(&ip); - } - ml += MINMATCH; - - if ((size_t)(oend-op) < ml) return -1; /* output buffer overflow */ - - { const BYTE* match = op - offset; - - /* out of range */ - if (offset > (size_t)(op - prefixStart) + dictSize) { - DEBUGLOG(6, "offset out of range"); - return -1; - } - - /* check special case : extDict */ - if (offset > (size_t)(op - prefixStart)) { - /* extDict scenario */ - const BYTE* const dictEnd = dictStart + dictSize; - const BYTE* extMatch = dictEnd - (offset - (size_t)(op-prefixStart)); - size_t const extml = (size_t)(dictEnd - extMatch); - if (extml > ml) { - /* match entirely within extDict */ - LZ4_memmove(op, extMatch, ml); - op += ml; - ml = 0; - } else { - /* match split between extDict & prefix */ - LZ4_memmove(op, extMatch, extml); - op += extml; - ml -= extml; - } - match = prefixStart; - } - - /* match copy - slow variant, supporting overlap copy */ - { size_t u; - for (u=0; u> ML_BITS; + if (ll == 15) { + /* long literal length */ + ll += read_long_length_no_check(&ip); + } + if ((size_t)(oend - op) < ll) + return -1; /* output buffer overflow */ + LZ4_memmove(op, ip, ll); /* support in-place decompression */ + op += ll; + ip += ll; + if ((size_t)(oend - op) < MFLIMIT) { + if (op == oend) + break; /* end of block */ + DEBUGLOG(5, "invalid: literals end at distance %zi from end of block", oend - op); + /* incorrect end of block : + * last match must start at least MFLIMIT==12 bytes before end + * of output block */ + return -1; + } + } + + /* match */ + { + size_t ml = token & 15; + size_t const offset = LZ4_readLE16(ip); + ip += 2; + + if (ml == 15) { + /* long literal length */ + ml += read_long_length_no_check(&ip); + } + ml += MINMATCH; + + if ((size_t)(oend - op) < ml) + return -1; /* output buffer overflow */ + + { + const BYTE *match = op - offset; + + /* out of range */ + if (offset > (size_t)(op - prefixStart) + dictSize) { + DEBUGLOG(6, "offset out of range"); + return -1; + } + + /* check special case : extDict */ + if (offset > (size_t)(op - prefixStart)) { + /* extDict scenario */ + const BYTE *const dictEnd = dictStart + dictSize; + const BYTE *extMatch = dictEnd - (offset - (size_t)(op - prefixStart)); + size_t const extml = (size_t)(dictEnd - extMatch); + if (extml > ml) { + /* match entirely within extDict */ + LZ4_memmove(op, extMatch, ml); + op += ml; + ml = 0; + } else { + /* match split between extDict & prefix */ + LZ4_memmove(op, extMatch, extml); + op += extml; + ml -= extml; + } + match = prefixStart; + } + + /* match copy - slow variant, supporting overlap copy */ + { + size_t u; + for (u = 0; u < ml; u++) { + op[u] = match[u]; + } + } + } + op += ml; + if ((size_t)(oend - op) < LASTLITERALS) { + DEBUGLOG(5, "invalid: match ends at distance %zi from end of block", oend - op); + /* incorrect end of block : + * last match must stop at least LASTLITERALS==5 bytes before + * end of output block */ + return -1; + } + } /* match */ + } /* main loop */ + return (int)(ip - istart); } - /* Read the variable-length literal or match length. * * @ip : input pointer - * @ilimit : position after which if length is not decoded, the input is necessarily corrupted. - * @initial_check - check ip >= ipmax before start of loop. Returns initial_error if so. + * @ilimit : position after which if length is not decoded, the input is + *necessarily corrupted. + * @initial_check - check ip >= ipmax before start of loop. Returns + *initial_error if so. * @error (output) - error code. Must be set to 0 before call. -**/ + **/ typedef size_t Rvl_t; static const Rvl_t rvl_error = (Rvl_t)(-1); -LZ4_FORCE_INLINE Rvl_t -read_variable_length(const BYTE** ip, const BYTE* ilimit, - int initial_check) -{ - Rvl_t s, length = 0; - assert(ip != NULL); - assert(*ip != NULL); - assert(ilimit != NULL); - if (initial_check && unlikely((*ip) >= ilimit)) { /* read limit reached */ - return rvl_error; - } - do { - s = **ip; - (*ip)++; - length += s; - if (unlikely((*ip) > ilimit)) { /* read limit reached */ - return rvl_error; - } - /* accumulator overflow detection (32-bit mode only) */ - if ((sizeof(length)<8) && unlikely(length > ((Rvl_t)(-1)/2)) ) { - return rvl_error; - } - } while (s==255); - - return length; + +LZ4_FORCE_INLINE Rvl_t read_variable_length( + const BYTE **ip, const BYTE *ilimit, int initial_check) { + Rvl_t s, length = 0; + assert(ip != NULL); + assert(*ip != NULL); + assert(ilimit != NULL); + if (initial_check && unlikely((*ip) >= ilimit)) { /* read limit reached */ + return rvl_error; + } + do { + s = **ip; + (*ip)++; + length += s; + if (unlikely((*ip) > ilimit)) { /* read limit reached */ + return rvl_error; + } + /* accumulator overflow detection (32-bit mode only) */ + if ((sizeof(length) < 8) && unlikely(length > ((Rvl_t)(-1) / 2))) { + return rvl_error; + } + } while (s == 255); + + return length; } /*! LZ4_decompress_generic() : * This generic decompression function covers all use cases. * It shall be instantiated several times, using different sets of directives. - * Note that it is important for performance that this function really get inlined, - * in order to remove useless branches during compilation optimization. + * Note that it is important for performance that this function really get + * inlined, in order to remove useless branches during compilation optimization. */ -LZ4_FORCE_INLINE int -LZ4_decompress_generic( - const char* const src, - char* const dst, - int srcSize, - int outputSize, /* If endOnInput==endOnInputSize, this value is `dstCapacity` */ - - earlyEnd_directive partialDecoding, /* full, partial */ - dict_directive dict, /* noDict, withPrefix64k, usingExtDict */ - const BYTE* const lowPrefix, /* always <= dst, == dst when no prefix */ - const BYTE* const dictStart, /* only if dict==usingExtDict */ - const size_t dictSize /* note : = 0 if noDict */ - ) -{ - if ((src == NULL) || (outputSize < 0)) { return -1; } - - { const BYTE* ip = (const BYTE*) src; - const BYTE* const iend = ip + srcSize; - - BYTE* op = (BYTE*) dst; - BYTE* const oend = op + outputSize; - BYTE* cpy; - - const BYTE* const dictEnd = (dictStart == NULL) ? NULL : dictStart + dictSize; - - const int checkOffset = (dictSize < (int)(64 KB)); - - - /* Set up the "end" pointers for the shortcut. */ - const BYTE* const shortiend = iend - 14 /*maxLL*/ - 2 /*offset*/; - const BYTE* const shortoend = oend - 14 /*maxLL*/ - 18 /*maxML*/; - - const BYTE* match; - size_t offset; - unsigned token; - size_t length; - - - DEBUGLOG(5, "LZ4_decompress_generic (srcSize:%i, dstSize:%i)", srcSize, outputSize); - - /* Special cases */ - assert(lowPrefix <= op); - if (unlikely(outputSize==0)) { - /* Empty output buffer */ - if (partialDecoding) return 0; - return ((srcSize==1) && (*ip==0)) ? 0 : -1; - } - if (unlikely(srcSize==0)) { return -1; } - - /* LZ4_FAST_DEC_LOOP: - * designed for modern OoO performance cpus, - * where copying reliably 32-bytes is preferable to an unpredictable branch. - * note : fast loop may show a regression for some client arm chips. */ +LZ4_FORCE_INLINE int LZ4_decompress_generic(const char *const src, char *const dst, int srcSize, + int outputSize, /* If endOnInput==endOnInputSize, this value is + `dstCapacity` */ + + earlyEnd_directive partialDecoding, /* full, partial */ + dict_directive dict, /* noDict, withPrefix64k, usingExtDict */ + const BYTE *const lowPrefix, /* always <= dst, == dst when no prefix */ + const BYTE *const dictStart, /* only if dict==usingExtDict */ + const size_t dictSize /* note : = 0 if noDict */ +) { + if ((src == NULL) || (outputSize < 0)) { + return -1; + } + + { + const BYTE *ip = (const BYTE *)src; + const BYTE *const iend = ip + srcSize; + + BYTE *op = (BYTE *)dst; + BYTE *const oend = op + outputSize; + BYTE *cpy; + + const BYTE *const dictEnd = (dictStart == NULL) ? NULL : dictStart + dictSize; + + const int checkOffset = (dictSize < (int)(64 KB)); + + /* Set up the "end" pointers for the shortcut. */ + const BYTE *const shortiend = iend - 14 /*maxLL*/ - 2 /*offset*/; + const BYTE *const shortoend = oend - 14 /*maxLL*/ - 18 /*maxML*/; + + const BYTE *match; + size_t offset; + unsigned token; + size_t length; + + DEBUGLOG(5, "LZ4_decompress_generic (srcSize:%i, dstSize:%i)", srcSize, outputSize); + + /* Special cases */ + assert(lowPrefix <= op); + if (unlikely(outputSize == 0)) { + /* Empty output buffer */ + if (partialDecoding) + return 0; + return ((srcSize == 1) && (*ip == 0)) ? 0 : -1; + } + if (unlikely(srcSize == 0)) { + return -1; + } + + /* LZ4_FAST_DEC_LOOP: + * designed for modern OoO performance cpus, + * where copying reliably 32-bytes is preferable to an unpredictable + * branch. note : fast loop may show a regression for some client arm + * chips. */ #if LZ4_FAST_DEC_LOOP - if ((oend - op) < FASTLOOP_SAFE_DISTANCE) { - DEBUGLOG(6, "skip fast decode loop"); - goto safe_decode; - } - - /* Fast loop : decode sequences as long as output < oend-FASTLOOP_SAFE_DISTANCE */ - DEBUGLOG(6, "using fast decode loop"); - while (1) { - /* Main fastloop assertion: We can always wildcopy FASTLOOP_SAFE_DISTANCE */ - assert(oend - op >= FASTLOOP_SAFE_DISTANCE); - assert(ip < iend); - token = *ip++; - length = token >> ML_BITS; /* literal length */ - - /* decode literal length */ - if (length == RUN_MASK) { - size_t const addl = read_variable_length(&ip, iend-RUN_MASK, 1); - if (addl == rvl_error) { - DEBUGLOG(6, "error reading long literal length"); - goto _output_error; - } - length += addl; - if (unlikely((uptrval)(op)+length<(uptrval)(op))) { goto _output_error; } /* overflow detection */ - if (unlikely((uptrval)(ip)+length<(uptrval)(ip))) { goto _output_error; } /* overflow detection */ - - /* copy literals */ - cpy = op+length; - LZ4_STATIC_ASSERT(MFLIMIT >= WILDCOPYLENGTH); - if ((cpy>oend-32) || (ip+length>iend-32)) { goto safe_literal_copy; } - LZ4_wildCopy32(op, ip, cpy); - ip += length; op = cpy; - } else { - cpy = op+length; - DEBUGLOG(7, "copy %u bytes in a 16-bytes stripe", (unsigned)length); - /* We don't need to check oend, since we check it once for each loop below */ - if (ip > iend-(16 + 1/*max lit + offset + nextToken*/)) { goto safe_literal_copy; } - /* Literals can only be <= 14, but hope compilers optimize better when copy by a register size */ - LZ4_memcpy(op, ip, 16); - ip += length; op = cpy; - } - - /* get offset */ - offset = LZ4_readLE16(ip); ip+=2; - DEBUGLOG(6, " offset = %zu", offset); - match = op - offset; - assert(match <= op); /* overflow check */ - - /* get matchlength */ - length = token & ML_MASK; - - if (length == ML_MASK) { - size_t const addl = read_variable_length(&ip, iend - LASTLITERALS + 1, 0); - if (addl == rvl_error) { - DEBUGLOG(6, "error reading long match length"); - goto _output_error; - } - length += addl; - length += MINMATCH; - if (unlikely((uptrval)(op)+length<(uptrval)op)) { goto _output_error; } /* overflow detection */ - if ((checkOffset) && (unlikely(match + dictSize < lowPrefix))) { - DEBUGLOG(6, "Error : offset outside buffers"); - goto _output_error; - } - if (op + length >= oend - FASTLOOP_SAFE_DISTANCE) { - goto safe_match_copy; - } - } else { - length += MINMATCH; - if (op + length >= oend - FASTLOOP_SAFE_DISTANCE) { - goto safe_match_copy; - } - - /* Fastpath check: skip LZ4_wildCopy32 when true */ - if ((dict == withPrefix64k) || (match >= lowPrefix)) { - if (offset >= 8) { - assert(match >= lowPrefix); - assert(match <= op); - assert(op + 18 <= oend); - - LZ4_memcpy(op, match, 8); - LZ4_memcpy(op+8, match+8, 8); - LZ4_memcpy(op+16, match+16, 2); - op += length; - continue; - } } } - - if ( checkOffset && (unlikely(match + dictSize < lowPrefix)) ) { - DEBUGLOG(6, "Error : pos=%zi, offset=%zi => outside buffers", op-lowPrefix, op-match); - goto _output_error; - } - /* match starting within external dictionary */ - if ((dict==usingExtDict) && (match < lowPrefix)) { - assert(dictEnd != NULL); - if (unlikely(op+length > oend-LASTLITERALS)) { - if (partialDecoding) { - DEBUGLOG(7, "partialDecoding: dictionary match, close to dstEnd"); - length = MIN(length, (size_t)(oend-op)); - } else { - DEBUGLOG(6, "end-of-block condition violated") - goto _output_error; - } } - - if (length <= (size_t)(lowPrefix-match)) { - /* match fits entirely within external dictionary : just copy */ - LZ4_memmove(op, dictEnd - (lowPrefix-match), length); - op += length; - } else { - /* match stretches into both external dictionary and current block */ - size_t const copySize = (size_t)(lowPrefix - match); - size_t const restSize = length - copySize; - LZ4_memcpy(op, dictEnd - copySize, copySize); - op += copySize; - if (restSize > (size_t)(op - lowPrefix)) { /* overlap copy */ - BYTE* const endOfMatch = op + restSize; - const BYTE* copyFrom = lowPrefix; - while (op < endOfMatch) { *op++ = *copyFrom++; } - } else { - LZ4_memcpy(op, lowPrefix, restSize); - op += restSize; - } } - continue; - } - - /* copy match within block */ - cpy = op + length; - - assert((op <= oend) && (oend-op >= 32)); - if (unlikely(offset<16)) { - LZ4_memcpy_using_offset(op, match, cpy, offset); - } else { - LZ4_wildCopy32(op, match, cpy); - } - - op = cpy; /* wildcopy correction */ - } - safe_decode: + if ((oend - op) < FASTLOOP_SAFE_DISTANCE) { + DEBUGLOG(6, "skip fast decode loop"); + goto safe_decode; + } + + /* Fast loop : decode sequences as long as output < + * oend-FASTLOOP_SAFE_DISTANCE */ + DEBUGLOG(6, "using fast decode loop"); + while (1) { + /* Main fastloop assertion: We can always wildcopy + * FASTLOOP_SAFE_DISTANCE + */ + assert(oend - op >= FASTLOOP_SAFE_DISTANCE); + assert(ip < iend); + token = *ip++; + length = token >> ML_BITS; /* literal length */ + + /* decode literal length */ + if (length == RUN_MASK) { + size_t const addl = read_variable_length(&ip, iend - RUN_MASK, 1); + if (addl == rvl_error) { + DEBUGLOG(6, "error reading long literal length"); + goto _output_error; + } + length += addl; + if (unlikely((uptrval)(op) + length < (uptrval)(op))) { + goto _output_error; + } /* overflow detection */ + if (unlikely((uptrval)(ip) + length < (uptrval)(ip))) { + goto _output_error; + } /* overflow detection */ + + /* copy literals */ + cpy = op + length; + LZ4_STATIC_ASSERT(MFLIMIT >= WILDCOPYLENGTH); + if ((cpy > oend - 32) || (ip + length > iend - 32)) { + goto safe_literal_copy; + } + LZ4_wildCopy32(op, ip, cpy); + ip += length; + op = cpy; + } else { + cpy = op + length; + DEBUGLOG(7, "copy %u bytes in a 16-bytes stripe", (unsigned)length); + /* We don't need to check oend, since we check it once for each + * loop below */ + if (ip > iend - (16 + 1 /*max lit + offset + nextToken*/)) { + goto safe_literal_copy; + } + /* Literals can only be <= 14, but hope compilers optimize + * better when copy by a register size */ + LZ4_memcpy(op, ip, 16); + ip += length; + op = cpy; + } + + /* get offset */ + offset = LZ4_readLE16(ip); + ip += 2; + DEBUGLOG(6, " offset = %zu", offset); + match = op - offset; + assert(match <= op); /* overflow check */ + + /* get matchlength */ + length = token & ML_MASK; + + if (length == ML_MASK) { + size_t const addl = read_variable_length(&ip, iend - LASTLITERALS + 1, 0); + if (addl == rvl_error) { + DEBUGLOG(6, "error reading long match length"); + goto _output_error; + } + length += addl; + length += MINMATCH; + if (unlikely((uptrval)(op) + length < (uptrval)op)) { + goto _output_error; + } /* overflow detection */ + if ((checkOffset) && (unlikely(match + dictSize < lowPrefix))) { + DEBUGLOG(6, "Error : offset outside buffers"); + goto _output_error; + } + if (op + length >= oend - FASTLOOP_SAFE_DISTANCE) { + goto safe_match_copy; + } + } else { + length += MINMATCH; + if (op + length >= oend - FASTLOOP_SAFE_DISTANCE) { + goto safe_match_copy; + } + + /* Fastpath check: skip LZ4_wildCopy32 when true */ + if ((dict == withPrefix64k) || (match >= lowPrefix)) { + if (offset >= 8) { + assert(match >= lowPrefix); + assert(match <= op); + assert(op + 18 <= oend); + + LZ4_memcpy(op, match, 8); + LZ4_memcpy(op + 8, match + 8, 8); + LZ4_memcpy(op + 16, match + 16, 2); + op += length; + continue; + } + } + } + + if (checkOffset && (unlikely(match + dictSize < lowPrefix))) { + DEBUGLOG(6, "Error : pos=%zi, offset=%zi => outside buffers", op - lowPrefix, + op - match); + goto _output_error; + } + /* match starting within external dictionary */ + if ((dict == usingExtDict) && (match < lowPrefix)) { + assert(dictEnd != NULL); + if (unlikely(op + length > oend - LASTLITERALS)) { + if (partialDecoding) { + DEBUGLOG(7, "partialDecoding: dictionary match, close " + "to dstEnd"); + length = MIN(length, (size_t)(oend - op)); + } else { + DEBUGLOG(6, "end-of-block condition violated") + goto _output_error; + } + } + + if (length <= (size_t)(lowPrefix - match)) { + /* match fits entirely within external dictionary : just + * copy */ + LZ4_memmove(op, dictEnd - (lowPrefix - match), length); + op += length; + } else { + /* match stretches into both external dictionary and current + * block */ + size_t const copySize = (size_t)(lowPrefix - match); + size_t const restSize = length - copySize; + LZ4_memcpy(op, dictEnd - copySize, copySize); + op += copySize; + if (restSize > (size_t)(op - lowPrefix)) { /* overlap copy */ + BYTE *const endOfMatch = op + restSize; + const BYTE *copyFrom = lowPrefix; + while (op < endOfMatch) { + *op++ = *copyFrom++; + } + } else { + LZ4_memcpy(op, lowPrefix, restSize); + op += restSize; + } + } + continue; + } + + /* copy match within block */ + cpy = op + length; + + assert((op <= oend) && (oend - op >= 32)); + if (unlikely(offset < 16)) { + LZ4_memcpy_using_offset(op, match, cpy, offset); + } else { + LZ4_wildCopy32(op, match, cpy); + } + + op = cpy; /* wildcopy correction */ + } + safe_decode: #endif - /* Main Loop : decode remaining sequences where output < FASTLOOP_SAFE_DISTANCE */ - DEBUGLOG(6, "using safe decode loop"); - while (1) { - assert(ip < iend); - token = *ip++; - length = token >> ML_BITS; /* literal length */ - - /* A two-stage shortcut for the most common case: - * 1) If the literal length is 0..14, and there is enough space, - * enter the shortcut and copy 16 bytes on behalf of the literals - * (in the fast mode, only 8 bytes can be safely copied this way). - * 2) Further if the match length is 4..18, copy 18 bytes in a similar - * manner; but we ensure that there's enough space in the output for - * those 18 bytes earlier, upon entering the shortcut (in other words, - * there is a combined check for both stages). - */ - if ( (length != RUN_MASK) - /* strictly "less than" on input, to re-enter the loop with at least one byte */ - && likely((ip < shortiend) & (op <= shortoend)) ) { - /* Copy the literals */ - LZ4_memcpy(op, ip, 16); - op += length; ip += length; - - /* The second stage: prepare for match copying, decode full info. - * If it doesn't work out, the info won't be wasted. */ - length = token & ML_MASK; /* match length */ - offset = LZ4_readLE16(ip); ip += 2; - match = op - offset; - assert(match <= op); /* check overflow */ - - /* Do not deal with overlapping matches. */ - if ( (length != ML_MASK) - && (offset >= 8) - && (dict==withPrefix64k || match >= lowPrefix) ) { - /* Copy the match. */ - LZ4_memcpy(op + 0, match + 0, 8); - LZ4_memcpy(op + 8, match + 8, 8); - LZ4_memcpy(op +16, match +16, 2); - op += length + MINMATCH; - /* Both stages worked, load the next token. */ - continue; - } - - /* The second stage didn't work out, but the info is ready. - * Propel it right to the point of match copying. */ - goto _copy_match; - } - - /* decode literal length */ - if (length == RUN_MASK) { - size_t const addl = read_variable_length(&ip, iend-RUN_MASK, 1); - if (addl == rvl_error) { goto _output_error; } - length += addl; - if (unlikely((uptrval)(op)+length<(uptrval)(op))) { goto _output_error; } /* overflow detection */ - if (unlikely((uptrval)(ip)+length<(uptrval)(ip))) { goto _output_error; } /* overflow detection */ - } - - /* copy literals */ - cpy = op+length; + /* Main Loop : decode remaining sequences where output < + * FASTLOOP_SAFE_DISTANCE */ + DEBUGLOG(6, "using safe decode loop"); + while (1) { + assert(ip < iend); + token = *ip++; + length = token >> ML_BITS; /* literal length */ + + /* A two-stage shortcut for the most common case: + * 1) If the literal length is 0..14, and there is enough space, + * enter the shortcut and copy 16 bytes on behalf of the literals + * (in the fast mode, only 8 bytes can be safely copied this way). + * 2) Further if the match length is 4..18, copy 18 bytes in a + * similar manner; but we ensure that there's enough space in the + * output for those 18 bytes earlier, upon entering the shortcut (in + * other words, there is a combined check for both stages). + */ + if ((length != RUN_MASK) + /* strictly "less than" on input, to re-enter the loop with at + least one byte */ + && likely((ip < shortiend) & (op <= shortoend))) { + /* Copy the literals */ + LZ4_memcpy(op, ip, 16); + op += length; + ip += length; + + /* The second stage: prepare for match copying, decode full + * info. If it doesn't work out, the info won't be wasted. */ + length = token & ML_MASK; /* match length */ + offset = LZ4_readLE16(ip); + ip += 2; + match = op - offset; + assert(match <= op); /* check overflow */ + + /* Do not deal with overlapping matches. */ + if ((length != ML_MASK) && (offset >= 8) && + (dict == withPrefix64k || match >= lowPrefix)) { + /* Copy the match. */ + LZ4_memcpy(op + 0, match + 0, 8); + LZ4_memcpy(op + 8, match + 8, 8); + LZ4_memcpy(op + 16, match + 16, 2); + op += length + MINMATCH; + /* Both stages worked, load the next token. */ + continue; + } + + /* The second stage didn't work out, but the info is ready. + * Propel it right to the point of match copying. */ + goto _copy_match; + } + + /* decode literal length */ + if (length == RUN_MASK) { + size_t const addl = read_variable_length(&ip, iend - RUN_MASK, 1); + if (addl == rvl_error) { + goto _output_error; + } + length += addl; + if (unlikely((uptrval)(op) + length < (uptrval)(op))) { + goto _output_error; + } /* overflow detection */ + if (unlikely((uptrval)(ip) + length < (uptrval)(ip))) { + goto _output_error; + } /* overflow detection */ + } + + /* copy literals */ + cpy = op + length; #if LZ4_FAST_DEC_LOOP - safe_literal_copy: + safe_literal_copy: #endif - LZ4_STATIC_ASSERT(MFLIMIT >= WILDCOPYLENGTH); - if ((cpy>oend-MFLIMIT) || (ip+length>iend-(2+1+LASTLITERALS))) { - /* We've either hit the input parsing restriction or the output parsing restriction. - * In the normal scenario, decoding a full block, it must be the last sequence, - * otherwise it's an error (invalid input or dimensions). - * In partialDecoding scenario, it's necessary to ensure there is no buffer overflow. - */ - if (partialDecoding) { - /* Since we are partial decoding we may be in this block because of the output parsing - * restriction, which is not valid since the output buffer is allowed to be undersized. - */ - DEBUGLOG(7, "partialDecoding: copying literals, close to input or output end") - DEBUGLOG(7, "partialDecoding: literal length = %u", (unsigned)length); - DEBUGLOG(7, "partialDecoding: remaining space in dstBuffer : %i", (int)(oend - op)); - DEBUGLOG(7, "partialDecoding: remaining space in srcBuffer : %i", (int)(iend - ip)); - /* Finishing in the middle of a literals segment, - * due to lack of input. - */ - if (ip+length > iend) { - length = (size_t)(iend-ip); - cpy = op + length; - } - /* Finishing in the middle of a literals segment, - * due to lack of output space. - */ - if (cpy > oend) { - cpy = oend; - assert(op<=oend); - length = (size_t)(oend-op); - } - } else { - /* We must be on the last sequence (or invalid) because of the parsing limitations - * so check that we exactly consume the input and don't overrun the output buffer. - */ - if ((ip+length != iend) || (cpy > oend)) { - DEBUGLOG(6, "should have been last run of literals") - DEBUGLOG(6, "ip(%p) + length(%i) = %p != iend (%p)", ip, (int)length, ip+length, iend); - DEBUGLOG(6, "or cpy(%p) > oend(%p)", cpy, oend); - goto _output_error; - } - } - LZ4_memmove(op, ip, length); /* supports overlapping memory regions, for in-place decompression scenarios */ - ip += length; - op += length; - /* Necessarily EOF when !partialDecoding. - * When partialDecoding, it is EOF if we've either - * filled the output buffer or - * can't proceed with reading an offset for following match. - */ - if (!partialDecoding || (cpy == oend) || (ip >= (iend-2))) { - break; - } - } else { - LZ4_wildCopy8(op, ip, cpy); /* can overwrite up to 8 bytes beyond cpy */ - ip += length; op = cpy; - } - - /* get offset */ - offset = LZ4_readLE16(ip); ip+=2; - match = op - offset; - - /* get matchlength */ - length = token & ML_MASK; - - _copy_match: - if (length == ML_MASK) { - size_t const addl = read_variable_length(&ip, iend - LASTLITERALS + 1, 0); - if (addl == rvl_error) { goto _output_error; } - length += addl; - if (unlikely((uptrval)(op)+length<(uptrval)op)) goto _output_error; /* overflow detection */ - } - length += MINMATCH; + LZ4_STATIC_ASSERT(MFLIMIT >= WILDCOPYLENGTH); + if ((cpy > oend - MFLIMIT) || (ip + length > iend - (2 + 1 + LASTLITERALS))) { + /* We've either hit the input parsing restriction or the output + * parsing restriction. In the normal scenario, decoding a full + * block, it must be the last sequence, otherwise it's an error + * (invalid input or dimensions). In partialDecoding scenario, + * it's necessary to ensure there is no buffer overflow. + */ + if (partialDecoding) { + /* Since we are partial decoding we may be in this block + * because of the output parsing restriction, which is not + * valid since the output buffer is allowed to be + * undersized. + */ + DEBUGLOG(7, "partialDecoding: copying literals, close to " + "input or output end") + DEBUGLOG(7, "partialDecoding: literal length = %u", (unsigned)length); + DEBUGLOG( + 7, "partialDecoding: remaining space in dstBuffer : %i", (int)(oend - op)); + DEBUGLOG( + 7, "partialDecoding: remaining space in srcBuffer : %i", (int)(iend - ip)); + /* Finishing in the middle of a literals segment, + * due to lack of input. + */ + if (ip + length > iend) { + length = (size_t)(iend - ip); + cpy = op + length; + } + /* Finishing in the middle of a literals segment, + * due to lack of output space. + */ + if (cpy > oend) { + cpy = oend; + assert(op <= oend); + length = (size_t)(oend - op); + } + } else { + /* We must be on the last sequence (or invalid) because of + * the parsing limitations so check that we exactly consume + * the input and don't overrun the output buffer. + */ + if ((ip + length != iend) || (cpy > oend)) { + DEBUGLOG(6, "should have been last run of literals") + DEBUGLOG(6, "ip(%p) + length(%i) = %p != iend (%p)", ip, (int)length, + ip + length, iend); + DEBUGLOG(6, "or cpy(%p) > oend(%p)", cpy, oend); + goto _output_error; + } + } + LZ4_memmove(op, ip, length); /* supports overlapping memory regions, for + in-place decompression scenarios */ + ip += length; + op += length; + /* Necessarily EOF when !partialDecoding. + * When partialDecoding, it is EOF if we've either + * filled the output buffer or + * can't proceed with reading an offset for following match. + */ + if (!partialDecoding || (cpy == oend) || (ip >= (iend - 2))) { + break; + } + } else { + LZ4_wildCopy8(op, ip, cpy); /* can overwrite up to 8 bytes beyond cpy */ + ip += length; + op = cpy; + } + + /* get offset */ + offset = LZ4_readLE16(ip); + ip += 2; + match = op - offset; + + /* get matchlength */ + length = token & ML_MASK; + + _copy_match: + if (length == ML_MASK) { + size_t const addl = read_variable_length(&ip, iend - LASTLITERALS + 1, 0); + if (addl == rvl_error) { + goto _output_error; + } + length += addl; + if (unlikely((uptrval)(op) + length < (uptrval)op)) + goto _output_error; /* overflow detection */ + } + length += MINMATCH; #if LZ4_FAST_DEC_LOOP - safe_match_copy: + safe_match_copy: #endif - if ((checkOffset) && (unlikely(match + dictSize < lowPrefix))) goto _output_error; /* Error : offset outside buffers */ - /* match starting within external dictionary */ - if ((dict==usingExtDict) && (match < lowPrefix)) { - assert(dictEnd != NULL); - if (unlikely(op+length > oend-LASTLITERALS)) { - if (partialDecoding) length = MIN(length, (size_t)(oend-op)); - else goto _output_error; /* doesn't respect parsing restriction */ - } - - if (length <= (size_t)(lowPrefix-match)) { - /* match fits entirely within external dictionary : just copy */ - LZ4_memmove(op, dictEnd - (lowPrefix-match), length); - op += length; - } else { - /* match stretches into both external dictionary and current block */ - size_t const copySize = (size_t)(lowPrefix - match); - size_t const restSize = length - copySize; - LZ4_memcpy(op, dictEnd - copySize, copySize); - op += copySize; - if (restSize > (size_t)(op - lowPrefix)) { /* overlap copy */ - BYTE* const endOfMatch = op + restSize; - const BYTE* copyFrom = lowPrefix; - while (op < endOfMatch) *op++ = *copyFrom++; - } else { - LZ4_memcpy(op, lowPrefix, restSize); - op += restSize; - } } - continue; - } - assert(match >= lowPrefix); - - /* copy match within block */ - cpy = op + length; - - /* partialDecoding : may end anywhere within the block */ - assert(op<=oend); - if (partialDecoding && (cpy > oend-MATCH_SAFEGUARD_DISTANCE)) { - size_t const mlen = MIN(length, (size_t)(oend-op)); - const BYTE* const matchEnd = match + mlen; - BYTE* const copyEnd = op + mlen; - if (matchEnd > op) { /* overlap copy */ - while (op < copyEnd) { *op++ = *match++; } - } else { - LZ4_memcpy(op, match, mlen); - } - op = copyEnd; - if (op == oend) { break; } - continue; - } - - if (unlikely(offset<8)) { - LZ4_write32(op, 0); /* silence msan warning when offset==0 */ - op[0] = match[0]; - op[1] = match[1]; - op[2] = match[2]; - op[3] = match[3]; - match += inc32table[offset]; - LZ4_memcpy(op+4, match, 4); - match -= dec64table[offset]; - } else { - LZ4_memcpy(op, match, 8); - match += 8; - } - op += 8; - - if (unlikely(cpy > oend-MATCH_SAFEGUARD_DISTANCE)) { - BYTE* const oCopyLimit = oend - (WILDCOPYLENGTH-1); - if (cpy > oend-LASTLITERALS) { goto _output_error; } /* Error : last LASTLITERALS bytes must be literals (uncompressed) */ - if (op < oCopyLimit) { - LZ4_wildCopy8(op, match, oCopyLimit); - match += oCopyLimit - op; - op = oCopyLimit; - } - while (op < cpy) { *op++ = *match++; } - } else { - LZ4_memcpy(op, match, 8); - if (length > 16) { LZ4_wildCopy8(op+8, match+8, cpy); } - } - op = cpy; /* wildcopy correction */ - } - - /* end of decoding */ - DEBUGLOG(5, "decoded %i bytes", (int) (((char*)op)-dst)); - return (int) (((char*)op)-dst); /* Nb of output bytes decoded */ - - /* Overflow error detected */ - _output_error: - return (int) (-(((const char*)ip)-src))-1; - } + if ((checkOffset) && (unlikely(match + dictSize < lowPrefix))) + goto _output_error; /* Error : offset outside buffers */ + /* match starting within external dictionary */ + if ((dict == usingExtDict) && (match < lowPrefix)) { + assert(dictEnd != NULL); + if (unlikely(op + length > oend - LASTLITERALS)) { + if (partialDecoding) + length = MIN(length, (size_t)(oend - op)); + else + goto _output_error; /* doesn't respect parsing + restriction */ + } + + if (length <= (size_t)(lowPrefix - match)) { + /* match fits entirely within external dictionary : just + * copy */ + LZ4_memmove(op, dictEnd - (lowPrefix - match), length); + op += length; + } else { + /* match stretches into both external dictionary and current + * block */ + size_t const copySize = (size_t)(lowPrefix - match); + size_t const restSize = length - copySize; + LZ4_memcpy(op, dictEnd - copySize, copySize); + op += copySize; + if (restSize > (size_t)(op - lowPrefix)) { /* overlap copy */ + BYTE *const endOfMatch = op + restSize; + const BYTE *copyFrom = lowPrefix; + while (op < endOfMatch) + *op++ = *copyFrom++; + } else { + LZ4_memcpy(op, lowPrefix, restSize); + op += restSize; + } + } + continue; + } + assert(match >= lowPrefix); + + /* copy match within block */ + cpy = op + length; + + /* partialDecoding : may end anywhere within the block */ + assert(op <= oend); + if (partialDecoding && (cpy > oend - MATCH_SAFEGUARD_DISTANCE)) { + size_t const mlen = MIN(length, (size_t)(oend - op)); + const BYTE *const matchEnd = match + mlen; + BYTE *const copyEnd = op + mlen; + if (matchEnd > op) { /* overlap copy */ + while (op < copyEnd) { + *op++ = *match++; + } + } else { + LZ4_memcpy(op, match, mlen); + } + op = copyEnd; + if (op == oend) { + break; + } + continue; + } + + if (unlikely(offset < 8)) { + LZ4_write32(op, 0); /* silence msan warning when offset==0 */ + op[0] = match[0]; + op[1] = match[1]; + op[2] = match[2]; + op[3] = match[3]; + match += inc32table[offset]; + LZ4_memcpy(op + 4, match, 4); + match -= dec64table[offset]; + } else { + LZ4_memcpy(op, match, 8); + match += 8; + } + op += 8; + + if (unlikely(cpy > oend - MATCH_SAFEGUARD_DISTANCE)) { + BYTE *const oCopyLimit = oend - (WILDCOPYLENGTH - 1); + if (cpy > oend - LASTLITERALS) { + goto _output_error; + } /* Error : last LASTLITERALS bytes must be literals + (uncompressed) */ + if (op < oCopyLimit) { + LZ4_wildCopy8(op, match, oCopyLimit); + match += oCopyLimit - op; + op = oCopyLimit; + } + while (op < cpy) { + *op++ = *match++; + } + } else { + LZ4_memcpy(op, match, 8); + if (length > 16) { + LZ4_wildCopy8(op + 8, match + 8, cpy); + } + } + op = cpy; /* wildcopy correction */ + } + + /* end of decoding */ + DEBUGLOG(5, "decoded %i bytes", (int)(((char *)op) - dst)); + return (int)(((char *)op) - dst); /* Nb of output bytes decoded */ + + /* Overflow error detected */ + _output_error: + return (int)(-(((const char *)ip) - src)) - 1; + } } - /*===== Instantiate the API decoding functions. =====*/ LZ4_FORCE_O2 -int LZ4_decompress_safe(const char* source, char* dest, int compressedSize, int maxDecompressedSize) -{ - return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, - decode_full_block, noDict, - (BYTE*)dest, NULL, 0); +int LZ4_decompress_safe( + const char *source, char *dest, int compressedSize, int maxDecompressedSize) { + return LZ4_decompress_generic(source, dest, compressedSize, maxDecompressedSize, + decode_full_block, noDict, (BYTE *)dest, NULL, 0); } LZ4_FORCE_O2 -int LZ4_decompress_safe_partial(const char* src, char* dst, int compressedSize, int targetOutputSize, int dstCapacity) -{ - dstCapacity = MIN(targetOutputSize, dstCapacity); - return LZ4_decompress_generic(src, dst, compressedSize, dstCapacity, - partial_decode, - noDict, (BYTE*)dst, NULL, 0); +int LZ4_decompress_safe_partial( + const char *src, char *dst, int compressedSize, int targetOutputSize, int dstCapacity) { + dstCapacity = MIN(targetOutputSize, dstCapacity); + return LZ4_decompress_generic( + src, dst, compressedSize, dstCapacity, partial_decode, noDict, (BYTE *)dst, NULL, 0); } LZ4_FORCE_O2 -int LZ4_decompress_fast(const char* source, char* dest, int originalSize) -{ - DEBUGLOG(5, "LZ4_decompress_fast"); - return LZ4_decompress_unsafe_generic( - (const BYTE*)source, (BYTE*)dest, originalSize, - 0, NULL, 0); +int LZ4_decompress_fast(const char *source, char *dest, int originalSize) { + DEBUGLOG(5, "LZ4_decompress_fast"); + return LZ4_decompress_unsafe_generic( + (const BYTE *)source, (BYTE *)dest, originalSize, 0, NULL, 0); } /*===== Instantiate a few more decoding cases, used more than once. =====*/ LZ4_FORCE_O2 /* Exported, an obsolete API function. */ -int LZ4_decompress_safe_withPrefix64k(const char* source, char* dest, int compressedSize, int maxOutputSize) -{ - return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, - decode_full_block, withPrefix64k, - (BYTE*)dest - 64 KB, NULL, 0); + int + LZ4_decompress_safe_withPrefix64k( + const char *source, char *dest, int compressedSize, int maxOutputSize) { + return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, decode_full_block, + withPrefix64k, (BYTE *)dest - 64 KB, NULL, 0); } LZ4_FORCE_O2 -static int LZ4_decompress_safe_partial_withPrefix64k(const char* source, char* dest, int compressedSize, int targetOutputSize, int dstCapacity) -{ - dstCapacity = MIN(targetOutputSize, dstCapacity); - return LZ4_decompress_generic(source, dest, compressedSize, dstCapacity, - partial_decode, withPrefix64k, - (BYTE*)dest - 64 KB, NULL, 0); +static int LZ4_decompress_safe_partial_withPrefix64k( + const char *source, char *dest, int compressedSize, int targetOutputSize, int dstCapacity) { + dstCapacity = MIN(targetOutputSize, dstCapacity); + return LZ4_decompress_generic(source, dest, compressedSize, dstCapacity, partial_decode, + withPrefix64k, (BYTE *)dest - 64 KB, NULL, 0); } /* Another obsolete API function, paired with the previous one. */ -int LZ4_decompress_fast_withPrefix64k(const char* source, char* dest, int originalSize) -{ - return LZ4_decompress_unsafe_generic( - (const BYTE*)source, (BYTE*)dest, originalSize, - 64 KB, NULL, 0); +int LZ4_decompress_fast_withPrefix64k(const char *source, char *dest, int originalSize) { + return LZ4_decompress_unsafe_generic( + (const BYTE *)source, (BYTE *)dest, originalSize, 64 KB, NULL, 0); } LZ4_FORCE_O2 -static int LZ4_decompress_safe_withSmallPrefix(const char* source, char* dest, int compressedSize, int maxOutputSize, - size_t prefixSize) -{ - return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, - decode_full_block, noDict, - (BYTE*)dest-prefixSize, NULL, 0); +static int LZ4_decompress_safe_withSmallPrefix( + const char *source, char *dest, int compressedSize, int maxOutputSize, size_t prefixSize) { + return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, decode_full_block, + noDict, (BYTE *)dest - prefixSize, NULL, 0); } LZ4_FORCE_O2 -static int LZ4_decompress_safe_partial_withSmallPrefix(const char* source, char* dest, int compressedSize, int targetOutputSize, int dstCapacity, - size_t prefixSize) -{ - dstCapacity = MIN(targetOutputSize, dstCapacity); - return LZ4_decompress_generic(source, dest, compressedSize, dstCapacity, - partial_decode, noDict, - (BYTE*)dest-prefixSize, NULL, 0); +static int LZ4_decompress_safe_partial_withSmallPrefix(const char *source, char *dest, + int compressedSize, int targetOutputSize, int dstCapacity, size_t prefixSize) { + dstCapacity = MIN(targetOutputSize, dstCapacity); + return LZ4_decompress_generic(source, dest, compressedSize, dstCapacity, partial_decode, noDict, + (BYTE *)dest - prefixSize, NULL, 0); } LZ4_FORCE_O2 -int LZ4_decompress_safe_forceExtDict(const char* source, char* dest, - int compressedSize, int maxOutputSize, - const void* dictStart, size_t dictSize) -{ - DEBUGLOG(5, "LZ4_decompress_safe_forceExtDict"); - return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, - decode_full_block, usingExtDict, - (BYTE*)dest, (const BYTE*)dictStart, dictSize); +int LZ4_decompress_safe_forceExtDict(const char *source, char *dest, int compressedSize, + int maxOutputSize, const void *dictStart, size_t dictSize) { + DEBUGLOG(5, "LZ4_decompress_safe_forceExtDict"); + return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, decode_full_block, + usingExtDict, (BYTE *)dest, (const BYTE *)dictStart, dictSize); } LZ4_FORCE_O2 -int LZ4_decompress_safe_partial_forceExtDict(const char* source, char* dest, - int compressedSize, int targetOutputSize, int dstCapacity, - const void* dictStart, size_t dictSize) -{ - dstCapacity = MIN(targetOutputSize, dstCapacity); - return LZ4_decompress_generic(source, dest, compressedSize, dstCapacity, - partial_decode, usingExtDict, - (BYTE*)dest, (const BYTE*)dictStart, dictSize); +int LZ4_decompress_safe_partial_forceExtDict(const char *source, char *dest, int compressedSize, + int targetOutputSize, int dstCapacity, const void *dictStart, size_t dictSize) { + dstCapacity = MIN(targetOutputSize, dstCapacity); + return LZ4_decompress_generic(source, dest, compressedSize, dstCapacity, partial_decode, + usingExtDict, (BYTE *)dest, (const BYTE *)dictStart, dictSize); } LZ4_FORCE_O2 -static int LZ4_decompress_fast_extDict(const char* source, char* dest, int originalSize, - const void* dictStart, size_t dictSize) -{ - return LZ4_decompress_unsafe_generic( - (const BYTE*)source, (BYTE*)dest, originalSize, - 0, (const BYTE*)dictStart, dictSize); +static int LZ4_decompress_fast_extDict( + const char *source, char *dest, int originalSize, const void *dictStart, size_t dictSize) { + return LZ4_decompress_unsafe_generic( + (const BYTE *)source, (BYTE *)dest, originalSize, 0, (const BYTE *)dictStart, dictSize); } /* The "double dictionary" mode, for use with e.g. ring buffers: the first part - * of the dictionary is passed as prefix, and the second via dictStart + dictSize. - * These routines are used only once, in LZ4_decompress_*_continue(). + * of the dictionary is passed as prefix, and the second via dictStart + + * dictSize. These routines are used only once, in LZ4_decompress_*_continue(). */ LZ4_FORCE_INLINE -int LZ4_decompress_safe_doubleDict(const char* source, char* dest, int compressedSize, int maxOutputSize, - size_t prefixSize, const void* dictStart, size_t dictSize) -{ - return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, - decode_full_block, usingExtDict, - (BYTE*)dest-prefixSize, (const BYTE*)dictStart, dictSize); +int LZ4_decompress_safe_doubleDict(const char *source, char *dest, int compressedSize, + int maxOutputSize, size_t prefixSize, const void *dictStart, size_t dictSize) { + return LZ4_decompress_generic(source, dest, compressedSize, maxOutputSize, decode_full_block, + usingExtDict, (BYTE *)dest - prefixSize, (const BYTE *)dictStart, dictSize); } /*===== streaming decompression functions =====*/ #if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) -LZ4_streamDecode_t* LZ4_createStreamDecode(void) -{ - LZ4_STATIC_ASSERT(sizeof(LZ4_streamDecode_t) >= sizeof(LZ4_streamDecode_t_internal)); - return (LZ4_streamDecode_t*) ALLOC_AND_ZERO(sizeof(LZ4_streamDecode_t)); +LZ4_streamDecode_t *LZ4_createStreamDecode(void) { + LZ4_STATIC_ASSERT(sizeof(LZ4_streamDecode_t) >= sizeof(LZ4_streamDecode_t_internal)); + return (LZ4_streamDecode_t *)ALLOC_AND_ZERO(sizeof(LZ4_streamDecode_t)); } -int LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream) -{ - if (LZ4_stream == NULL) { return 0; } /* support free on NULL */ - FREEMEM(LZ4_stream); - return 0; +int LZ4_freeStreamDecode(LZ4_streamDecode_t *LZ4_stream) { + if (LZ4_stream == NULL) { + return 0; + } /* support free on NULL */ + FREEMEM(LZ4_stream); + return 0; } #endif /*! LZ4_setStreamDecode() : * Use this function to instruct where to find the dictionary. - * This function is not necessary if previous data is still available where it was decoded. - * Loading a size of 0 is allowed (same effect as no dictionary). + * This function is not necessary if previous data is still available where it + * was decoded. Loading a size of 0 is allowed (same effect as no dictionary). * @return : 1 if OK, 0 if error */ -int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize) -{ - LZ4_streamDecode_t_internal* lz4sd = &LZ4_streamDecode->internal_donotuse; - lz4sd->prefixSize = (size_t)dictSize; - if (dictSize) { - assert(dictionary != NULL); - lz4sd->prefixEnd = (const BYTE*) dictionary + dictSize; - } else { - lz4sd->prefixEnd = (const BYTE*) dictionary; - } - lz4sd->externalDict = NULL; - lz4sd->extDictSize = 0; - return 1; +int LZ4_setStreamDecode( + LZ4_streamDecode_t *LZ4_streamDecode, const char *dictionary, int dictSize) { + LZ4_streamDecode_t_internal *lz4sd = &LZ4_streamDecode->internal_donotuse; + lz4sd->prefixSize = (size_t)dictSize; + if (dictSize) { + assert(dictionary != NULL); + lz4sd->prefixEnd = (const BYTE *)dictionary + dictSize; + } else { + lz4sd->prefixEnd = (const BYTE *)dictionary; + } + lz4sd->externalDict = NULL; + lz4sd->extDictSize = 0; + return 1; } /*! LZ4_decoderRingBufferSize() : @@ -2534,178 +2859,188 @@ int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dicti * @return : minimum ring buffer size, * or 0 if there is an error (invalid maxBlockSize). */ -int LZ4_decoderRingBufferSize(int maxBlockSize) -{ - if (maxBlockSize < 0) return 0; - if (maxBlockSize > LZ4_MAX_INPUT_SIZE) return 0; - if (maxBlockSize < 16) maxBlockSize = 16; - return LZ4_DECODER_RING_BUFFER_SIZE(maxBlockSize); +int LZ4_decoderRingBufferSize(int maxBlockSize) { + if (maxBlockSize < 0) + return 0; + if (maxBlockSize > LZ4_MAX_INPUT_SIZE) + return 0; + if (maxBlockSize < 16) + maxBlockSize = 16; + return LZ4_DECODER_RING_BUFFER_SIZE(maxBlockSize); } /* *_continue() : - These decoding functions allow decompression of multiple blocks in "streaming" mode. - Previously decoded blocks must still be available at the memory position where they were decoded. - If it's not possible, save the relevant part of decoded data into a safe buffer, - and indicate where it stands using LZ4_setStreamDecode() + These decoding functions allow decompression of multiple blocks in +"streaming" mode. Previously decoded blocks must still be available at the +memory position where they were decoded. If it's not possible, save the relevant +part of decoded data into a safe buffer, and indicate where it stands using +LZ4_setStreamDecode() */ LZ4_FORCE_O2 -int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int compressedSize, int maxOutputSize) -{ - LZ4_streamDecode_t_internal* lz4sd = &LZ4_streamDecode->internal_donotuse; - int result; - - if (lz4sd->prefixSize == 0) { - /* The first call, no dictionary yet. */ - assert(lz4sd->extDictSize == 0); - result = LZ4_decompress_safe(source, dest, compressedSize, maxOutputSize); - if (result <= 0) return result; - lz4sd->prefixSize = (size_t)result; - lz4sd->prefixEnd = (BYTE*)dest + result; - } else if (lz4sd->prefixEnd == (BYTE*)dest) { - /* They're rolling the current segment. */ - if (lz4sd->prefixSize >= 64 KB - 1) - result = LZ4_decompress_safe_withPrefix64k(source, dest, compressedSize, maxOutputSize); - else if (lz4sd->extDictSize == 0) - result = LZ4_decompress_safe_withSmallPrefix(source, dest, compressedSize, maxOutputSize, - lz4sd->prefixSize); - else - result = LZ4_decompress_safe_doubleDict(source, dest, compressedSize, maxOutputSize, - lz4sd->prefixSize, lz4sd->externalDict, lz4sd->extDictSize); - if (result <= 0) return result; - lz4sd->prefixSize += (size_t)result; - lz4sd->prefixEnd += result; - } else { - /* The buffer wraps around, or they're switching to another buffer. */ - lz4sd->extDictSize = lz4sd->prefixSize; - lz4sd->externalDict = lz4sd->prefixEnd - lz4sd->extDictSize; - result = LZ4_decompress_safe_forceExtDict(source, dest, compressedSize, maxOutputSize, - lz4sd->externalDict, lz4sd->extDictSize); - if (result <= 0) return result; - lz4sd->prefixSize = (size_t)result; - lz4sd->prefixEnd = (BYTE*)dest + result; - } - - return result; -} - -LZ4_FORCE_O2 int -LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, - const char* source, char* dest, int originalSize) -{ - LZ4_streamDecode_t_internal* const lz4sd = - (assert(LZ4_streamDecode!=NULL), &LZ4_streamDecode->internal_donotuse); - int result; - - DEBUGLOG(5, "LZ4_decompress_fast_continue (toDecodeSize=%i)", originalSize); - assert(originalSize >= 0); - - if (lz4sd->prefixSize == 0) { - DEBUGLOG(5, "first invocation : no prefix nor extDict"); - assert(lz4sd->extDictSize == 0); - result = LZ4_decompress_fast(source, dest, originalSize); - if (result <= 0) return result; - lz4sd->prefixSize = (size_t)originalSize; - lz4sd->prefixEnd = (BYTE*)dest + originalSize; - } else if (lz4sd->prefixEnd == (BYTE*)dest) { - DEBUGLOG(5, "continue using existing prefix"); - result = LZ4_decompress_unsafe_generic( - (const BYTE*)source, (BYTE*)dest, originalSize, - lz4sd->prefixSize, - lz4sd->externalDict, lz4sd->extDictSize); - if (result <= 0) return result; - lz4sd->prefixSize += (size_t)originalSize; - lz4sd->prefixEnd += originalSize; - } else { - DEBUGLOG(5, "prefix becomes extDict"); - lz4sd->extDictSize = lz4sd->prefixSize; - lz4sd->externalDict = lz4sd->prefixEnd - lz4sd->extDictSize; - result = LZ4_decompress_fast_extDict(source, dest, originalSize, - lz4sd->externalDict, lz4sd->extDictSize); - if (result <= 0) return result; - lz4sd->prefixSize = (size_t)originalSize; - lz4sd->prefixEnd = (BYTE*)dest + originalSize; - } - - return result; +int LZ4_decompress_safe_continue(LZ4_streamDecode_t *LZ4_streamDecode, const char *source, + char *dest, int compressedSize, int maxOutputSize) { + LZ4_streamDecode_t_internal *lz4sd = &LZ4_streamDecode->internal_donotuse; + int result; + + if (lz4sd->prefixSize == 0) { + /* The first call, no dictionary yet. */ + assert(lz4sd->extDictSize == 0); + result = LZ4_decompress_safe(source, dest, compressedSize, maxOutputSize); + if (result <= 0) + return result; + lz4sd->prefixSize = (size_t)result; + lz4sd->prefixEnd = (BYTE *)dest + result; + } else if (lz4sd->prefixEnd == (BYTE *)dest) { + /* They're rolling the current segment. */ + if (lz4sd->prefixSize >= 64 KB - 1) + result = LZ4_decompress_safe_withPrefix64k(source, dest, compressedSize, maxOutputSize); + else if (lz4sd->extDictSize == 0) + result = LZ4_decompress_safe_withSmallPrefix( + source, dest, compressedSize, maxOutputSize, lz4sd->prefixSize); + else + result = LZ4_decompress_safe_doubleDict(source, dest, compressedSize, maxOutputSize, + lz4sd->prefixSize, lz4sd->externalDict, lz4sd->extDictSize); + if (result <= 0) + return result; + lz4sd->prefixSize += (size_t)result; + lz4sd->prefixEnd += result; + } else { + /* The buffer wraps around, or they're switching to another buffer. */ + lz4sd->extDictSize = lz4sd->prefixSize; + lz4sd->externalDict = lz4sd->prefixEnd - lz4sd->extDictSize; + result = LZ4_decompress_safe_forceExtDict( + source, dest, compressedSize, maxOutputSize, lz4sd->externalDict, lz4sd->extDictSize); + if (result <= 0) + return result; + lz4sd->prefixSize = (size_t)result; + lz4sd->prefixEnd = (BYTE *)dest + result; + } + + return result; +} + +LZ4_FORCE_O2 int LZ4_decompress_fast_continue( + LZ4_streamDecode_t *LZ4_streamDecode, const char *source, char *dest, int originalSize) { + LZ4_streamDecode_t_internal *const lz4sd = + (assert(LZ4_streamDecode != NULL), &LZ4_streamDecode->internal_donotuse); + int result; + + DEBUGLOG(5, "LZ4_decompress_fast_continue (toDecodeSize=%i)", originalSize); + assert(originalSize >= 0); + + if (lz4sd->prefixSize == 0) { + DEBUGLOG(5, "first invocation : no prefix nor extDict"); + assert(lz4sd->extDictSize == 0); + result = LZ4_decompress_fast(source, dest, originalSize); + if (result <= 0) + return result; + lz4sd->prefixSize = (size_t)originalSize; + lz4sd->prefixEnd = (BYTE *)dest + originalSize; + } else if (lz4sd->prefixEnd == (BYTE *)dest) { + DEBUGLOG(5, "continue using existing prefix"); + result = LZ4_decompress_unsafe_generic((const BYTE *)source, (BYTE *)dest, originalSize, + lz4sd->prefixSize, lz4sd->externalDict, lz4sd->extDictSize); + if (result <= 0) + return result; + lz4sd->prefixSize += (size_t)originalSize; + lz4sd->prefixEnd += originalSize; + } else { + DEBUGLOG(5, "prefix becomes extDict"); + lz4sd->extDictSize = lz4sd->prefixSize; + lz4sd->externalDict = lz4sd->prefixEnd - lz4sd->extDictSize; + result = LZ4_decompress_fast_extDict( + source, dest, originalSize, lz4sd->externalDict, lz4sd->extDictSize); + if (result <= 0) + return result; + lz4sd->prefixSize = (size_t)originalSize; + lz4sd->prefixEnd = (BYTE *)dest + originalSize; + } + + return result; } - /* Advanced decoding functions : *_usingDict() : - These decoding functions work the same as "_continue" ones, - the dictionary must be explicitly provided within parameters + These decoding functions work the same as "_continue" ones, + the dictionary must be explicitly provided within parameters */ -int LZ4_decompress_safe_usingDict(const char* source, char* dest, int compressedSize, int maxOutputSize, const char* dictStart, int dictSize) -{ - if (dictSize==0) - return LZ4_decompress_safe(source, dest, compressedSize, maxOutputSize); - if (dictStart+dictSize == dest) { - if (dictSize >= 64 KB - 1) { - return LZ4_decompress_safe_withPrefix64k(source, dest, compressedSize, maxOutputSize); - } - assert(dictSize >= 0); - return LZ4_decompress_safe_withSmallPrefix(source, dest, compressedSize, maxOutputSize, (size_t)dictSize); - } - assert(dictSize >= 0); - return LZ4_decompress_safe_forceExtDict(source, dest, compressedSize, maxOutputSize, dictStart, (size_t)dictSize); -} - -int LZ4_decompress_safe_partial_usingDict(const char* source, char* dest, int compressedSize, int targetOutputSize, int dstCapacity, const char* dictStart, int dictSize) -{ - if (dictSize==0) - return LZ4_decompress_safe_partial(source, dest, compressedSize, targetOutputSize, dstCapacity); - if (dictStart+dictSize == dest) { - if (dictSize >= 64 KB - 1) { - return LZ4_decompress_safe_partial_withPrefix64k(source, dest, compressedSize, targetOutputSize, dstCapacity); - } - assert(dictSize >= 0); - return LZ4_decompress_safe_partial_withSmallPrefix(source, dest, compressedSize, targetOutputSize, dstCapacity, (size_t)dictSize); - } - assert(dictSize >= 0); - return LZ4_decompress_safe_partial_forceExtDict(source, dest, compressedSize, targetOutputSize, dstCapacity, dictStart, (size_t)dictSize); -} - -int LZ4_decompress_fast_usingDict(const char* source, char* dest, int originalSize, const char* dictStart, int dictSize) -{ - if (dictSize==0 || dictStart+dictSize == dest) - return LZ4_decompress_unsafe_generic( - (const BYTE*)source, (BYTE*)dest, originalSize, - (size_t)dictSize, NULL, 0); - assert(dictSize >= 0); - return LZ4_decompress_fast_extDict(source, dest, originalSize, dictStart, (size_t)dictSize); +int LZ4_decompress_safe_usingDict(const char *source, char *dest, int compressedSize, + int maxOutputSize, const char *dictStart, int dictSize) { + if (dictSize == 0) + return LZ4_decompress_safe(source, dest, compressedSize, maxOutputSize); + if (dictStart + dictSize == dest) { + if (dictSize >= 64 KB - 1) { + return LZ4_decompress_safe_withPrefix64k(source, dest, compressedSize, maxOutputSize); + } + assert(dictSize >= 0); + return LZ4_decompress_safe_withSmallPrefix( + source, dest, compressedSize, maxOutputSize, (size_t)dictSize); + } + assert(dictSize >= 0); + return LZ4_decompress_safe_forceExtDict( + source, dest, compressedSize, maxOutputSize, dictStart, (size_t)dictSize); +} + +int LZ4_decompress_safe_partial_usingDict(const char *source, char *dest, int compressedSize, + int targetOutputSize, int dstCapacity, const char *dictStart, int dictSize) { + if (dictSize == 0) + return LZ4_decompress_safe_partial( + source, dest, compressedSize, targetOutputSize, dstCapacity); + if (dictStart + dictSize == dest) { + if (dictSize >= 64 KB - 1) { + return LZ4_decompress_safe_partial_withPrefix64k( + source, dest, compressedSize, targetOutputSize, dstCapacity); + } + assert(dictSize >= 0); + return LZ4_decompress_safe_partial_withSmallPrefix( + source, dest, compressedSize, targetOutputSize, dstCapacity, (size_t)dictSize); + } + assert(dictSize >= 0); + return LZ4_decompress_safe_partial_forceExtDict( + source, dest, compressedSize, targetOutputSize, dstCapacity, dictStart, (size_t)dictSize); +} + +int LZ4_decompress_fast_usingDict( + const char *source, char *dest, int originalSize, const char *dictStart, int dictSize) { + if (dictSize == 0 || dictStart + dictSize == dest) + return LZ4_decompress_unsafe_generic( + (const BYTE *)source, (BYTE *)dest, originalSize, (size_t)dictSize, NULL, 0); + assert(dictSize >= 0); + return LZ4_decompress_fast_extDict(source, dest, originalSize, dictStart, (size_t)dictSize); } - /*=************************************************* -* Obsolete Functions -***************************************************/ + * Obsolete Functions + ***************************************************/ /* obsolete compression functions */ -int LZ4_compress_limitedOutput(const char* source, char* dest, int inputSize, int maxOutputSize) -{ - return LZ4_compress_default(source, dest, inputSize, maxOutputSize); +int LZ4_compress_limitedOutput(const char *source, char *dest, int inputSize, int maxOutputSize) { + return LZ4_compress_default(source, dest, inputSize, maxOutputSize); } -int LZ4_compress(const char* src, char* dest, int srcSize) -{ - return LZ4_compress_default(src, dest, srcSize, LZ4_compressBound(srcSize)); + +int LZ4_compress(const char *src, char *dest, int srcSize) { + return LZ4_compress_default(src, dest, srcSize, LZ4_compressBound(srcSize)); } -int LZ4_compress_limitedOutput_withState (void* state, const char* src, char* dst, int srcSize, int dstSize) -{ - return LZ4_compress_fast_extState(state, src, dst, srcSize, dstSize, 1); + +int LZ4_compress_limitedOutput_withState( + void *state, const char *src, char *dst, int srcSize, int dstSize) { + return LZ4_compress_fast_extState(state, src, dst, srcSize, dstSize, 1); } -int LZ4_compress_withState (void* state, const char* src, char* dst, int srcSize) -{ - return LZ4_compress_fast_extState(state, src, dst, srcSize, LZ4_compressBound(srcSize), 1); + +int LZ4_compress_withState(void *state, const char *src, char *dst, int srcSize) { + return LZ4_compress_fast_extState(state, src, dst, srcSize, LZ4_compressBound(srcSize), 1); } -int LZ4_compress_limitedOutput_continue (LZ4_stream_t* LZ4_stream, const char* src, char* dst, int srcSize, int dstCapacity) -{ - return LZ4_compress_fast_continue(LZ4_stream, src, dst, srcSize, dstCapacity, 1); + +int LZ4_compress_limitedOutput_continue( + LZ4_stream_t *LZ4_stream, const char *src, char *dst, int srcSize, int dstCapacity) { + return LZ4_compress_fast_continue(LZ4_stream, src, dst, srcSize, dstCapacity, 1); } -int LZ4_compress_continue (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize) -{ - return LZ4_compress_fast_continue(LZ4_stream, source, dest, inputSize, LZ4_compressBound(inputSize), 1); + +int LZ4_compress_continue(LZ4_stream_t *LZ4_stream, const char *source, char *dest, int inputSize) { + return LZ4_compress_fast_continue( + LZ4_stream, source, dest, inputSize, LZ4_compressBound(inputSize), 1); } /* @@ -2714,38 +3049,34 @@ They are only provided here for compatibility with older user programs. - LZ4_uncompress is totally equivalent to LZ4_decompress_fast - LZ4_uncompress_unknownOutputSize is totally equivalent to LZ4_decompress_safe */ -int LZ4_uncompress (const char* source, char* dest, int outputSize) -{ - return LZ4_decompress_fast(source, dest, outputSize); +int LZ4_uncompress(const char *source, char *dest, int outputSize) { + return LZ4_decompress_fast(source, dest, outputSize); } -int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize) -{ - return LZ4_decompress_safe(source, dest, isize, maxOutputSize); + +int LZ4_uncompress_unknownOutputSize(const char *source, char *dest, int isize, int maxOutputSize) { + return LZ4_decompress_safe(source, dest, isize, maxOutputSize); } /* Obsolete Streaming functions */ int LZ4_sizeofStreamState(void) { return sizeof(LZ4_stream_t); } -int LZ4_resetStreamState(void* state, char* inputBuffer) -{ - (void)inputBuffer; - LZ4_resetStream((LZ4_stream_t*)state); - return 0; +int LZ4_resetStreamState(void *state, char *inputBuffer) { + (void)inputBuffer; + LZ4_resetStream((LZ4_stream_t *)state); + return 0; } #if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) -void* LZ4_create (char* inputBuffer) -{ - (void)inputBuffer; - return LZ4_createStream(); +void *LZ4_create(char *inputBuffer) { + (void)inputBuffer; + return LZ4_createStream(); } #endif -char* LZ4_slideInputBuffer (void* state) -{ - /* avoid const char * -> char * conversion warning */ - return (char *)(uptrval)((LZ4_stream_t*)state)->internal_donotuse.dictionary; +char *LZ4_slideInputBuffer(void *state) { + /* avoid const char * -> char * conversion warning */ + return (char *)(uptrval)((LZ4_stream_t *)state)->internal_donotuse.dictionary; } -#endif /* LZ4_COMMONDEFS_ONLY */ +#endif /* LZ4_COMMONDEFS_ONLY */ diff --git a/osd/lz4/lz4.h b/osd/lz4/lz4.h index f7b255d..4d677d4 100644 --- a/osd/lz4/lz4.h +++ b/osd/lz4/lz4.h @@ -9,9 +9,9 @@ modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. @@ -29,10 +29,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. You can contact the author at : - - LZ4 homepage : http://www.lz4.org - - LZ4 source repository : https://github.com/lz4/lz4 + - LZ4 homepage : http://www.lz4.org + - LZ4 source repository : https://github.com/lz4/lz4 */ -#if defined (__cplusplus) +#if defined(__cplusplus) extern "C" { #endif @@ -40,61 +40,64 @@ extern "C" { #define LZ4_H_2983827168210 /* --- Dependency --- */ -#include /* size_t */ - +#include /* size_t */ /** Introduction - LZ4 is lossless compression algorithm, providing compression speed >500 MB/s per core, - scalable with multi-cores CPU. It features an extremely fast decoder, with speed in - multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. + LZ4 is lossless compression algorithm, providing compression speed >500 MB/s + per core, scalable with multi-cores CPU. It features an extremely fast + decoder, with speed in multiple GB/s per core, typically reaching RAM speed + limits on multi-core systems. - The LZ4 compression library provides in-memory compression and decompression functions. - It gives full buffer control to user. - Compression can be done in: - - a single step (described as Simple Functions) - - a single step, reusing a context (described in Advanced Functions) - - unbounded multiple steps (described as Streaming compression) + The LZ4 compression library provides in-memory compression and decompression + functions. It gives full buffer control to user. Compression can be done in: + - a single step (described as Simple Functions) + - a single step, reusing a context (described in Advanced Functions) + - unbounded multiple steps (described as Streaming compression) lz4.h generates and decodes LZ4-compressed blocks (doc/lz4_Block_format.md). Decompressing such a compressed block requires additional metadata. Exact metadata depends on exact decompression function. For the typical case of LZ4_decompress_safe(), - metadata includes block's compressed size, and maximum bound of decompressed size. - Each application is free to encode and pass such metadata in whichever way it wants. + metadata includes block's compressed size, and maximum bound of decompressed + size. Each application is free to encode and pass such metadata in whichever + way it wants. lz4.h only handle blocks, it can not generate Frames. Blocks are different from Frames (doc/lz4_Frame_format.md). Frames bundle both blocks and metadata in a specified manner. - Embedding metadata is required for compressed data to be self-contained and portable. - Frame format is delivered through a companion API, declared in lz4frame.h. - The `lz4` CLI can only manage frames. + Embedding metadata is required for compressed data to be self-contained and + portable. Frame format is delivered through a companion API, declared in + lz4frame.h. The `lz4` CLI can only manage frames. */ /*^*************************************************************** -* Export parameters -*****************************************************************/ + * Export parameters + *****************************************************************/ /* -* LZ4_DLL_EXPORT : -* Enable exporting of functions when building a Windows DLL -* LZ4LIB_VISIBILITY : -* Control library symbols visibility. -*/ + * LZ4_DLL_EXPORT : + * Enable exporting of functions when building a Windows DLL + * LZ4LIB_VISIBILITY : + * Control library symbols visibility. + */ #ifndef LZ4LIB_VISIBILITY -# if defined(__GNUC__) && (__GNUC__ >= 4) -# define LZ4LIB_VISIBILITY __attribute__ ((visibility ("default"))) -# else -# define LZ4LIB_VISIBILITY -# endif +#if defined(__GNUC__) && (__GNUC__ >= 4) +#define LZ4LIB_VISIBILITY __attribute__((visibility("default"))) +#else +#define LZ4LIB_VISIBILITY +#endif #endif -#if defined(LZ4_DLL_EXPORT) && (LZ4_DLL_EXPORT==1) -# define LZ4LIB_API __declspec(dllexport) LZ4LIB_VISIBILITY -#elif defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1) -# define LZ4LIB_API __declspec(dllimport) LZ4LIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/ +#if defined(LZ4_DLL_EXPORT) && (LZ4_DLL_EXPORT == 1) +#define LZ4LIB_API __declspec(dllexport) LZ4LIB_VISIBILITY +#elif defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT == 1) +#define LZ4LIB_API \ + __declspec(dllimport) LZ4LIB_VISIBILITY /* It isn't required but allows to generate better \ + code, saving a function pointer load from the IAT \ + and an indirect jump.*/ #else -# define LZ4LIB_API LZ4LIB_VISIBILITY +#define LZ4LIB_API LZ4LIB_VISIBILITY #endif /*! LZ4_FREESTANDING : @@ -110,149 +113,162 @@ extern "C" { * - See tests/freestanding.c to check its basic setup. */ #if defined(LZ4_FREESTANDING) && (LZ4_FREESTANDING == 1) -# define LZ4_HEAPMODE 0 -# define LZ4HC_HEAPMODE 0 -# define LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION 1 -# if !defined(LZ4_memcpy) -# error "LZ4_FREESTANDING requires macro 'LZ4_memcpy'." -# endif -# if !defined(LZ4_memset) -# error "LZ4_FREESTANDING requires macro 'LZ4_memset'." -# endif -# if !defined(LZ4_memmove) -# error "LZ4_FREESTANDING requires macro 'LZ4_memmove'." -# endif -#elif ! defined(LZ4_FREESTANDING) -# define LZ4_FREESTANDING 0 +#define LZ4_HEAPMODE 0 +#define LZ4HC_HEAPMODE 0 +#define LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION 1 +#if !defined(LZ4_memcpy) +#error "LZ4_FREESTANDING requires macro 'LZ4_memcpy'." +#endif +#if !defined(LZ4_memset) +#error "LZ4_FREESTANDING requires macro 'LZ4_memset'." +#endif +#if !defined(LZ4_memmove) +#error "LZ4_FREESTANDING requires macro 'LZ4_memmove'." +#endif +#elif !defined(LZ4_FREESTANDING) +#define LZ4_FREESTANDING 0 #endif - /*------ Version ------*/ -#define LZ4_VERSION_MAJOR 1 /* for breaking interface changes */ -#define LZ4_VERSION_MINOR 9 /* for new (non-breaking) interface capabilities */ -#define LZ4_VERSION_RELEASE 4 /* for tweaks, bug-fixes, or development */ +#define LZ4_VERSION_MAJOR 1 /* for breaking interface changes */ +#define LZ4_VERSION_MINOR \ + 9 /* for new (non-breaking) interface capabilities \ + */ +#define LZ4_VERSION_RELEASE 4 /* for tweaks, bug-fixes, or development */ -#define LZ4_VERSION_NUMBER (LZ4_VERSION_MAJOR *100*100 + LZ4_VERSION_MINOR *100 + LZ4_VERSION_RELEASE) +#define LZ4_VERSION_NUMBER \ + (LZ4_VERSION_MAJOR * 100 * 100 + LZ4_VERSION_MINOR * 100 + LZ4_VERSION_RELEASE) #define LZ4_LIB_VERSION LZ4_VERSION_MAJOR.LZ4_VERSION_MINOR.LZ4_VERSION_RELEASE #define LZ4_QUOTE(str) #str #define LZ4_EXPAND_AND_QUOTE(str) LZ4_QUOTE(str) -#define LZ4_VERSION_STRING LZ4_EXPAND_AND_QUOTE(LZ4_LIB_VERSION) /* requires v1.7.3+ */ - -LZ4LIB_API int LZ4_versionNumber (void); /**< library version number; useful to check dll version; requires v1.3.0+ */ -LZ4LIB_API const char* LZ4_versionString (void); /**< library version string; useful to check dll version; requires v1.7.5+ */ +#define LZ4_VERSION_STRING LZ4_EXPAND_AND_QUOTE(LZ4_LIB_VERSION) /* requires v1.7.3+ */ +LZ4LIB_API int LZ4_versionNumber(void); /**< library version number; useful to check dll + version; requires v1.3.0+ */ +LZ4LIB_API const char *LZ4_versionString(void); /**< library version string; useful to check dll + version; requires v1.7.5+ */ /*-************************************ -* Tuning parameter -**************************************/ + * Tuning parameter + **************************************/ #define LZ4_MEMORY_USAGE_MIN 10 #define LZ4_MEMORY_USAGE_DEFAULT 14 #define LZ4_MEMORY_USAGE_MAX 20 /*! * LZ4_MEMORY_USAGE : - * Memory usage formula : N->2^N Bytes (examples : 10 -> 1KB; 12 -> 4KB ; 16 -> 64KB; 20 -> 1MB; ) - * Increasing memory usage improves compression ratio, at the cost of speed. - * Reduced memory usage may improve speed at the cost of ratio, thanks to better cache locality. - * Default value is 14, for 16KB, which nicely fits into Intel x86 L1 cache + * Memory usage formula : N->2^N Bytes (examples : 10 -> 1KB; 12 -> 4KB ; 16 -> + * 64KB; 20 -> 1MB; ) Increasing memory usage improves compression ratio, at the + * cost of speed. Reduced memory usage may improve speed at the cost of ratio, + * thanks to better cache locality. Default value is 14, for 16KB, which nicely + * fits into Intel x86 L1 cache */ #ifndef LZ4_MEMORY_USAGE -# define LZ4_MEMORY_USAGE LZ4_MEMORY_USAGE_DEFAULT +#define LZ4_MEMORY_USAGE LZ4_MEMORY_USAGE_DEFAULT #endif #if (LZ4_MEMORY_USAGE < LZ4_MEMORY_USAGE_MIN) -# error "LZ4_MEMORY_USAGE is too small !" +#error "LZ4_MEMORY_USAGE is too small !" #endif #if (LZ4_MEMORY_USAGE > LZ4_MEMORY_USAGE_MAX) -# error "LZ4_MEMORY_USAGE is too large !" +#error "LZ4_MEMORY_USAGE is too large !" #endif /*-************************************ -* Simple Functions -**************************************/ + * Simple Functions + **************************************/ /*! LZ4_compress_default() : * Compresses 'srcSize' bytes from buffer 'src' * into already allocated 'dst' buffer of size 'dstCapacity'. - * Compression is guaranteed to succeed if 'dstCapacity' >= LZ4_compressBound(srcSize). - * It also runs faster, so it's a recommended setting. - * If the function cannot compress 'src' into a more limited 'dst' budget, - * compression stops *immediately*, and the function result is zero. - * In which case, 'dst' content is undefined (invalid). - * srcSize : max supported value is LZ4_MAX_INPUT_SIZE. - * dstCapacity : size of buffer 'dst' (which must be already allocated) - * @return : the number of bytes written into buffer 'dst' (necessarily <= dstCapacity) - * or 0 if compression fails - * Note : This function is protected against buffer overflow scenarios (never writes outside 'dst' buffer, nor read outside 'source' buffer). + * Compression is guaranteed to succeed if 'dstCapacity' >= + * LZ4_compressBound(srcSize). It also runs faster, so it's a recommended + * setting. If the function cannot compress 'src' into a more limited 'dst' + * budget, compression stops *immediately*, and the function result is zero. In + * which case, 'dst' content is undefined (invalid). srcSize : max supported + * value is LZ4_MAX_INPUT_SIZE. dstCapacity : size of buffer 'dst' (which must + * be already allocated) + * @return : the number of bytes written into buffer 'dst' (necessarily <= + * dstCapacity) or 0 if compression fails Note : This function is protected + * against buffer overflow scenarios (never writes outside 'dst' buffer, nor + * read outside 'source' buffer). */ -LZ4LIB_API int LZ4_compress_default(const char* src, char* dst, int srcSize, int dstCapacity); +LZ4LIB_API int LZ4_compress_default(const char *src, char *dst, int srcSize, int dstCapacity); /*! LZ4_decompress_safe() : * @compressedSize : is the exact complete size of the compressed block. - * @dstCapacity : is the size of destination buffer (which must be already allocated), - * is an upper bound of decompressed size. - * @return : the number of bytes decompressed into destination buffer (necessarily <= dstCapacity) - * If destination buffer is not large enough, decoding will stop and output an error code (negative value). - * If the source stream is detected malformed, the function will stop decoding and return a negative result. - * Note 1 : This function is protected against malicious data packets : - * it will never writes outside 'dst' buffer, nor read outside 'source' buffer, - * even if the compressed block is maliciously modified to order the decoder to do these actions. - * In such case, the decoder stops immediately, and considers the compressed block malformed. - * Note 2 : compressedSize and dstCapacity must be provided to the function, the compressed block does not contain them. - * The implementation is free to send / store / derive this information in whichever way is most beneficial. - * If there is a need for a different format which bundles together both compressed data and its metadata, consider looking at lz4frame.h instead. + * @dstCapacity : is the size of destination buffer (which must be already + * allocated), is an upper bound of decompressed size. + * @return : the number of bytes decompressed into destination buffer + * (necessarily <= dstCapacity) If destination buffer is not large enough, + * decoding will stop and output an error code (negative value). If the source + * stream is detected malformed, the function will stop decoding and return a + * negative result. Note 1 : This function is protected against malicious data + * packets : it will never writes outside 'dst' buffer, nor read outside + * 'source' buffer, even if the compressed block is maliciously modified to + * order the decoder to do these actions. In such case, the decoder stops + * immediately, and considers the compressed block malformed. Note 2 : + * compressedSize and dstCapacity must be provided to the function, the + * compressed block does not contain them. The implementation is free to send / + * store / derive this information in whichever way is most beneficial. If there + * is a need for a different format which bundles together both compressed data + * and its metadata, consider looking at lz4frame.h instead. */ -LZ4LIB_API int LZ4_decompress_safe (const char* src, char* dst, int compressedSize, int dstCapacity); - +LZ4LIB_API int LZ4_decompress_safe(const char *src, char *dst, int compressedSize, int dstCapacity); /*-************************************ -* Advanced Functions -**************************************/ -#define LZ4_MAX_INPUT_SIZE 0x7E000000 /* 2 113 929 216 bytes */ -#define LZ4_COMPRESSBOUND(isize) ((unsigned)(isize) > (unsigned)LZ4_MAX_INPUT_SIZE ? 0 : (isize) + ((isize)/255) + 16) + * Advanced Functions + **************************************/ +#define LZ4_MAX_INPUT_SIZE 0x7E000000 /* 2 113 929 216 bytes */ +#define LZ4_COMPRESSBOUND(isize) \ + ((unsigned)(isize) > (unsigned)LZ4_MAX_INPUT_SIZE ? 0 : (isize) + ((isize) / 255) + 16) /*! LZ4_compressBound() : - Provides the maximum size that LZ4 compression may output in a "worst case" scenario (input data not compressible) - This function is primarily useful for memory allocation purposes (destination buffer size). - Macro LZ4_COMPRESSBOUND() is also provided for compilation-time evaluation (stack memory allocation for example). - Note that LZ4_compress_default() compresses faster when dstCapacity is >= LZ4_compressBound(srcSize) - inputSize : max supported value is LZ4_MAX_INPUT_SIZE - return : maximum output size in a "worst case" scenario - or 0, if input size is incorrect (too large or negative) + Provides the maximum size that LZ4 compression may output in a "worst case" + scenario (input data not compressible) This function is primarily useful for + memory allocation purposes (destination buffer size). Macro + LZ4_COMPRESSBOUND() is also provided for compilation-time evaluation (stack + memory allocation for example). Note that LZ4_compress_default() compresses + faster when dstCapacity is >= LZ4_compressBound(srcSize) inputSize : max + supported value is LZ4_MAX_INPUT_SIZE return : maximum output size in a + "worst case" scenario or 0, if input size is incorrect (too large or + negative) */ LZ4LIB_API int LZ4_compressBound(int inputSize); /*! LZ4_compress_fast() : - Same as LZ4_compress_default(), but allows selection of "acceleration" factor. - The larger the acceleration value, the faster the algorithm, but also the lesser the compression. - It's a trade-off. It can be fine tuned, with each successive value providing roughly +~3% to speed. - An acceleration value of "1" is the same as regular LZ4_compress_default() - Values <= 0 will be replaced by LZ4_ACCELERATION_DEFAULT (currently == 1, see lz4.c). - Values > LZ4_ACCELERATION_MAX will be replaced by LZ4_ACCELERATION_MAX (currently == 65537, see lz4.c). + Same as LZ4_compress_default(), but allows selection of "acceleration" + factor. The larger the acceleration value, the faster the algorithm, but also + the lesser the compression. It's a trade-off. It can be fine tuned, with each + successive value providing roughly +~3% to speed. An acceleration value of + "1" is the same as regular LZ4_compress_default() Values <= 0 will be + replaced by LZ4_ACCELERATION_DEFAULT (currently == 1, see lz4.c). Values > + LZ4_ACCELERATION_MAX will be replaced by LZ4_ACCELERATION_MAX (currently == + 65537, see lz4.c). */ -LZ4LIB_API int LZ4_compress_fast (const char* src, char* dst, int srcSize, int dstCapacity, int acceleration); - +LZ4LIB_API int LZ4_compress_fast( + const char *src, char *dst, int srcSize, int dstCapacity, int acceleration); /*! LZ4_compress_fast_extState() : - * Same as LZ4_compress_fast(), using an externally allocated memory space for its state. - * Use LZ4_sizeofState() to know how much memory must be allocated, + * Same as LZ4_compress_fast(), using an externally allocated memory space for + * its state. Use LZ4_sizeofState() to know how much memory must be allocated, * and allocate it on 8-bytes boundaries (using `malloc()` typically). * Then, provide this buffer as `void* state` to compression function. */ LZ4LIB_API int LZ4_sizeofState(void); -LZ4LIB_API int LZ4_compress_fast_extState (void* state, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration); - +LZ4LIB_API int LZ4_compress_fast_extState( + void *state, const char *src, char *dst, int srcSize, int dstCapacity, int acceleration); /*! LZ4_compress_destSize() : * Reverse the logic : compresses as much data as possible from 'src' buffer * into already allocated buffer 'dst', of size >= 'targetDestSize'. - * This function either compresses the entire 'src' content into 'dst' if it's large enough, - * or fill 'dst' buffer completely with as much data as possible from 'src'. - * note: acceleration parameter is fixed to "default". + * This function either compresses the entire 'src' content into 'dst' if it's + * large enough, or fill 'dst' buffer completely with as much data as possible + * from 'src'. note: acceleration parameter is fixed to "default". * - * *srcSizePtr : will be modified to indicate how many bytes where read from 'src' to fill 'dst'. - * New value is necessarily <= input value. + * *srcSizePtr : will be modified to indicate how many bytes where read from + * 'src' to fill 'dst'. New value is necessarily <= input value. * @return : Nb bytes written into 'dst' (necessarily <= targetDestSize) * or 0 if compression fails. * @@ -267,8 +283,8 @@ LZ4LIB_API int LZ4_compress_fast_extState (void* state, const char* src, char* d * a dstCapacity which is > decompressedSize, by at least 1 byte. * See https://github.com/lz4/lz4/issues/859 for details */ -LZ4LIB_API int LZ4_compress_destSize (const char* src, char* dst, int* srcSizePtr, int targetDstSize); - +LZ4LIB_API int LZ4_compress_destSize( + const char *src, char *dst, int *srcSizePtr, int targetDstSize); /*! LZ4_decompress_safe_partial() : * Decompress an LZ4 compressed block, of size 'srcSize' at position 'src', @@ -278,22 +294,24 @@ LZ4LIB_API int LZ4_compress_destSize (const char* src, char* dst, int* srcSizePt * This can be useful to boost performance * whenever only the beginning of a block is required. * - * @return : the number of bytes decoded in `dst` (necessarily <= targetOutputSize) - * If source stream is detected malformed, function returns a negative result. + * @return : the number of bytes decoded in `dst` (necessarily <= + * targetOutputSize) If source stream is detected malformed, function returns a + * negative result. * - * Note 1 : @return can be < targetOutputSize, if compressed block contains less data. + * Note 1 : @return can be < targetOutputSize, if compressed block contains + * less data. * * Note 2 : targetOutputSize must be <= dstCapacity * - * Note 3 : this function effectively stops decoding on reaching targetOutputSize, - * so dstCapacity is kind of redundant. - * This is because in older versions of this function, - * decoding operation would still write complete sequences. - * Therefore, there was no guarantee that it would stop writing at exactly targetOutputSize, - * it could write more bytes, though only up to dstCapacity. - * Some "margin" used to be required for this operation to work properly. - * Thankfully, this is no longer necessary. - * The function nonetheless keeps the same signature, in an effort to preserve API compatibility. + * Note 3 : this function effectively stops decoding on reaching + * targetOutputSize, so dstCapacity is kind of redundant. This is because in + * older versions of this function, decoding operation would still write + * complete sequences. Therefore, there was no guarantee that it would stop + * writing at exactly targetOutputSize, it could write more bytes, though only + * up to dstCapacity. Some "margin" used to be required for this operation to + * work properly. Thankfully, this is no longer necessary. The function + * nonetheless keeps the same signature, in an effort to preserve API + * compatibility. * * Note 4 : If srcSize is the exact size of the block, * then targetOutputSize can be any value, @@ -304,18 +322,19 @@ LZ4LIB_API int LZ4_compress_destSize (const char* src, char* dst, int* srcSizePt * then targetOutputSize **MUST** be <= block's decompressed size. * Otherwise, *silent corruption will occur*. */ -LZ4LIB_API int LZ4_decompress_safe_partial (const char* src, char* dst, int srcSize, int targetOutputSize, int dstCapacity); - +LZ4LIB_API int LZ4_decompress_safe_partial( + const char *src, char *dst, int srcSize, int targetOutputSize, int dstCapacity); /*-********************************************* -* Streaming Compression Functions -***********************************************/ -typedef union LZ4_stream_u LZ4_stream_t; /* incomplete type (defined later) */ + * Streaming Compression Functions + ***********************************************/ +typedef union LZ4_stream_u LZ4_stream_t; /* incomplete type (defined later) */ /** Note about RC_INVOKED - - RC_INVOKED is predefined symbol of rc.exe (the resource compiler which is part of MSVC/Visual Studio). + - RC_INVOKED is predefined symbol of rc.exe (the resource compiler which is + part of MSVC/Visual Studio). https://docs.microsoft.com/en-us/windows/win32/menurc/predefined-macros - Since rc.exe is a legacy compiler, it truncates long symbol (> 30 chars) @@ -325,10 +344,12 @@ typedef union LZ4_stream_u LZ4_stream_t; /* incomplete type (defined later) */ "#if !defined(RC_INVOKED) ... #endif" block that means "skip this block when rc.exe is trying to read it". */ -#if !defined(RC_INVOKED) /* https://docs.microsoft.com/en-us/windows/win32/menurc/predefined-macros */ +#if !defined( \ + RC_INVOKED) /* https://docs.microsoft.com/en-us/windows/win32/menurc/predefined-macros \ + */ #if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) -LZ4LIB_API LZ4_stream_t* LZ4_createStream(void); -LZ4LIB_API int LZ4_freeStream (LZ4_stream_t* streamPtr); +LZ4LIB_API LZ4_stream_t *LZ4_createStream(void); +LZ4LIB_API int LZ4_freeStream(LZ4_stream_t *streamPtr); #endif /* !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) */ #endif @@ -352,154 +373,171 @@ LZ4LIB_API int LZ4_freeStream (LZ4_stream_t* streamPtr); * Note: it's only useful to call LZ4_resetStream_fast() * in the context of streaming compression. * The *extState* functions perform their own resets. - * Invoking LZ4_resetStream_fast() before is redundant, and even counterproductive. + * Invoking LZ4_resetStream_fast() before is redundant, and even + * counterproductive. */ -LZ4LIB_API void LZ4_resetStream_fast (LZ4_stream_t* streamPtr); +LZ4LIB_API void LZ4_resetStream_fast(LZ4_stream_t *streamPtr); /*! LZ4_loadDict() : * Use this function to reference a static dictionary into LZ4_stream_t. * The dictionary must remain available during compression. * LZ4_loadDict() triggers a reset, so any previous data will be forgotten. - * The same dictionary will have to be loaded on decompression side for successful decoding. - * Dictionary are useful for better compression of small data (KB range). - * While LZ4 accept any input as dictionary, - * results are generally better when using Zstandard's Dictionary Builder. - * Loading a size of 0 is allowed, and is the same as reset. + * The same dictionary will have to be loaded on decompression side for + * successful decoding. Dictionary are useful for better compression of small + * data (KB range). While LZ4 accept any input as dictionary, results are + * generally better when using Zstandard's Dictionary Builder. Loading a size of + * 0 is allowed, and is the same as reset. * @return : loaded dictionary size, in bytes (necessarily <= 64 KB) */ -LZ4LIB_API int LZ4_loadDict (LZ4_stream_t* streamPtr, const char* dictionary, int dictSize); +LZ4LIB_API int LZ4_loadDict(LZ4_stream_t *streamPtr, const char *dictionary, int dictSize); /*! LZ4_compress_fast_continue() : - * Compress 'src' content using data from previously compressed blocks, for better compression ratio. - * 'dst' buffer must be already allocated. - * If dstCapacity >= LZ4_compressBound(srcSize), compression is guaranteed to succeed, and runs faster. + * Compress 'src' content using data from previously compressed blocks, for + * better compression ratio. 'dst' buffer must be already allocated. If + * dstCapacity >= LZ4_compressBound(srcSize), compression is guaranteed to + * succeed, and runs faster. * * @return : size of compressed block * or 0 if there is an error (typically, cannot fit into 'dst'). * - * Note 1 : Each invocation to LZ4_compress_fast_continue() generates a new block. - * Each block has precise boundaries. - * Each block must be decompressed separately, calling LZ4_decompress_*() with relevant metadata. - * It's not possible to append blocks together and expect a single invocation of LZ4_decompress_*() to decompress them together. + * Note 1 : Each invocation to LZ4_compress_fast_continue() generates a new + * block. Each block has precise boundaries. Each block must be decompressed + * separately, calling LZ4_decompress_*() with relevant metadata. It's not + * possible to append blocks together and expect a single invocation of + * LZ4_decompress_*() to decompress them together. * - * Note 2 : The previous 64KB of source data is __assumed__ to remain present, unmodified, at same address in memory ! + * Note 2 : The previous 64KB of source data is __assumed__ to remain present, + * unmodified, at same address in memory ! * - * Note 3 : When input is structured as a double-buffer, each buffer can have any size, including < 64 KB. - * Make sure that buffers are separated, by at least one byte. - * This construction ensures that each block only depends on previous block. + * Note 3 : When input is structured as a double-buffer, each buffer can have + * any size, including < 64 KB. Make sure that buffers are separated, by at + * least one byte. This construction ensures that each block only depends on + * previous block. * - * Note 4 : If input buffer is a ring-buffer, it can have any size, including < 64 KB. + * Note 4 : If input buffer is a ring-buffer, it can have any size, including < + * 64 KB. * - * Note 5 : After an error, the stream status is undefined (invalid), it can only be reset or freed. + * Note 5 : After an error, the stream status is undefined (invalid), it can + * only be reset or freed. */ -LZ4LIB_API int LZ4_compress_fast_continue (LZ4_stream_t* streamPtr, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration); +LZ4LIB_API int LZ4_compress_fast_continue(LZ4_stream_t *streamPtr, const char *src, char *dst, + int srcSize, int dstCapacity, int acceleration); /*! LZ4_saveDict() : - * If last 64KB data cannot be guaranteed to remain available at its current memory location, - * save it into a safer place (char* safeBuffer). - * This is schematically equivalent to a memcpy() followed by LZ4_loadDict(), - * but is much faster, because LZ4_saveDict() doesn't need to rebuild tables. - * @return : saved dictionary size in bytes (necessarily <= maxDictSize), or 0 if error. + * If last 64KB data cannot be guaranteed to remain available at its current + * memory location, save it into a safer place (char* safeBuffer). This is + * schematically equivalent to a memcpy() followed by LZ4_loadDict(), but is + * much faster, because LZ4_saveDict() doesn't need to rebuild tables. + * @return : saved dictionary size in bytes (necessarily <= maxDictSize), or 0 + * if error. */ -LZ4LIB_API int LZ4_saveDict (LZ4_stream_t* streamPtr, char* safeBuffer, int maxDictSize); - +LZ4LIB_API int LZ4_saveDict(LZ4_stream_t *streamPtr, char *safeBuffer, int maxDictSize); /*-********************************************** -* Streaming Decompression Functions -* Bufferless synchronous API -************************************************/ -typedef union LZ4_streamDecode_u LZ4_streamDecode_t; /* tracking context */ + * Streaming Decompression Functions + * Bufferless synchronous API + ************************************************/ +typedef union LZ4_streamDecode_u LZ4_streamDecode_t; /* tracking context */ /*! LZ4_createStreamDecode() and LZ4_freeStreamDecode() : * creation / destruction of streaming decompression tracking context. * A tracking context can be re-used multiple times. */ -#if !defined(RC_INVOKED) /* https://docs.microsoft.com/en-us/windows/win32/menurc/predefined-macros */ +#if !defined( \ + RC_INVOKED) /* https://docs.microsoft.com/en-us/windows/win32/menurc/predefined-macros \ + */ #if !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) -LZ4LIB_API LZ4_streamDecode_t* LZ4_createStreamDecode(void); -LZ4LIB_API int LZ4_freeStreamDecode (LZ4_streamDecode_t* LZ4_stream); +LZ4LIB_API LZ4_streamDecode_t *LZ4_createStreamDecode(void); +LZ4LIB_API int LZ4_freeStreamDecode(LZ4_streamDecode_t *LZ4_stream); #endif /* !defined(LZ4_STATIC_LINKING_ONLY_DISABLE_MEMORY_ALLOCATION) */ #endif /*! LZ4_setStreamDecode() : - * An LZ4_streamDecode_t context can be allocated once and re-used multiple times. - * Use this function to start decompression of a new stream of blocks. - * A dictionary can optionally be set. Use NULL or size 0 for a reset order. - * Dictionary is presumed stable : it must remain accessible and unmodified during next decompression. + * An LZ4_streamDecode_t context can be allocated once and re-used multiple + * times. Use this function to start decompression of a new stream of blocks. A + * dictionary can optionally be set. Use NULL or size 0 for a reset order. + * Dictionary is presumed stable : it must remain accessible and unmodified + * during next decompression. * @return : 1 if OK, 0 if error */ -LZ4LIB_API int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const char* dictionary, int dictSize); +LZ4LIB_API int LZ4_setStreamDecode( + LZ4_streamDecode_t *LZ4_streamDecode, const char *dictionary, int dictSize); /*! LZ4_decoderRingBufferSize() : v1.8.2+ * Note : in a ring buffer scenario (optional), * blocks are presumed decompressed next to each other - * up to the moment there is not enough remaining space for next block (remainingSize < maxBlockSize), - * at which stage it resumes from beginning of ring buffer. - * When setting such a ring buffer for streaming decompression, + * up to the moment there is not enough remaining space for next block + * (remainingSize < maxBlockSize), at which stage it resumes from beginning of + * ring buffer. When setting such a ring buffer for streaming decompression, * provides the minimum size of this ring buffer * to be compatible with any source respecting maxBlockSize condition. * @return : minimum ring buffer size, * or 0 if there is an error (invalid maxBlockSize). */ LZ4LIB_API int LZ4_decoderRingBufferSize(int maxBlockSize); -#define LZ4_DECODER_RING_BUFFER_SIZE(maxBlockSize) (65536 + 14 + (maxBlockSize)) /* for static allocation; maxBlockSize presumed valid */ +#define LZ4_DECODER_RING_BUFFER_SIZE(maxBlockSize) \ + (65536 + 14 + (maxBlockSize)) /* for static allocation; maxBlockSize presumed valid */ /*! LZ4_decompress_safe_continue() : - * This decoding function allows decompression of consecutive blocks in "streaming" mode. - * The difference with the usual independent blocks is that + * This decoding function allows decompression of consecutive blocks in + * "streaming" mode. The difference with the usual independent blocks is that * new blocks are allowed to find references into former blocks. - * A block is an unsplittable entity, and must be presented entirely to the decompression function. - * LZ4_decompress_safe_continue() only accepts one block at a time. - * It's modeled after `LZ4_decompress_safe()` and behaves similarly. + * A block is an unsplittable entity, and must be presented entirely to the + * decompression function. LZ4_decompress_safe_continue() only accepts one block + * at a time. It's modeled after `LZ4_decompress_safe()` and behaves similarly. * - * @LZ4_streamDecode : decompression state, tracking the position in memory of past data + * @LZ4_streamDecode : decompression state, tracking the position in memory of + * past data * @compressedSize : exact complete size of one compressed block. * @dstCapacity : size of destination buffer (which must be already allocated), * must be an upper bound of decompressed size. - * @return : number of bytes decompressed into destination buffer (necessarily <= dstCapacity) - * If destination buffer is not large enough, decoding will stop and output an error code (negative value). - * If the source stream is detected malformed, the function will stop decoding and return a negative result. - * - * The last 64KB of previously decoded data *must* remain available and unmodified - * at the memory position where they were previously decoded. - * If less than 64KB of data has been decoded, all the data must be present. - * - * Special : if decompression side sets a ring buffer, it must respect one of the following conditions : - * - Decompression buffer size is _at least_ LZ4_decoderRingBufferSize(maxBlockSize). - * maxBlockSize is the maximum size of any single block. It can have any value > 16 bytes. - * In which case, encoding and decoding buffers do not need to be synchronized. - * Actually, data can be produced by any source compliant with LZ4 format specification, and respecting maxBlockSize. + * @return : number of bytes decompressed into destination buffer (necessarily + * <= dstCapacity) If destination buffer is not large enough, decoding will stop + * and output an error code (negative value). If the source stream is detected + * malformed, the function will stop decoding and return a negative result. + * + * The last 64KB of previously decoded data *must* remain available and + * unmodified at the memory position where they were previously decoded. If less + * than 64KB of data has been decoded, all the data must be present. + * + * Special : if decompression side sets a ring buffer, it must respect one of + * the following conditions : + * - Decompression buffer size is _at least_ + * LZ4_decoderRingBufferSize(maxBlockSize). maxBlockSize is the maximum size of + * any single block. It can have any value > 16 bytes. In which case, encoding + * and decoding buffers do not need to be synchronized. Actually, data can be + * produced by any source compliant with LZ4 format specification, and + * respecting maxBlockSize. * - Synchronized mode : - * Decompression buffer size is _exactly_ the same as compression buffer size, - * and follows exactly same update rule (block boundaries at same positions), - * and decoding function is provided with exact decompressed size of each block (exception for last block of the stream), - * _then_ decoding & encoding ring buffer can have any size, including small ones ( < 64 KB). - * - Decompression buffer is larger than encoding buffer, by a minimum of maxBlockSize more bytes. - * In which case, encoding and decoding buffers do not need to be synchronized, - * and encoding ring buffer can have any size, including small ones ( < 64 KB). + * Decompression buffer size is _exactly_ the same as compression buffer + * size, and follows exactly same update rule (block boundaries at same + * positions), and decoding function is provided with exact decompressed size of + * each block (exception for last block of the stream), _then_ decoding & + * encoding ring buffer can have any size, including small ones ( < 64 KB). + * - Decompression buffer is larger than encoding buffer, by a minimum of + * maxBlockSize more bytes. In which case, encoding and decoding buffers do not + * need to be synchronized, and encoding ring buffer can have any size, + * including small ones ( < 64 KB). * * Whenever these conditions are not possible, - * save the last 64KB of decoded data into a safe buffer where it can't be modified during decompression, - * then indicate where this data is saved using LZ4_setStreamDecode(), before decompressing next block. -*/ -LZ4LIB_API int -LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, - const char* src, char* dst, - int srcSize, int dstCapacity); - + * save the last 64KB of decoded data into a safe buffer where it can't be + * modified during decompression, then indicate where this data is saved using + * LZ4_setStreamDecode(), before decompressing next block. + */ +LZ4LIB_API int LZ4_decompress_safe_continue( + LZ4_streamDecode_t *LZ4_streamDecode, const char *src, char *dst, int srcSize, int dstCapacity); /*! LZ4_decompress_safe_usingDict() : * Works the same as - * a combination of LZ4_setStreamDecode() followed by LZ4_decompress_safe_continue() - * However, it's stateless: it doesn't need any LZ4_streamDecode_t state. - * Dictionary is presumed stable : it must remain accessible and unmodified during decompression. - * Performance tip : Decompression speed can be substantially increased - * when dst == dictStart + dictSize. + * a combination of LZ4_setStreamDecode() followed by + * LZ4_decompress_safe_continue() However, it's stateless: it doesn't need any + * LZ4_streamDecode_t state. Dictionary is presumed stable : it must remain + * accessible and unmodified during decompression. Performance tip : + * Decompression speed can be substantially increased when dst == dictStart + + * dictSize. */ -LZ4LIB_API int -LZ4_decompress_safe_usingDict(const char* src, char* dst, - int srcSize, int dstCapacity, - const char* dictStart, int dictSize); +LZ4LIB_API int LZ4_decompress_safe_usingDict( + const char *src, char *dst, int srcSize, int dstCapacity, const char *dictStart, int dictSize); /*! LZ4_decompress_safe_partial_usingDict() : * Behaves the same as LZ4_decompress_safe_partial() @@ -507,15 +545,11 @@ LZ4_decompress_safe_usingDict(const char* src, char* dst, * Performance tip : Decompression speed can be substantially increased * when dst == dictStart + dictSize. */ -LZ4LIB_API int -LZ4_decompress_safe_partial_usingDict(const char* src, char* dst, - int compressedSize, - int targetOutputSize, int maxOutputSize, - const char* dictStart, int dictSize); +LZ4LIB_API int LZ4_decompress_safe_partial_usingDict(const char *src, char *dst, int compressedSize, + int targetOutputSize, int maxOutputSize, const char *dictStart, int dictSize); #endif /* LZ4_H_2983827168210 */ - /*^************************************* * !!!!!! STATIC LINKING ONLY !!!!!! ***************************************/ @@ -551,18 +585,19 @@ LZ4_decompress_safe_partial_usingDict(const char* src, char* dst, #define LZ4LIB_STATIC_API #endif - /*! LZ4_compress_fast_extState_fastReset() : * A variant of LZ4_compress_fast_extState(). * * Using this variant avoids an expensive initialization step. - * It is only safe to call if the state buffer is known to be correctly initialized already - * (see above comment on LZ4_resetStream_fast() for a definition of "correctly initialized"). - * From a high level, the difference is that - * this function initializes the provided state with a call to something like LZ4_resetStream_fast() - * while LZ4_compress_fast_extState() starts with a call to LZ4_resetStream(). + * It is only safe to call if the state buffer is known to be correctly + * initialized already (see above comment on LZ4_resetStream_fast() for a + * definition of "correctly initialized"). From a high level, the difference is + * that this function initializes the provided state with a call to something + * like LZ4_resetStream_fast() while LZ4_compress_fast_extState() starts with a + * call to LZ4_resetStream(). */ -LZ4LIB_STATIC_API int LZ4_compress_fast_extState_fastReset (void* state, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration); +LZ4LIB_STATIC_API int LZ4_compress_fast_extState_fastReset( + void *state, const char *src, char *dst, int srcSize, int dstCapacity, int acceleration); /*! LZ4_attach_dictionary() : * This is an experimental API that allows @@ -590,10 +625,8 @@ LZ4LIB_STATIC_API int LZ4_compress_fast_extState_fastReset (void* state, const c * stream (and source buffer) must remain in-place / accessible / unchanged * through the completion of the first compression call on the stream. */ -LZ4LIB_STATIC_API void -LZ4_attach_dictionary(LZ4_stream_t* workingStream, - const LZ4_stream_t* dictionaryStream); - +LZ4LIB_STATIC_API void LZ4_attach_dictionary( + LZ4_stream_t *workingStream, const LZ4_stream_t *dictionaryStream); /*! In-place compression and decompression * @@ -616,50 +649,65 @@ LZ4_attach_dictionary(LZ4_stream_t* workingStream, * which size is >= LZ4_DECOMPRESS_INPLACE_BUFFER_SIZE(decompressedSize). * This presumes that decompressedSize > compressedSize. * Otherwise, it means compression actually expanded data, - * and it would be more efficient to store such data with a flag indicating it's not compressed. - * This can happen when data is not compressible (already compressed, or encrypted). + * and it would be more efficient to store such data with a flag indicating it's + * not compressed. This can happen when data is not compressible (already + * compressed, or encrypted). * - * For in-place compression, margin is larger, as it must be able to cope with both - * history preservation, requiring input data to remain unmodified up to LZ4_DISTANCE_MAX, - * and data expansion, which can happen when input is not compressible. - * As a consequence, buffer size requirements are much higher, - * and memory savings offered by in-place compression are more limited. + * For in-place compression, margin is larger, as it must be able to cope with + * both history preservation, requiring input data to remain unmodified up to + * LZ4_DISTANCE_MAX, and data expansion, which can happen when input is not + * compressible. As a consequence, buffer size requirements are much higher, and + * memory savings offered by in-place compression are more limited. * * There are ways to limit this cost for compression : * - Reduce history size, by modifying LZ4_DISTANCE_MAX. - * Note that it is a compile-time constant, so all compressions will apply this limit. - * Lower values will reduce compression ratio, except when input_size < LZ4_DISTANCE_MAX, - * so it's a reasonable trick when inputs are known to be small. + * Note that it is a compile-time constant, so all compressions will apply + * this limit. Lower values will reduce compression ratio, except when + * input_size < LZ4_DISTANCE_MAX, so it's a reasonable trick when inputs are + * known to be small. * - Require the compressor to deliver a "maximum compressed size". * This is the `dstCapacity` parameter in `LZ4_compress*()`. - * When this size is < LZ4_COMPRESSBOUND(inputSize), then compression can fail, - * in which case, the return code will be 0 (zero). - * The caller must be ready for these cases to happen, - * and typically design a backup scheme to send data uncompressed. - * The combination of both techniques can significantly reduce - * the amount of margin required for in-place compression. + * When this size is < LZ4_COMPRESSBOUND(inputSize), then compression can + * fail, in which case, the return code will be 0 (zero). The caller must be + * ready for these cases to happen, and typically design a backup scheme to send + * data uncompressed. The combination of both techniques can significantly + * reduce the amount of margin required for in-place compression. * * In-place compression can work in any buffer * which size is >= (maxCompressedSize) - * with maxCompressedSize == LZ4_COMPRESSBOUND(srcSize) for guaranteed compression success. - * LZ4_COMPRESS_INPLACE_BUFFER_SIZE() depends on both maxCompressedSize and LZ4_DISTANCE_MAX, - * so it's possible to reduce memory requirements by playing with them. + * with maxCompressedSize == LZ4_COMPRESSBOUND(srcSize) for guaranteed + * compression success. LZ4_COMPRESS_INPLACE_BUFFER_SIZE() depends on both + * maxCompressedSize and LZ4_DISTANCE_MAX, so it's possible to reduce memory + * requirements by playing with them. */ -#define LZ4_DECOMPRESS_INPLACE_MARGIN(compressedSize) (((compressedSize) >> 8) + 32) -#define LZ4_DECOMPRESS_INPLACE_BUFFER_SIZE(decompressedSize) ((decompressedSize) + LZ4_DECOMPRESS_INPLACE_MARGIN(decompressedSize)) /**< note: presumes that compressedSize < decompressedSize. note2: margin is overestimated a bit, since it could use compressedSize instead */ - -#ifndef LZ4_DISTANCE_MAX /* history window size; can be user-defined at compile time */ -# define LZ4_DISTANCE_MAX 65535 /* set to maximum value by default */ +#define LZ4_DECOMPRESS_INPLACE_MARGIN(compressedSize) (((compressedSize) >> 8) + 32) +#define LZ4_DECOMPRESS_INPLACE_BUFFER_SIZE(decompressedSize) \ + ((decompressedSize) + \ + LZ4_DECOMPRESS_INPLACE_MARGIN(decompressedSize)) /**< note: presumes that compressedSize < \ + decompressedSize. note2: margin is \ + overestimated a bit, since it could \ + use compressedSize instead \ + */ + +#ifndef LZ4_DISTANCE_MAX /* history window size; can be user-defined at \ + compile time */ +#define LZ4_DISTANCE_MAX 65535 /* set to maximum value by default */ #endif -#define LZ4_COMPRESS_INPLACE_MARGIN (LZ4_DISTANCE_MAX + 32) /* LZ4_DISTANCE_MAX can be safely replaced by srcSize when it's smaller */ -#define LZ4_COMPRESS_INPLACE_BUFFER_SIZE(maxCompressedSize) ((maxCompressedSize) + LZ4_COMPRESS_INPLACE_MARGIN) /**< maxCompressedSize is generally LZ4_COMPRESSBOUND(inputSize), but can be set to any lower value, with the risk that compression can fail (return code 0(zero)) */ - -#endif /* LZ4_STATIC_3504398509 */ -#endif /* LZ4_STATIC_LINKING_ONLY */ - +#define LZ4_COMPRESS_INPLACE_MARGIN \ + (LZ4_DISTANCE_MAX + 32) /* LZ4_DISTANCE_MAX can be safely replaced by \ + srcSize when it's smaller */ +#define LZ4_COMPRESS_INPLACE_BUFFER_SIZE(maxCompressedSize) \ + ((maxCompressedSize) + LZ4_COMPRESS_INPLACE_MARGIN) /**< maxCompressedSize is generally \ + LZ4_COMPRESSBOUND(inputSize), but can \ + be set to any lower value, with the \ + risk that compression can fail (return \ + code 0(zero)) \ + */ +#endif /* LZ4_STATIC_3504398509 */ +#endif /* LZ4_STATIC_LINKING_ONLY */ #ifndef LZ4_H_98237428734687 #define LZ4_H_98237428734687 @@ -668,50 +716,53 @@ LZ4_attach_dictionary(LZ4_stream_t* workingStream, * Private Definitions ************************************************************** * Do not use these definitions directly. - * They are only exposed to allow static allocation of `LZ4_stream_t` and `LZ4_streamDecode_t`. - * Accessing members will expose user code to API and/or ABI break in future versions of the library. + * They are only exposed to allow static allocation of `LZ4_stream_t` and + *`LZ4_streamDecode_t`. Accessing members will expose user code to API and/or + *ABI break in future versions of the library. **************************************************************/ -#define LZ4_HASHLOG (LZ4_MEMORY_USAGE-2) +#define LZ4_HASHLOG (LZ4_MEMORY_USAGE - 2) #define LZ4_HASHTABLESIZE (1 << LZ4_MEMORY_USAGE) -#define LZ4_HASH_SIZE_U32 (1 << LZ4_HASHLOG) /* required as macro for static allocation */ - -#if defined(__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) -# include - typedef int8_t LZ4_i8; - typedef uint8_t LZ4_byte; - typedef uint16_t LZ4_u16; - typedef uint32_t LZ4_u32; +#define LZ4_HASH_SIZE_U32 (1 << LZ4_HASHLOG) /* required as macro for static allocation */ + +#if defined(__cplusplus) || (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) +#include +typedef int8_t LZ4_i8; +typedef uint8_t LZ4_byte; +typedef uint16_t LZ4_u16; +typedef uint32_t LZ4_u32; #else - typedef signed char LZ4_i8; - typedef unsigned char LZ4_byte; - typedef unsigned short LZ4_u16; - typedef unsigned int LZ4_u32; +typedef signed char LZ4_i8; +typedef unsigned char LZ4_byte; +typedef unsigned short LZ4_u16; +typedef unsigned int LZ4_u32; #endif /*! LZ4_stream_t : * Never ever use below internal definitions directly ! * These definitions are not API/ABI safe, and may change in future versions. * If you need static allocation, declare or allocate an LZ4_stream_t object. -**/ + **/ typedef struct LZ4_stream_t_internal LZ4_stream_t_internal; + struct LZ4_stream_t_internal { - LZ4_u32 hashTable[LZ4_HASH_SIZE_U32]; - const LZ4_byte* dictionary; - const LZ4_stream_t_internal* dictCtx; - LZ4_u32 currentOffset; - LZ4_u32 tableType; - LZ4_u32 dictSize; - /* Implicit padding to ensure structure is aligned */ + LZ4_u32 hashTable[LZ4_HASH_SIZE_U32]; + const LZ4_byte *dictionary; + const LZ4_stream_t_internal *dictCtx; + LZ4_u32 currentOffset; + LZ4_u32 tableType; + LZ4_u32 dictSize; + /* Implicit padding to ensure structure is aligned */ }; -#define LZ4_STREAM_MINSIZE ((1UL << LZ4_MEMORY_USAGE) + 32) /* static size, for inter-version compatibility */ +#define LZ4_STREAM_MINSIZE \ + ((1UL << LZ4_MEMORY_USAGE) + 32) /* static size, for inter-version compatibility */ + union LZ4_stream_u { - char minStateSize[LZ4_STREAM_MINSIZE]; - LZ4_stream_t_internal internal_donotuse; + char minStateSize[LZ4_STREAM_MINSIZE]; + LZ4_stream_t_internal internal_donotuse; }; /* previously typedef'd to LZ4_stream_t */ - /*! LZ4_initStream() : v1.9.0+ * An LZ4_stream_t structure must be initialized at least once. * This is automatically done when invoking LZ4_createStream(), @@ -721,77 +772,92 @@ union LZ4_stream_u { * It can also initialize any arbitrary buffer of sufficient size, * and will @return a pointer of proper type upon initialization. * - * Note : initialization fails if size and alignment conditions are not respected. - * In which case, the function will @return NULL. - * Note2: An LZ4_stream_t structure guarantees correct alignment and size. - * Note3: Before v1.9.0, use LZ4_resetStream() instead -**/ -LZ4LIB_API LZ4_stream_t* LZ4_initStream (void* buffer, size_t size); - + * Note : initialization fails if size and alignment conditions are not + *respected. In which case, the function will @return NULL. Note2: An + *LZ4_stream_t structure guarantees correct alignment and size. Note3: Before + *v1.9.0, use LZ4_resetStream() instead + **/ +LZ4LIB_API LZ4_stream_t *LZ4_initStream(void *buffer, size_t size); /*! LZ4_streamDecode_t : * Never ever use below internal definitions directly ! * These definitions are not API/ABI safe, and may change in future versions. - * If you need static allocation, declare or allocate an LZ4_streamDecode_t object. -**/ + * If you need static allocation, declare or allocate an LZ4_streamDecode_t + *object. + **/ typedef struct { - const LZ4_byte* externalDict; - const LZ4_byte* prefixEnd; - size_t extDictSize; - size_t prefixSize; + const LZ4_byte *externalDict; + const LZ4_byte *prefixEnd; + size_t extDictSize; + size_t prefixSize; } LZ4_streamDecode_t_internal; #define LZ4_STREAMDECODE_MINSIZE 32 -union LZ4_streamDecode_u { - char minStateSize[LZ4_STREAMDECODE_MINSIZE]; - LZ4_streamDecode_t_internal internal_donotuse; -} ; /* previously typedef'd to LZ4_streamDecode_t */ - +union LZ4_streamDecode_u { + char minStateSize[LZ4_STREAMDECODE_MINSIZE]; + LZ4_streamDecode_t_internal internal_donotuse; +}; /* previously typedef'd to LZ4_streamDecode_t */ /*-************************************ -* Obsolete Functions -**************************************/ + * Obsolete Functions + **************************************/ /*! Deprecation warnings * * Deprecated functions make the compiler generate a warning when invoked. * This is meant to invite users to update their source code. - * Should deprecation warnings be a problem, it is generally possible to disable them, - * typically with -Wno-deprecated-declarations for gcc - * or _CRT_SECURE_NO_WARNINGS in Visual. + * Should deprecation warnings be a problem, it is generally possible to + * disable them, typically with -Wno-deprecated-declarations for gcc or + * _CRT_SECURE_NO_WARNINGS in Visual. * * Another method is to define LZ4_DISABLE_DEPRECATE_WARNINGS * before including the header file. */ #ifdef LZ4_DISABLE_DEPRECATE_WARNINGS -# define LZ4_DEPRECATED(message) /* disable deprecation warnings */ +#define LZ4_DEPRECATED(message) /* disable deprecation warnings */ #else -# if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */ -# define LZ4_DEPRECATED(message) [[deprecated(message)]] -# elif defined(_MSC_VER) -# define LZ4_DEPRECATED(message) __declspec(deprecated(message)) -# elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ >= 45)) -# define LZ4_DEPRECATED(message) __attribute__((deprecated(message))) -# elif defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ >= 31) -# define LZ4_DEPRECATED(message) __attribute__((deprecated)) -# else -# pragma message("WARNING: LZ4_DEPRECATED needs custom implementation for this compiler") -# define LZ4_DEPRECATED(message) /* disabled */ -# endif +#if defined(__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */ +#define LZ4_DEPRECATED(message) [[deprecated(message)]] +#elif defined(_MSC_VER) +#define LZ4_DEPRECATED(message) __declspec(deprecated(message)) +#elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ >= 45)) +#define LZ4_DEPRECATED(message) __attribute__((deprecated(message))) +#elif defined(__GNUC__) && (__GNUC__ * 10 + __GNUC_MINOR__ >= 31) +#define LZ4_DEPRECATED(message) __attribute__((deprecated)) +#else +#pragma message("WARNING: LZ4_DEPRECATED needs custom implementation for this compiler") +#define LZ4_DEPRECATED(message) /* disabled */ +#endif #endif /* LZ4_DISABLE_DEPRECATE_WARNINGS */ /*! Obsolete compression functions (since v1.7.3) */ -LZ4_DEPRECATED("use LZ4_compress_default() instead") LZ4LIB_API int LZ4_compress (const char* src, char* dest, int srcSize); -LZ4_DEPRECATED("use LZ4_compress_default() instead") LZ4LIB_API int LZ4_compress_limitedOutput (const char* src, char* dest, int srcSize, int maxOutputSize); -LZ4_DEPRECATED("use LZ4_compress_fast_extState() instead") LZ4LIB_API int LZ4_compress_withState (void* state, const char* source, char* dest, int inputSize); -LZ4_DEPRECATED("use LZ4_compress_fast_extState() instead") LZ4LIB_API int LZ4_compress_limitedOutput_withState (void* state, const char* source, char* dest, int inputSize, int maxOutputSize); -LZ4_DEPRECATED("use LZ4_compress_fast_continue() instead") LZ4LIB_API int LZ4_compress_continue (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize); -LZ4_DEPRECATED("use LZ4_compress_fast_continue() instead") LZ4LIB_API int LZ4_compress_limitedOutput_continue (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize, int maxOutputSize); +LZ4_DEPRECATED("use LZ4_compress_default() instead") +LZ4LIB_API int LZ4_compress(const char *src, char *dest, int srcSize); +LZ4_DEPRECATED("use LZ4_compress_default() instead") +LZ4LIB_API int LZ4_compress_limitedOutput( + const char *src, char *dest, int srcSize, int maxOutputSize); +LZ4_DEPRECATED("use LZ4_compress_fast_extState() instead") +LZ4LIB_API int LZ4_compress_withState(void *state, const char *source, char *dest, int inputSize); +LZ4_DEPRECATED("use LZ4_compress_fast_extState() instead") +LZ4LIB_API +int LZ4_compress_limitedOutput_withState( + void *state, const char *source, char *dest, int inputSize, int maxOutputSize); +LZ4_DEPRECATED("use LZ4_compress_fast_continue() instead") +LZ4LIB_API +int LZ4_compress_continue( + LZ4_stream_t *LZ4_streamPtr, const char *source, char *dest, int inputSize); +LZ4_DEPRECATED("use LZ4_compress_fast_continue() instead") +LZ4LIB_API +int LZ4_compress_limitedOutput_continue( + LZ4_stream_t *LZ4_streamPtr, const char *source, char *dest, int inputSize, int maxOutputSize); /*! Obsolete decompression functions (since v1.8.0) */ -LZ4_DEPRECATED("use LZ4_decompress_fast() instead") LZ4LIB_API int LZ4_uncompress (const char* source, char* dest, int outputSize); -LZ4_DEPRECATED("use LZ4_decompress_safe() instead") LZ4LIB_API int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize); +LZ4_DEPRECATED("use LZ4_decompress_fast() instead") +LZ4LIB_API int LZ4_uncompress(const char *source, char *dest, int outputSize); +LZ4_DEPRECATED("use LZ4_decompress_safe() instead") +LZ4LIB_API int LZ4_uncompress_unknownOutputSize( + const char *source, char *dest, int isize, int maxOutputSize); /* Obsolete streaming functions (since v1.7.0) * degraded functionality; do not use! @@ -803,22 +869,32 @@ LZ4_DEPRECATED("use LZ4_decompress_safe() instead") LZ4LIB_API int LZ4_uncompres * achieved will therefore be no better than compressing each chunk * independently. */ -LZ4_DEPRECATED("Use LZ4_createStream() instead") LZ4LIB_API void* LZ4_create (char* inputBuffer); -LZ4_DEPRECATED("Use LZ4_createStream() instead") LZ4LIB_API int LZ4_sizeofStreamState(void); -LZ4_DEPRECATED("Use LZ4_resetStream() instead") LZ4LIB_API int LZ4_resetStreamState(void* state, char* inputBuffer); -LZ4_DEPRECATED("Use LZ4_saveDict() instead") LZ4LIB_API char* LZ4_slideInputBuffer (void* state); +LZ4_DEPRECATED("Use LZ4_createStream() instead") +LZ4LIB_API void *LZ4_create(char *inputBuffer); +LZ4_DEPRECATED("Use LZ4_createStream() instead") +LZ4LIB_API int LZ4_sizeofStreamState(void); +LZ4_DEPRECATED("Use LZ4_resetStream() instead") +LZ4LIB_API int LZ4_resetStreamState(void *state, char *inputBuffer); +LZ4_DEPRECATED("Use LZ4_saveDict() instead") +LZ4LIB_API char *LZ4_slideInputBuffer(void *state); /*! Obsolete streaming decoding functions (since v1.7.0) */ -LZ4_DEPRECATED("use LZ4_decompress_safe_usingDict() instead") LZ4LIB_API int LZ4_decompress_safe_withPrefix64k (const char* src, char* dst, int compressedSize, int maxDstSize); -LZ4_DEPRECATED("use LZ4_decompress_fast_usingDict() instead") LZ4LIB_API int LZ4_decompress_fast_withPrefix64k (const char* src, char* dst, int originalSize); +LZ4_DEPRECATED("use LZ4_decompress_safe_usingDict() instead") +LZ4LIB_API +int LZ4_decompress_safe_withPrefix64k( + const char *src, char *dst, int compressedSize, int maxDstSize); +LZ4_DEPRECATED("use LZ4_decompress_fast_usingDict() instead") +LZ4LIB_API int LZ4_decompress_fast_withPrefix64k(const char *src, char *dst, int originalSize); /*! Obsolete LZ4_decompress_fast variants (since v1.9.0) : * These functions used to be faster than LZ4_decompress_safe(), * but this is no longer the case. They are now slower. * This is because LZ4_decompress_fast() doesn't know the input size, - * and therefore must progress more cautiously into the input buffer to not read beyond the end of block. - * On top of that `LZ4_decompress_fast()` is not protected vs malformed or malicious inputs, making it a security liability. - * As a consequence, LZ4_decompress_fast() is strongly discouraged, and deprecated. + * and therefore must progress more cautiously into the input buffer to not + * read beyond the end of block. On top of that `LZ4_decompress_fast()` is not + * protected vs malformed or malicious inputs, making it a security liability. + * As a consequence, LZ4_decompress_fast() is strongly discouraged, and + * deprecated. * * The last remaining LZ4_decompress_fast() specificity is that * it can decompress a block without knowing its compressed size. @@ -827,23 +903,31 @@ LZ4_DEPRECATED("use LZ4_decompress_fast_usingDict() instead") LZ4LIB_API int LZ4 * * Parameters: * originalSize : is the uncompressed size to regenerate. - * `dst` must be already allocated, its size must be >= 'originalSize' bytes. + * `dst` must be already allocated, its size must be >= + * 'originalSize' bytes. * @return : number of bytes read from source buffer (== compressed size). * The function expects to finish at block's end exactly. - * If the source stream is detected malformed, the function stops decoding and returns a negative result. - * note : LZ4_decompress_fast*() requires originalSize. Thanks to this information, it never writes past the output buffer. - * However, since it doesn't know its 'src' size, it may read an unknown amount of input, past input buffer bounds. - * Also, since match offsets are not validated, match reads from 'src' may underflow too. - * These issues never happen if input (compressed) data is correct. - * But they may happen if input data is invalid (error or intentional tampering). - * As a consequence, use these functions in trusted environments with trusted data **only**. + * If the source stream is detected malformed, the function stops + * decoding and returns a negative result. note : LZ4_decompress_fast*() + * requires originalSize. Thanks to this information, it never writes past the + * output buffer. However, since it doesn't know its 'src' size, it may read an + * unknown amount of input, past input buffer bounds. Also, since match offsets + * are not validated, match reads from 'src' may underflow too. These issues + * never happen if input (compressed) data is correct. But they may happen if + * input data is invalid (error or intentional tampering). As a consequence, use + * these functions in trusted environments with trusted data **only**. */ -LZ4_DEPRECATED("This function is deprecated and unsafe. Consider using LZ4_decompress_safe() instead") -LZ4LIB_API int LZ4_decompress_fast (const char* src, char* dst, int originalSize); -LZ4_DEPRECATED("This function is deprecated and unsafe. Consider using LZ4_decompress_safe_continue() instead") -LZ4LIB_API int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* src, char* dst, int originalSize); -LZ4_DEPRECATED("This function is deprecated and unsafe. Consider using LZ4_decompress_safe_usingDict() instead") -LZ4LIB_API int LZ4_decompress_fast_usingDict (const char* src, char* dst, int originalSize, const char* dictStart, int dictSize); +LZ4_DEPRECATED("This function is deprecated and unsafe. Consider using " + "LZ4_decompress_safe() instead") +LZ4LIB_API int LZ4_decompress_fast(const char *src, char *dst, int originalSize); +LZ4_DEPRECATED("This function is deprecated and unsafe. Consider using " + "LZ4_decompress_safe_continue() instead") +LZ4LIB_API int LZ4_decompress_fast_continue( + LZ4_streamDecode_t *LZ4_streamDecode, const char *src, char *dst, int originalSize); +LZ4_DEPRECATED("This function is deprecated and unsafe. Consider using " + "LZ4_decompress_safe_usingDict() instead") +LZ4LIB_API int LZ4_decompress_fast_usingDict( + const char *src, char *dst, int originalSize, const char *dictStart, int dictSize); /*! LZ4_resetStream() : * An LZ4_stream_t structure must be initialized at least once. @@ -851,12 +935,10 @@ LZ4LIB_API int LZ4_decompress_fast_usingDict (const char* src, char* dst, int or * Consider switching to LZ4_initStream(), * invoking LZ4_resetStream() will trigger deprecation warnings in the future. */ -LZ4LIB_API void LZ4_resetStream (LZ4_stream_t* streamPtr); - +LZ4LIB_API void LZ4_resetStream(LZ4_stream_t *streamPtr); #endif /* LZ4_H_98237428734687 */ - -#if defined (__cplusplus) +#if defined(__cplusplus) } #endif diff --git a/osd/msp/msp.c b/osd/msp/msp.c index f01efbc..b1a538c 100644 --- a/osd/msp/msp.c +++ b/osd/msp/msp.c @@ -1,298 +1,279 @@ -#include -#include -#include -#include -#include #include "msp.h" #include "../util/interface.h" #include "../util/settings.h" +#include +#include +#include +#include +#include extern bool verbose; bool vtxInitDone = false; uint8_t channelFreqLabel[FREQ_LABEL_SIZE] = { - 'B', 'A', 'N', 'D', '_', 'A', ' ', ' ', // A - 'B', 'A', 'N', 'D', '_', 'B', ' ', ' ', // B - 'B', 'A', 'N', 'D', '_', 'E', ' ', ' ', // E - 'F', 'A', 'T', 'S', 'H', 'A', 'R', 'K', // F - 'R', 'A', 'C', 'E', ' ', ' ', ' ', ' ', // R - 'R', 'A', 'C', 'E', '_', 'L', 'O', 'W', // L - 'W', 'L', 'A', 'N', 'C', 'H', 'A', 'N', // WLAN + 'B', 'A', 'N', 'D', '_', 'A', ' ', ' ', // A + 'B', 'A', 'N', 'D', '_', 'B', ' ', ' ', // B + 'B', 'A', 'N', 'D', '_', 'E', ' ', ' ', // E + 'F', 'A', 'T', 'S', 'H', 'A', 'R', 'K', // F + 'R', 'A', 'C', 'E', ' ', ' ', ' ', ' ', // R + 'R', 'A', 'C', 'E', '_', 'L', 'O', 'W', // L + 'W', 'L', 'A', 'N', 'C', 'H', 'A', 'N', // WLAN }; uint8_t bandLetter[BAND_COUNT] = {'A', 'B', 'E', 'F', 'R', 'L', 'W'}; uint16_t channelFreqTable[FREQ_TABLE_SIZE] = { - 5865, 5845, 5825, 5805, 5785, 5765, 5745, 5725, // A - 5733, 5752, 5771, 5790, 5809, 5828, 5847, 5866, // B - 5705, 5685, 5665, 5645, 5885, 5905, 5925, 5945, // E - 5740, 5760, 5780, 5800, 5820, 5840, 5860, 5880, // F - 5658, 5695, 5732, 5769, 5806, 5843, 5880, 5917, // R - 5362, 5399, 5436, 5473, 5510, 5547, 5584, 5621, // LowRace - 5660, 5700, 5720, 5765, 5805, 5845, 5885, 5925 // WLAN CHANNEL: 132, 140, 144, 153, 161, 169, 177, 185 + 5865, 5845, 5825, 5805, 5785, 5765, 5745, 5725, // A + 5733, 5752, 5771, 5790, 5809, 5828, 5847, 5866, // B + 5705, 5685, 5665, 5645, 5885, 5905, 5925, 5945, // E + 5740, 5760, 5780, 5800, 5820, 5840, 5860, 5880, // F + 5658, 5695, 5732, 5769, 5806, 5843, 5880, 5917, // R + 5362, 5399, 5436, 5473, 5510, 5547, 5584, 5621, // LowRace + 5660, 5700, 5720, 5765, 5805, 5845, 5885, + 5925 // WLAN CHANNEL: 132, 140, 144, 153, 161, 169, 177, 185 }; -uint8_t saPowerLevelsLut[NUM_POWER_LEVELS] = { 20, 25, 30, 35, 45, 50, 55, 58 }; +uint8_t saPowerLevelsLut[NUM_POWER_LEVELS] = {20, 25, 30, 35, 45, 50, 55, 58}; -uint8_t saPowerLevelsLabel[NUM_POWER_LEVELS * POWER_LEVEL_LABEL_LENGTH] = { '2', '0', ' ', - '2', '5', ' ', - '3', '0', ' ', - '3', '5', ' ', - '4', '5', ' ', - '5', '0', ' ', - '5', '5', ' ', - '5', '8', ' '}; +uint8_t saPowerLevelsLabel[NUM_POWER_LEVELS * POWER_LEVEL_LABEL_LENGTH] = {'2', '0', ' ', '2', '5', + ' ', '3', '0', ' ', '3', '5', ' ', '4', '5', ' ', '5', '0', ' ', '5', '5', ' ', '5', '8', ' '}; int frequency = 0; uint16_t msp_data_from_msg(uint8_t message_buffer[], msp_msg_t *msg) { - // return size - construct_msp_command(message_buffer, msg->cmd, msg->payload, msg->size, msg->direction); - return msg->size + 6; + // return size + construct_msp_command(message_buffer, msg->cmd, msg->payload, msg->size, msg->direction); + return msg->size + 6; } -void wipeVtxTable(int serial_fd,int band, int channel) { - - // lets first wipe all - uint8_t payload[15]; - payload[0] = 0; // idx LSB - payload[1] = 0; // idx MSB - payload[2] = 0; // power - payload[3] = 0; // pitmode - payload[4] = 0; // lowPowerDisarm - payload[5] = 0; // pitModeFreq LSB - payload[6] = 0; // pitModeFreq MSB - payload[7] = 0; // newBand - WLAN Channel - payload[8] = 0; // newChannel - 161 - payload[9] = 0; // newFreq LSB - payload[10] = 0; // newFreq MSB - payload[11] = 0; // newBandCount - payload[12] = 0; // newChannelCount - payload[13] = 0; // newPowerCount - payload[14] = 1; // vtxtable should be cleared - - uint8_t buffer[256]; - - construct_msp_command(buffer, MSP_SET_VTX_CONFIG, payload, sizeof(payload), MSP_OUTBOUND); - write(serial_fd, &buffer, sizeof(buffer)); - - //now prepare the table - payload[0] = 0; // idx LSB - payload[1] = 0; // idx MSB - payload[2] = 7; // 55, default wfb-ng - payload[3] = 0; // pitmode - payload[4] = 0; // lowPowerDisarm - payload[5] = 0; // pitModeFreq LSB - payload[6] = 0; // pitModeFreq MSB - payload[7] = band; // newBand - WLAN Channel - payload[8] = channel; // newChannel - 161 - payload[9] = 0; // newFreq LSB - payload[10] = 0; // newFreq MSB - payload[11] = BAND_COUNT; // newBandCount - payload[12] = CHANNEL_COUNT; // newChannelCount - payload[13] = NUM_POWER_LEVELS; // newPowerCount - payload[14] = 0; // vtxtable should be cleared - - construct_msp_command(buffer, MSP_SET_VTX_CONFIG, payload, sizeof(payload), MSP_OUTBOUND); - write(serial_fd, &buffer, sizeof(buffer)); +void wipeVtxTable(int serial_fd, int band, int channel) { + + // lets first wipe all + uint8_t payload[15]; + payload[0] = 0; // idx LSB + payload[1] = 0; // idx MSB + payload[2] = 0; // power + payload[3] = 0; // pitmode + payload[4] = 0; // lowPowerDisarm + payload[5] = 0; // pitModeFreq LSB + payload[6] = 0; // pitModeFreq MSB + payload[7] = 0; // newBand - WLAN Channel + payload[8] = 0; // newChannel - 161 + payload[9] = 0; // newFreq LSB + payload[10] = 0; // newFreq MSB + payload[11] = 0; // newBandCount + payload[12] = 0; // newChannelCount + payload[13] = 0; // newPowerCount + payload[14] = 1; // vtxtable should be cleared + + uint8_t buffer[256]; + + construct_msp_command(buffer, MSP_SET_VTX_CONFIG, payload, sizeof(payload), MSP_OUTBOUND); + write(serial_fd, &buffer, sizeof(buffer)); + + // now prepare the table + payload[0] = 0; // idx LSB + payload[1] = 0; // idx MSB + payload[2] = 7; // 55, default wfb-ng + payload[3] = 0; // pitmode + payload[4] = 0; // lowPowerDisarm + payload[5] = 0; // pitModeFreq LSB + payload[6] = 0; // pitModeFreq MSB + payload[7] = band; // newBand - WLAN Channel + payload[8] = channel; // newChannel - 161 + payload[9] = 0; // newFreq LSB + payload[10] = 0; // newFreq MSB + payload[11] = BAND_COUNT; // newBandCount + payload[12] = CHANNEL_COUNT; // newChannelCount + payload[13] = NUM_POWER_LEVELS; // newPowerCount + payload[14] = 0; // vtxtable should be cleared + + construct_msp_command(buffer, MSP_SET_VTX_CONFIG, payload, sizeof(payload), MSP_OUTBOUND); + write(serial_fd, &buffer, sizeof(buffer)); } void setVtxTableBand(int serial_fd, uint8_t band) { - //see: OpenVTX + // see: OpenVTX - uint8_t buffer[256]; - uint8_t payload2[29]; + uint8_t buffer[256]; + uint8_t payload2[29]; - payload2[0] = band; // band - payload2[1] = BAND_NAME_LENGTH; // BAND_NAME_LENGTH + payload2[0] = band; // band + payload2[1] = BAND_NAME_LENGTH; // BAND_NAME_LENGTH - for (uint8_t i = 0; i < BAND_NAME_LENGTH; i++) - { - payload2[2 + i] = channelFreqLabel[(band - 1) * BAND_NAME_LENGTH + i]; - } - - payload2[2+BAND_NAME_LENGTH] = bandLetter[band - 1]; - payload2[3+BAND_NAME_LENGTH] = IS_FACTORY_BAND; - payload2[4+BAND_NAME_LENGTH] = CHANNEL_COUNT; + for (uint8_t i = 0; i < BAND_NAME_LENGTH; i++) { + payload2[2 + i] = channelFreqLabel[(band - 1) * BAND_NAME_LENGTH + i]; + } - int i; - for(i = 0; i < CHANNEL_COUNT; i++) - { - payload2[(5+BAND_NAME_LENGTH) + (i * 2)] = channelFreqTable[((band-1) * CHANNEL_COUNT) + i] & 0xFF; - payload2[(6+BAND_NAME_LENGTH) + (i * 2)] = (channelFreqTable[((band-1) * CHANNEL_COUNT) + i] >> 8) & 0xFF; - } + payload2[2 + BAND_NAME_LENGTH] = bandLetter[band - 1]; + payload2[3 + BAND_NAME_LENGTH] = IS_FACTORY_BAND; + payload2[4 + BAND_NAME_LENGTH] = CHANNEL_COUNT; + int i; + for (i = 0; i < CHANNEL_COUNT; i++) { + payload2[(5 + BAND_NAME_LENGTH) + (i * 2)] = + channelFreqTable[((band - 1) * CHANNEL_COUNT) + i] & 0xFF; + payload2[(6 + BAND_NAME_LENGTH) + (i * 2)] = + (channelFreqTable[((band - 1) * CHANNEL_COUNT) + i] >> 8) & 0xFF; + } - construct_msp_command(buffer, MSP_SET_VTXTABLE_BAND, payload2, sizeof(payload2), MSP_OUTBOUND); - write(serial_fd, &buffer, sizeof(buffer)); + construct_msp_command(buffer, MSP_SET_VTXTABLE_BAND, payload2, sizeof(payload2), MSP_OUTBOUND); + write(serial_fd, &buffer, sizeof(buffer)); } void setVtxTablePowerLevel(int serial_fd, uint8_t idx) { - //see: OpenVTX - - uint8_t buffer[256]; - uint8_t payload2[7]; + // see: OpenVTX - payload2[0] = idx; - payload2[1] = saPowerLevelsLut[idx - 1] & 0xFF; // powerValue LSB - payload2[2] = (saPowerLevelsLut[idx - 1] >> 8) & 0xFF; // powerValue MSB - payload2[3] = POWER_LEVEL_LABEL_LENGTH; - payload2[4] = saPowerLevelsLabel[((idx - 1) * POWER_LEVEL_LABEL_LENGTH) + 0]; - payload2[5] = saPowerLevelsLabel[((idx - 1) * POWER_LEVEL_LABEL_LENGTH) + 1]; - payload2[6] = saPowerLevelsLabel[((idx - 1) * POWER_LEVEL_LABEL_LENGTH) + 2]; + uint8_t buffer[256]; + uint8_t payload2[7]; + payload2[0] = idx; + payload2[1] = saPowerLevelsLut[idx - 1] & 0xFF; // powerValue LSB + payload2[2] = (saPowerLevelsLut[idx - 1] >> 8) & 0xFF; // powerValue MSB + payload2[3] = POWER_LEVEL_LABEL_LENGTH; + payload2[4] = saPowerLevelsLabel[((idx - 1) * POWER_LEVEL_LABEL_LENGTH) + 0]; + payload2[5] = saPowerLevelsLabel[((idx - 1) * POWER_LEVEL_LABEL_LENGTH) + 1]; + payload2[6] = saPowerLevelsLabel[((idx - 1) * POWER_LEVEL_LABEL_LENGTH) + 2]; - construct_msp_command(buffer, MSP_SET_VTXTABLE_POWERLEVEL, payload2, sizeof(payload2), MSP_OUTBOUND); - write(serial_fd, &buffer, sizeof(buffer)); + construct_msp_command( + buffer, MSP_SET_VTXTABLE_POWERLEVEL, payload2, sizeof(payload2), MSP_OUTBOUND); + write(serial_fd, &buffer, sizeof(buffer)); } void msp_set_vtx_config(int serial_fd) { - //mspVTX read current frequency setting - query_interface_for_available_frequencies(); - - frequency = read_current_freq_from_interface(read_setting("/etc/wfb.conf","wlan")); - - int band=6; - int channel=3; - for (int index =0 ; index < FREQ_TABLE_SIZE; index++){ - if (channelFreqTable[index] == frequency) { - // Determine band and channel using division and modulo - band = index / 8 + 1; // Which band (integer division) - channel = (index % 8) + 1; // Channel within the band (modulo) - - if (verbose) printf("Frequency %d found in band %i, channel %d\n", frequency, band, channel); - break; // Exit after finding the frequency - } - } - - wipeVtxTable(serial_fd,band,channel); - - for (int i = 1 ; i <= BAND_COUNT; i++) { - setVtxTableBand(serial_fd,i); - } - for (int i = 1 ; i <= NUM_POWER_LEVELS; i++) { - setVtxTablePowerLevel(serial_fd,i); - } - vtxInitDone = true; + // mspVTX read current frequency setting + query_interface_for_available_frequencies(); + + frequency = read_current_freq_from_interface(read_setting("/etc/wfb.conf", "wlan")); + + int band = 6; + int channel = 3; + for (int index = 0; index < FREQ_TABLE_SIZE; index++) { + if (channelFreqTable[index] == frequency) { + // Determine band and channel using division and modulo + band = index / 8 + 1; // Which band (integer division) + channel = (index % 8) + 1; // Channel within the band (modulo) + + if (verbose) + printf("Frequency %d found in band %i, channel %d\n", frequency, band, channel); + break; // Exit after finding the frequency + } + } + + wipeVtxTable(serial_fd, band, channel); + + for (int i = 1; i <= BAND_COUNT; i++) { + setVtxTableBand(serial_fd, i); + } + for (int i = 1; i <= NUM_POWER_LEVELS; i++) { + setVtxTablePowerLevel(serial_fd, i); + } + vtxInitDone = true; } -msp_error_e construct_msp_command(uint8_t message_buffer[], uint8_t command, uint8_t payload[], uint8_t size, msp_direction_e direction) { - uint8_t checksum; - message_buffer[0] = '$'; // Header - message_buffer[1] = 'M'; // MSP V1 - if (direction == MSP_OUTBOUND) { - message_buffer[2] = '<'; - } else { - message_buffer[2] = '>'; - } - message_buffer[3] = size; // Payload Size - checksum = size; - message_buffer[4] = command; // Command - checksum ^= command; - for(uint8_t i = 0; i < size; i++) { - message_buffer[5 + i] = payload[i]; - checksum ^= message_buffer[5 + i]; - } - message_buffer[5 + size] = checksum; - return 0; +msp_error_e construct_msp_command(uint8_t message_buffer[], uint8_t command, uint8_t payload[], + uint8_t size, msp_direction_e direction) { + uint8_t checksum; + message_buffer[0] = '$'; // Header + message_buffer[1] = 'M'; // MSP V1 + if (direction == MSP_OUTBOUND) { + message_buffer[2] = '<'; + } else { + message_buffer[2] = '>'; + } + message_buffer[3] = size; // Payload Size + checksum = size; + message_buffer[4] = command; // Command + checksum ^= command; + for (uint8_t i = 0; i < size; i++) { + message_buffer[5 + i] = payload[i]; + checksum ^= message_buffer[5 + i]; + } + message_buffer[5 + size] = checksum; + return 0; } -msp_error_e msp_process_data(msp_state_t *msp_state, uint8_t dat) -{ - switch (msp_state->state) - { - default: - case MSP_IDLE: // look for begin - if (dat == '$') - { - msp_state->state = MSP_VERSION; - } - else - { - return MSP_ERR_HDR; - } - break; - case MSP_VERSION: // Look for 'M' (MSP V1, we do not support V2 at this time) - if (dat == 'M') - { - msp_state->state = MSP_DIRECTION; - } - else - { // Got garbage instead, try again - msp_state->state = MSP_IDLE; - return MSP_ERR_HDR; - } - break; - case MSP_DIRECTION: // < for command, > for reply - msp_state->state = MSP_SIZE; - switch (dat) - { - case '<': - msp_state->message.direction = MSP_OUTBOUND; - break; - case '>': - msp_state->message.direction = MSP_INBOUND; - break; - default: // garbage, try again - msp_state->state = MSP_IDLE; - return MSP_ERR_HDR; - break; - } - break; - case MSP_SIZE: // next up is supposed to be size - msp_state->message.checksum = dat; - msp_state->message.size = dat; - msp_state->state = MSP_CMD; - if (msp_state->message.size > 256) - { // bogus message, too big. this can't actually happen but good to check - msp_state->state = MSP_IDLE; - return MSP_ERR_LEN; - break; - } - break; - case MSP_CMD: // followed by command - msp_state->message.cmd = dat; - msp_state->message.checksum ^= dat; - msp_state->buf_ptr = 0; - if (msp_state->message.size > 0) - { - msp_state->state = MSP_PAYLOAD; - } - else - { - msp_state->state = MSP_CHECKSUM; - } - break; - case MSP_PAYLOAD: // if we had a payload, keep going - msp_state->message.payload[msp_state->buf_ptr] = dat; - msp_state->message.checksum ^= dat; - msp_state->buf_ptr++; - if (msp_state->buf_ptr == msp_state->message.size) - { - msp_state->buf_ptr = 0; - msp_state->state = MSP_CHECKSUM; - } - break; - case MSP_CHECKSUM: - if (msp_state->message.checksum == dat) - { - // printf("MSP: %s\n", msp_state->message.payload); - if (msp_state->cb != 0){ - msp_state->cb(&msp_state->message); - } - memset(&msp_state->message, 0, sizeof(msp_msg_t)); - msp_state->state = MSP_IDLE; - break; - } - else - { - msp_state->state = MSP_IDLE; - return MSP_ERR_CKS; - } - break; - } - return MSP_ERR_NONE; +msp_error_e msp_process_data(msp_state_t *msp_state, uint8_t dat) { + switch (msp_state->state) { + default: + case MSP_IDLE: // look for begin + if (dat == '$') { + msp_state->state = MSP_VERSION; + } else { + return MSP_ERR_HDR; + } + break; + case MSP_VERSION: // Look for 'M' (MSP V1, we do not support V2 at this + // time) + if (dat == 'M') { + msp_state->state = MSP_DIRECTION; + } else { // Got garbage instead, try again + msp_state->state = MSP_IDLE; + return MSP_ERR_HDR; + } + break; + case MSP_DIRECTION: // < for command, > for reply + msp_state->state = MSP_SIZE; + switch (dat) { + case '<': + msp_state->message.direction = MSP_OUTBOUND; + break; + case '>': + msp_state->message.direction = MSP_INBOUND; + break; + default: // garbage, try again + msp_state->state = MSP_IDLE; + return MSP_ERR_HDR; + break; + } + break; + case MSP_SIZE: // next up is supposed to be size + msp_state->message.checksum = dat; + msp_state->message.size = dat; + msp_state->state = MSP_CMD; + if (msp_state->message.size > 256) { // bogus message, too big. this can't + // actually happen but good to check + msp_state->state = MSP_IDLE; + return MSP_ERR_LEN; + break; + } + break; + case MSP_CMD: // followed by command + msp_state->message.cmd = dat; + msp_state->message.checksum ^= dat; + msp_state->buf_ptr = 0; + if (msp_state->message.size > 0) { + msp_state->state = MSP_PAYLOAD; + } else { + msp_state->state = MSP_CHECKSUM; + } + break; + case MSP_PAYLOAD: // if we had a payload, keep going + msp_state->message.payload[msp_state->buf_ptr] = dat; + msp_state->message.checksum ^= dat; + msp_state->buf_ptr++; + if (msp_state->buf_ptr == msp_state->message.size) { + msp_state->buf_ptr = 0; + msp_state->state = MSP_CHECKSUM; + } + break; + case MSP_CHECKSUM: + if (msp_state->message.checksum == dat) { + // printf("MSP: %s\n", msp_state->message.payload); + if (msp_state->cb != 0) { + msp_state->cb(&msp_state->message); + } + memset(&msp_state->message, 0, sizeof(msp_msg_t)); + msp_state->state = MSP_IDLE; + break; + } else { + msp_state->state = MSP_IDLE; + return MSP_ERR_CKS; + } + break; + } + return MSP_ERR_NONE; } \ No newline at end of file diff --git a/osd/msp/msp.h b/osd/msp/msp.h index ab9a279..424f8e5 100644 --- a/osd/msp/msp.h +++ b/osd/msp/msp.h @@ -10,9 +10,9 @@ #define MSP_CMD_STATUS 101 #define MSP_CMD_RC 105 -#define MSP_COMP_GPS 107 -#define MSP_ATTITUDE 108 -#define MSP_RC 105 +#define MSP_COMP_GPS 107 +#define MSP_ATTITUDE 108 +#define MSP_RC 105 #define MSP_CMD_ANALOG 110 #define MSP_CMD_RC_TUNING 111 @@ -22,64 +22,62 @@ #define MSP_CMD_DISPLAYPORT 182 #define MSP_CMD_SET_OSD_CANVAS 188 - #define MSP_GET_VTX_CONFIG 0x58 // 88 //out message #define MSP_SET_VTX_CONFIG 0x59 // 89 // in message -#define MSP_SET_VTXTABLE_BAND 227 //in message set vtxTable band/channel data (one band at a time) -#define MSP_SET_VTXTABLE_POWERLEVEL 228 //in message set vtxTable powerLevel data (one powerLevel at a time) +#define MSP_SET_VTXTABLE_BAND \ + 227 // in message set vtxTable band/channel data (one band at a + // time) +#define MSP_SET_VTXTABLE_POWERLEVEL \ + 228 // in message set vtxTable powerLevel data (one powerLevel at a + // time) -#define BAND_NAME_LENGTH 8 -#define POWER_LEVEL_LABEL_LENGTH 3 -#define NUM_POWER_LEVELS 8 // betaflight has max 8 powerlevels, will remove 40 from the default wfb-ng list +#define BAND_NAME_LENGTH 8 +#define POWER_LEVEL_LABEL_LENGTH 3 +#define NUM_POWER_LEVELS \ + 8 // betaflight has max 8 powerlevels, will remove 40 from the default + // wfb-ng list -#define CHANNEL_COUNT 8 -#define BAND_COUNT 8 -#define IS_FACTORY_BAND 0 +#define CHANNEL_COUNT 8 +#define BAND_COUNT 8 +#define IS_FACTORY_BAND 0 #define FREQ_TABLE_SIZE 64 #define FREQ_LABEL_SIZE 64 -#define MSP_REBOOT 68 //in message reboot settings +#define MSP_REBOOT 68 // in message reboot settings -typedef enum { - MSP_ERR_NONE, - MSP_ERR_HDR, - MSP_ERR_LEN, - MSP_ERR_CKS -} msp_error_e; +typedef enum { MSP_ERR_NONE, MSP_ERR_HDR, MSP_ERR_LEN, MSP_ERR_CKS } msp_error_e; typedef enum { - MSP_IDLE, - MSP_VERSION, - MSP_DIRECTION, - MSP_SIZE, - MSP_CMD, - MSP_PAYLOAD, - MSP_CHECKSUM, + MSP_IDLE, + MSP_VERSION, + MSP_DIRECTION, + MSP_SIZE, + MSP_CMD, + MSP_PAYLOAD, + MSP_CHECKSUM, } msp_state_machine_e; -typedef enum { - MSP_INBOUND, - MSP_OUTBOUND -} msp_direction_e; +typedef enum { MSP_INBOUND, MSP_OUTBOUND } msp_direction_e; typedef struct msp_msg_s { - uint8_t checksum; - uint8_t cmd; - uint8_t size; - msp_direction_e direction; - uint8_t payload[256]; + uint8_t checksum; + uint8_t cmd; + uint8_t size; + msp_direction_e direction; + uint8_t payload[256]; } msp_msg_t; typedef void (*msp_msg_callback)(msp_msg_t *); typedef struct msp_state_s { - msp_msg_callback cb; - msp_state_machine_e state; - uint8_t buf_ptr; - msp_msg_t message; + msp_msg_callback cb; + msp_state_machine_e state; + uint8_t buf_ptr; + msp_msg_t message; } msp_state_t; uint16_t msp_data_from_msg(uint8_t message_buffer[], msp_msg_t *msg); -msp_error_e construct_msp_command(uint8_t message_buffer[], uint8_t command, uint8_t payload[], uint8_t size, msp_direction_e direction); +msp_error_e construct_msp_command(uint8_t message_buffer[], uint8_t command, uint8_t payload[], + uint8_t size, msp_direction_e direction); msp_error_e msp_process_data(msp_state_t *msp_state, uint8_t dat); void msp_set_vtx_config(int serial_fd); diff --git a/osd/msp/msp_displayport.c b/osd/msp/msp_displayport.c index 3fc9fff..8312018 100644 --- a/osd/msp/msp_displayport.c +++ b/osd/msp/msp_displayport.c @@ -1,15 +1,15 @@ +#include "msp_displayport.h" +#include "../../msposd.h" +#include "../util/ini_parser.h" +#include "msp.h" +#include "vtxmenu.h" +#include // For LINUX_REBOOT_CMD_RESTART +#include #include #include #include -#include -#include #include -#include // For LINUX_REBOOT_CMD_RESTART -#include "msp.h" -#include "msp_displayport.h" -#include "vtxmenu.h" -#include "../../msposd.h" -#include "../util/ini_parser.h" +#include MenuSystem menu_system; MenuSection *current_section; @@ -20,84 +20,87 @@ extern bool verbose; extern bool vtxMenuEnabled; static void process_draw_string(displayport_vtable_t *display_driver, uint8_t *payload) { - if(!display_driver || !display_driver->draw_character) return; - uint8_t row = payload[0]; - uint8_t col = payload[1]; - uint8_t attrs = payload[2]; // INAV and Betaflight use this to specify a higher page number. - uint8_t str_len; - for(str_len = 1; str_len < 255; str_len++) { - if(payload[2 + str_len] == '\0') { - break; - } - } - for(uint8_t idx = 0; idx < (str_len - 1); idx++) { - uint16_t character = payload[3 + idx]; - if(attrs & 0x3) { - // shift over by the page number if they were specified - character |= ((attrs & 0x3) * 0x100); - } - display_driver->draw_character(col, row, character); - col++; - } + if (!display_driver || !display_driver->draw_character) + return; + uint8_t row = payload[0]; + uint8_t col = payload[1]; + uint8_t attrs = payload[2]; // INAV and Betaflight use this to specify a + // higher page number. + uint8_t str_len; + for (str_len = 1; str_len < 255; str_len++) { + if (payload[2 + str_len] == '\0') { + break; + } + } + for (uint8_t idx = 0; idx < (str_len - 1); idx++) { + uint16_t character = payload[3 + idx]; + if (attrs & 0x3) { + // shift over by the page number if they were specified + character |= ((attrs & 0x3) * 0x100); + } + display_driver->draw_character(col, row, character); + col++; + } } static void process_clear_screen(displayport_vtable_t *display_driver) { - if(!display_driver || !display_driver->clear_screen) return; - display_driver->clear_screen(); + if (!display_driver || !display_driver->clear_screen) + return; + display_driver->clear_screen(); } static void process_draw_complete(displayport_vtable_t *display_driver) { - - if(!display_driver || !display_driver->draw_complete) return; - display_driver->draw_complete(); + + if (!display_driver || !display_driver->draw_complete) + return; + display_driver->draw_complete(); } static void process_set_options(displayport_vtable_t *display_driver, uint8_t *payload) { - if(!display_driver || !display_driver->set_options) return; - uint8_t font = payload[0]; - msp_hd_options_e is_hd = payload[1]; - display_driver->set_options(font, is_hd); + if (!display_driver || !display_driver->set_options) + return; + uint8_t font = payload[0]; + msp_hd_options_e is_hd = payload[1]; + display_driver->set_options(font, is_hd); } -static void process_open(displayport_vtable_t *display_driver) { - -} +static void process_open(displayport_vtable_t *display_driver) {} static void process_close(displayport_vtable_t *display_driver) { - process_clear_screen(display_driver); + process_clear_screen(display_driver); } int displayport_process_message(displayport_vtable_t *display_driver, msp_msg_t *msg) { - if (msg->direction != MSP_INBOUND) { - return 1; - } - if (msg->cmd != MSP_CMD_DISPLAYPORT) { - return 1; - } - msp_displayport_cmd_e sub_cmd = msg->payload[0]; - switch(sub_cmd) { - case MSP_DISPLAYPORT_KEEPALIVE: // 0 -> Open/Keep-Alive DisplayPort - process_open(display_driver); - break; - case MSP_DISPLAYPORT_CLOSE: // 1 -> Close DisplayPort - process_close(display_driver); - break; - case MSP_DISPLAYPORT_CLEAR: // 2 -> Clear Screen - process_clear_screen(display_driver); - break; - case MSP_DISPLAYPORT_DRAW_STRING: // 3 -> Draw String - process_draw_string(display_driver, &msg->payload[1]); - break; - case MSP_DISPLAYPORT_DRAW_SCREEN: // 4 -> Draw Screen - process_draw_complete(display_driver); - break; - case MSP_DISPLAYPORT_SET_OPTIONS: // 5 -> Set Options (HDZero/iNav) - process_set_options(display_driver, &msg->payload[1]); - break; - default: - break; - } - return 0; + if (msg->direction != MSP_INBOUND) { + return 1; + } + if (msg->cmd != MSP_CMD_DISPLAYPORT) { + return 1; + } + msp_displayport_cmd_e sub_cmd = msg->payload[0]; + switch (sub_cmd) { + case MSP_DISPLAYPORT_KEEPALIVE: // 0 -> Open/Keep-Alive DisplayPort + process_open(display_driver); + break; + case MSP_DISPLAYPORT_CLOSE: // 1 -> Close DisplayPort + process_close(display_driver); + break; + case MSP_DISPLAYPORT_CLEAR: // 2 -> Clear Screen + process_clear_screen(display_driver); + break; + case MSP_DISPLAYPORT_DRAW_STRING: // 3 -> Draw String + process_draw_string(display_driver, &msg->payload[1]); + break; + case MSP_DISPLAYPORT_DRAW_SCREEN: // 4 -> Draw Screen + process_draw_complete(display_driver); + break; + case MSP_DISPLAYPORT_SET_OPTIONS: // 5 -> Set Options (HDZero/iNav) + process_set_options(display_driver, &msg->payload[1]); + break; + default: + break; + } + return 0; } // VTX CAM Menu @@ -107,208 +110,201 @@ extern uint64_t lastStatusScreen; // Default path To test on x86 #ifndef CONFIG_PATH - #ifdef _x86 - #define CONFIG_PATH "./vtxmenu.ini" - #else - #define CONFIG_PATH "/etc/vtxmenu.ini" - #endif +#ifdef _x86 +#define CONFIG_PATH "./vtxmenu.ini" +#else +#define CONFIG_PATH "/etc/vtxmenu.ini" +#endif #endif bool init_state_manager() { - if (parse_ini(CONFIG_PATH, &menu_system)) { - printf("Failed to load menu config /etc/vtxmenu.ini\n"); - return false; - } else { - current_section = &menu_system.sections[current_section_index]; - if (verbose) - print_menu_system_state(&menu_system); - return true; - } - lastStatusScreen = get_current_time_ms(); + if (parse_ini(CONFIG_PATH, &menu_system)) { + printf("Failed to load menu config /etc/vtxmenu.ini\n"); + return false; + } else { + current_section = &menu_system.sections[current_section_index]; + if (verbose) + print_menu_system_state(&menu_system); + return true; + } + lastStatusScreen = get_current_time_ms(); } void print_current_state(displayport_vtable_t *display_driver) { - if (newMenu) { - display_driver->clear_screen(); - newMenu=false; - } - display_menu(display_driver, current_section, selected_option); + if (newMenu) { + display_driver->clear_screen(); + newMenu = false; + } + display_menu(display_driver, current_section, selected_option); } -//Stick command handleing -//stolen from hdzero +// Stick command handleing +// stolen from hdzero -#define IS_HI(x) ((x) > 1750) -#define IS_LO(x) ((x) < 1250) +#define IS_HI(x) ((x) > 1750) +#define IS_LO(x) ((x) < 1250) #define IS_MID(x) ((!IS_HI(x)) && (!IS_LO(x))) - // Enum for menu commands -typedef enum { - RIGHT, - EXIT, - UP, - DOWN, - LEFT, - ENTER, - VTXMENU, - SAFEBOOT, - NONE -} stickcommands; +typedef enum { RIGHT, EXIT, UP, DOWN, LEFT, ENTER, VTXMENU, SAFEBOOT, NONE } stickcommands; int last_command = NONE; extern bool vtxMenuActive; extern bool showStatusScreen; - void handle_stickcommands(uint16_t channels[18]) { - uint8_t IS_HI_yaw = IS_HI(channels[2]); - uint8_t IS_LO_yaw = IS_LO(channels[2]); - uint8_t IS_MID_yaw = IS_MID(channels[2]); - - uint8_t IS_HI_throttle = IS_HI(channels[3]); - uint8_t IS_LO_throttle = IS_LO(channels[3]); - uint8_t IS_MID_throttle = IS_MID(channels[3]); - - uint8_t IS_HI_pitch = IS_HI(channels[1]); - uint8_t IS_LO_pitch = IS_LO(channels[1]); - uint8_t IS_MID_pitch = IS_MID(channels[1]); - - uint8_t IS_HI_roll = IS_HI(channels[0]); - uint8_t IS_LO_roll = IS_LO(channels[0]); - uint8_t IS_MID_roll = IS_MID(channels[0]); - - int command = last_command; - - if (IS_HI_yaw && IS_MID_roll && IS_MID_pitch && IS_MID_throttle) - command=ENTER; - else if (IS_LO_yaw && IS_MID_roll && IS_MID_pitch) - command=EXIT; - else if (IS_MID_yaw && IS_MID_roll && IS_HI_pitch && !IS_HI_throttle) - command=UP; - else if (IS_MID_yaw && IS_MID_roll && IS_LO_pitch && !IS_HI_throttle) - command=DOWN; - else if (IS_MID_yaw && IS_LO_roll && IS_MID_pitch && !IS_HI_throttle) - command=LEFT; - else if (IS_MID_yaw && IS_HI_roll && IS_MID_pitch && !IS_HI_throttle) - command=RIGHT; - else if (IS_HI_yaw && IS_LO_throttle && IS_LO_roll && IS_LO_pitch) - command=VTXMENU; - else if (IS_HI_yaw && IS_HI_throttle && IS_LO_roll && IS_HI_pitch) - command=SAFEBOOT; - else - command=NONE; - - if (command != last_command) { - - if ( !vtxMenuActive) { - switch (command) { - case VTXMENU: - if (verbose) printf("Entering vtxMenu\n"); - newMenu = true; - vtxMenuEnabled = init_state_manager(); - if (vtxMenuEnabled) - vtxMenuActive = true; - break; - case SAFEBOOT: - safeboot(); - } - last_command=command; - } else { - switch (command) { - case UP: - selected_option = (selected_option - 1 + current_section->option_count) % current_section->option_count; - break; - case DOWN: - selected_option = (selected_option + 1) % current_section->option_count; - break; - case LEFT: { - MenuOption *option = ¤t_section->options[selected_option]; - - // Handle list value cycling backward - switch (option->type) { - case MENU_OPTION_LIST: { - char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; - int value_count; - split_values(option->values, value_list, &value_count); - current_section->current_value_index[selected_option] = (current_section->current_value_index[selected_option] - 1 + value_count) % value_count; - break; - } - case MENU_OPTION_RANGE: - case MENU_OPTION_FLOATRANGE: { - // Decrement within range - if (current_section->current_value_index[selected_option] > option->min) { - current_section->current_value_index[selected_option]--; - } - break; - } - default: - break; - } - break; - } - case RIGHT: { - MenuOption *option = ¤t_section->options[selected_option]; - - // Handle list value cycling (forward) - switch (option->type) { - case MENU_OPTION_LIST: { - char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; - int value_count; - split_values(option->values, value_list, &value_count); - // cycle through list - current_section->current_value_index[selected_option] = (current_section->current_value_index[selected_option] + 1) % value_count; - break; - } - case MENU_OPTION_RANGE: - case MENU_OPTION_FLOATRANGE: { - // Increment within range - if (current_section->current_value_index[selected_option] < option->max) { - current_section->current_value_index[selected_option]++; - } - break; - } - case MENU_OPTION_SUBMENU: { - // Handle submenu navigation - clear_vtx_menu(); - for (int i = 0; i < menu_system.section_count; i++) { - if (strcmp(menu_system.sections[i].name, option->lable) == 0) { - current_section_index = i; - current_section = &menu_system.sections[current_section_index]; - selected_option = 0; // Reset the option selection - break; - } - } - break; - } - case MENU_OPTION_COMMAND: { - // Execute the command function - if (option->command_function) { - option->command_function(current_section); - } - showStatusScreen=true; - lastStatusScreen=abs(get_current_time_ms()); - break; - } - default: - break; - } - break; - } - case ENTER: - //handle_selection(); - break; - case EXIT: - if (verbose) printf("Exit vtxMenu\n"); - newMenu = true; - vtxMenuActive = false; - clear_vtx_menu(); - break; - } - last_command=command; - } - } - + uint8_t IS_HI_yaw = IS_HI(channels[2]); + uint8_t IS_LO_yaw = IS_LO(channels[2]); + uint8_t IS_MID_yaw = IS_MID(channels[2]); + + uint8_t IS_HI_throttle = IS_HI(channels[3]); + uint8_t IS_LO_throttle = IS_LO(channels[3]); + uint8_t IS_MID_throttle = IS_MID(channels[3]); + + uint8_t IS_HI_pitch = IS_HI(channels[1]); + uint8_t IS_LO_pitch = IS_LO(channels[1]); + uint8_t IS_MID_pitch = IS_MID(channels[1]); + + uint8_t IS_HI_roll = IS_HI(channels[0]); + uint8_t IS_LO_roll = IS_LO(channels[0]); + uint8_t IS_MID_roll = IS_MID(channels[0]); + + int command = last_command; + + if (IS_HI_yaw && IS_MID_roll && IS_MID_pitch && IS_MID_throttle) + command = ENTER; + else if (IS_LO_yaw && IS_MID_roll && IS_MID_pitch) + command = EXIT; + else if (IS_MID_yaw && IS_MID_roll && IS_HI_pitch && !IS_HI_throttle) + command = UP; + else if (IS_MID_yaw && IS_MID_roll && IS_LO_pitch && !IS_HI_throttle) + command = DOWN; + else if (IS_MID_yaw && IS_LO_roll && IS_MID_pitch && !IS_HI_throttle) + command = LEFT; + else if (IS_MID_yaw && IS_HI_roll && IS_MID_pitch && !IS_HI_throttle) + command = RIGHT; + else if (IS_HI_yaw && IS_LO_throttle && IS_LO_roll && IS_LO_pitch) + command = VTXMENU; + else if (IS_HI_yaw && IS_HI_throttle && IS_LO_roll && IS_HI_pitch) + command = SAFEBOOT; + else + command = NONE; + + if (command != last_command) { + + if (!vtxMenuActive) { + switch (command) { + case VTXMENU: + if (verbose) + printf("Entering vtxMenu\n"); + newMenu = true; + vtxMenuEnabled = init_state_manager(); + if (vtxMenuEnabled) + vtxMenuActive = true; + break; + case SAFEBOOT: + safeboot(); + } + last_command = command; + } else { + switch (command) { + case UP: + selected_option = (selected_option - 1 + current_section->option_count) % + current_section->option_count; + break; + case DOWN: + selected_option = (selected_option + 1) % current_section->option_count; + break; + case LEFT: { + MenuOption *option = ¤t_section->options[selected_option]; + + // Handle list value cycling backward + switch (option->type) { + case MENU_OPTION_LIST: { + char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; + int value_count; + split_values(option->values, value_list, &value_count); + current_section->current_value_index[selected_option] = + (current_section->current_value_index[selected_option] - 1 + value_count) % + value_count; + break; + } + case MENU_OPTION_RANGE: + case MENU_OPTION_FLOATRANGE: { + // Decrement within range + if (current_section->current_value_index[selected_option] > option->min) { + current_section->current_value_index[selected_option]--; + } + break; + } + default: + break; + } + break; + } + case RIGHT: { + MenuOption *option = ¤t_section->options[selected_option]; + + // Handle list value cycling (forward) + switch (option->type) { + case MENU_OPTION_LIST: { + char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; + int value_count; + split_values(option->values, value_list, &value_count); + // cycle through list + current_section->current_value_index[selected_option] = + (current_section->current_value_index[selected_option] + 1) % value_count; + break; + } + case MENU_OPTION_RANGE: + case MENU_OPTION_FLOATRANGE: { + // Increment within range + if (current_section->current_value_index[selected_option] < option->max) { + current_section->current_value_index[selected_option]++; + } + break; + } + case MENU_OPTION_SUBMENU: { + // Handle submenu navigation + clear_vtx_menu(); + for (int i = 0; i < menu_system.section_count; i++) { + if (strcmp(menu_system.sections[i].name, option->lable) == 0) { + current_section_index = i; + current_section = &menu_system.sections[current_section_index]; + selected_option = 0; // Reset the option selection + break; + } + } + break; + } + case MENU_OPTION_COMMAND: { + // Execute the command function + if (option->command_function) { + option->command_function(current_section); + } + showStatusScreen = true; + lastStatusScreen = abs(get_current_time_ms()); + break; + } + default: + break; + } + break; + } + case ENTER: + // handle_selection(); + break; + case EXIT: + if (verbose) + printf("Exit vtxMenu\n"); + newMenu = true; + vtxMenuActive = false; + clear_vtx_menu(); + break; + } + last_command = command; + } + } } diff --git a/osd/msp/msp_displayport.h b/osd/msp/msp_displayport.h index 20d3ab5..5939916 100644 --- a/osd/msp/msp_displayport.h +++ b/osd/msp/msp_displayport.h @@ -1,24 +1,24 @@ #pragma once -#include -#include #include "msp.h" +#include +#include typedef enum { - MSP_DISPLAYPORT_KEEPALIVE, - MSP_DISPLAYPORT_CLOSE, - MSP_DISPLAYPORT_CLEAR, - MSP_DISPLAYPORT_DRAW_STRING, - MSP_DISPLAYPORT_DRAW_SCREEN, - MSP_DISPLAYPORT_SET_OPTIONS, - MSP_DISPLAYPORT_DRAW_SYSTEM, - MSP_DISPLAYPORT_INFO_MSG//custom type added for sending status text + MSP_DISPLAYPORT_KEEPALIVE, + MSP_DISPLAYPORT_CLOSE, + MSP_DISPLAYPORT_CLEAR, + MSP_DISPLAYPORT_DRAW_STRING, + MSP_DISPLAYPORT_DRAW_SCREEN, + MSP_DISPLAYPORT_SET_OPTIONS, + MSP_DISPLAYPORT_DRAW_SYSTEM, + MSP_DISPLAYPORT_INFO_MSG // custom type added for sending status text } msp_displayport_cmd_e; typedef enum { - MSP_SD_OPTION_30_16, - MSP_HD_OPTION_50_18, - MSP_HD_OPTION_30_16, - MSP_HD_OPTION_60_22 + MSP_SD_OPTION_30_16, + MSP_HD_OPTION_50_18, + MSP_HD_OPTION_30_16, + MSP_HD_OPTION_60_22 } msp_hd_options_e; typedef void (*draw_character_func)(uint32_t x, uint32_t y, uint16_t c); @@ -27,17 +27,17 @@ typedef void (*clear_screen_func)(); typedef void (*draw_complete_func)(); typedef struct displayport_vtable_s { - draw_character_func draw_character; - clear_screen_func clear_screen; - draw_complete_func draw_complete; - set_options_func set_options; + draw_character_func draw_character; + clear_screen_func clear_screen; + draw_complete_func draw_complete; + set_options_func set_options; } displayport_vtable_t; int displayport_process_message(displayport_vtable_t *display_driver, msp_msg_t *msg); bool init_state_manager(); int get_current_selection(); -const char* get_option(int index); +const char *get_option(int index); void move_selection(int direction); void change_option(int direction); void print_current_state(displayport_vtable_t *display_driver); diff --git a/osd/msp/vtxmenu.c b/osd/msp/vtxmenu.c index c9535b7..5057c99 100644 --- a/osd/msp/vtxmenu.c +++ b/osd/msp/vtxmenu.c @@ -1,210 +1,226 @@ +#include +#include // For LINUX_REBOOT_CMD_RESTART +#include #include -#include #include #include -#include // For LINUX_REBOOT_CMD_RESTART -#include -#include #include +#include +#include "../../msposd.h" +#include "../util/ini_parser.h" #include "msp_displayport.h" #include "vtxmenu.h" -#include "../util/ini_parser.h" -#include "../../msposd.h" - bool clearNextDraw = false; bool showStatusScreen = false; uint64_t lastStatusScreen = 0; extern bool verbose; extern bool vtxMenuActive; -extern int out_sock;//to resend +extern int out_sock; // to resend extern struct sockaddr_in sin_out; extern MenuSection *current_section; extern int selected_option; -static uint8_t message_buffer[256]; -static uint8_t payload_buffer[256]; - - -void exitVTXMenu(){ - vtxMenuActive = false; +static uint8_t message_buffer[256]; +static uint8_t payload_buffer[256]; + +void exitVTXMenu() { vtxMenuActive = false; } + +void clear_vtx_menu() { clearNextDraw = true; } + +void display_menu(displayport_vtable_t *display_driver, MenuSection *section, int selected_option) { + + int menu_offset_cols = 4; + int menu_offset_row = 2; + + if (clearNextDraw) { + display_driver->clear_screen(); + clearNextDraw = false; + } + + // Draw status screen when a command was triggered + if ((get_current_time_ms() - lastStatusScreen > 1500) && showStatusScreen) { + showStatusScreen = false; + clearNextDraw = true; + } + if (showStatusScreen) { + for (int row = 0; row < OSD_HD_ROWS - menu_offset_row; row++) { + for (int col = 0; col < OSD_HD_COLS - menu_offset_cols; col++) { + display_driver->draw_character(col + menu_offset_cols, row + menu_offset_row, ' '); + } + } + + const char *status_msg = "DONE"; + int msg_len = strlen(status_msg); + int start_col = OSD_HD_COLS / 2 - msg_len / 2; + + for (int i = 0; i < msg_len; i++) { + display_driver->draw_character(start_col + i, OSD_HD_ROWS / 2, status_msg[i]); + } + display_driver->draw_complete(); + + if (out_sock > 0) { // Send status screen to the ground + // Clear the screen remotely + payload_buffer[0] = MSP_DISPLAYPORT_CLEAR; + construct_msp_command( + message_buffer, MSP_CMD_DISPLAYPORT, payload_buffer, 2, MSP_INBOUND); + sendto( + out_sock, message_buffer, 6 + 2, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); + + // Draw the "DONE" message remotely + payload_buffer[0] = MSP_DISPLAYPORT_DRAW_STRING; + payload_buffer[1] = OSD_HD_ROWS / 2; // Row for "DONE" + payload_buffer[2] = OSD_HD_COLS / 2 - msg_len / 2; // Center column + payload_buffer[3] = 0; // Reserved byte + memcpy(&payload_buffer[4], status_msg, + msg_len); // Copy the message into the payload + + construct_msp_command( + message_buffer, MSP_CMD_DISPLAYPORT, payload_buffer, 4 + msg_len, MSP_INBOUND); + sendto(out_sock, message_buffer, 6 + 4 + msg_len, 0, (struct sockaddr *)&sin_out, + sizeof(sin_out)); + + // Instruct remote display to draw the complete screen + payload_buffer[0] = MSP_DISPLAYPORT_DRAW_SCREEN; + construct_msp_command( + message_buffer, MSP_CMD_DISPLAYPORT, payload_buffer, 2, MSP_INBOUND); + sendto( + out_sock, message_buffer, 6 + 2, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); + } + return; + } + + // Create a 2D array to store the menu representation + char menu_grid[section->option_count + 1][OSD_HD_COLS - menu_offset_cols]; + + // Initialize the 2D array to empty spaces + for (int i = 0; i < section->option_count + 1; ++i) { + memset(menu_grid[i], ' ', + OSD_HD_COLS - menu_offset_cols); // Fill each row with spaces + // menu_grid[i][OSD_HD_COLS - 1] = '\0'; // Ensure null + // termination for each string row + } + + int current_row = 0; + if (verbose) + printf("\n=== %s ===\n", section->name); + snprintf(menu_grid[current_row++], OSD_HD_COLS - menu_offset_cols, "=== %s ===", section->name); + + for (int i = 0; i < section->option_count; i++) { + char row_selectd[3] = " "; + if (i == selected_option) { + snprintf(row_selectd, 3, " > "); + } else { + snprintf(row_selectd, 3, " "); + } + MenuOption *option = §ion->options[i]; + switch (option->type) { + case MENU_OPTION_LIST: { + char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; + int value_count; + split_values(option->values, value_list, &value_count); + if (verbose) + printf("%s%s: %s\n", row_selectd, option->lable, + value_list[section->current_value_index[i]]); + snprintf(menu_grid[current_row++], OSD_HD_COLS - menu_offset_cols, "%s%s: %s", + row_selectd, option->lable, value_list[section->current_value_index[i]]); + break; + } + case MENU_OPTION_RANGE: { + if (verbose) + printf("%s%s: %d\n", row_selectd, option->lable, section->current_value_index[i]); + snprintf(menu_grid[current_row++], OSD_HD_COLS - menu_offset_cols, "%s%s: %d", + row_selectd, option->lable, section->current_value_index[i]); + break; + } + case MENU_OPTION_FLOATRANGE: { + if (verbose) + printf("%s%s: %.1f\n", row_selectd, option->lable, + section->current_value_index[i] / 10.0f); + snprintf(menu_grid[current_row++], OSD_HD_COLS - menu_offset_cols, "%s%s: %.1f", + row_selectd, option->lable, section->current_value_index[i] / 10.0f); + break; + } + case MENU_OPTION_SUBMENU: { + int len = strlen(option->lable) + strlen(row_selectd); + if (verbose) + printf("%s%s%*s>\n", row_selectd, option->lable, 30 - len, ""); + snprintf(menu_grid[current_row++], OSD_HD_COLS - menu_offset_cols, "%s%s%*s>", + row_selectd, option->lable, MAX_VTX_MENU_COLS - len, ""); + break; + } + case MENU_OPTION_COMMAND: { + int len = strlen(option->lable) + strlen(row_selectd); + if (verbose) + printf("%s%s%*s>\n", row_selectd, option->lable, 30 - len, ""); + snprintf(menu_grid[current_row++], OSD_HD_COLS - menu_offset_cols, "%s%s%*s>", + row_selectd, option->lable, MAX_VTX_MENU_COLS - len, ""); + break; + } + default: + printf("\n"); + break; + } + } + + if (out_sock > 0) { // send to the ground + payload_buffer[0] = MSP_DISPLAYPORT_CLEAR; + construct_msp_command( + &message_buffer[0], MSP_CMD_DISPLAYPORT, &payload_buffer[0], 2, MSP_INBOUND); + sendto(out_sock, message_buffer, 6 + 2, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); + } + + // Draw the populated menu array on the OSD + for (int row = 0; row < section->option_count + 1; row++) { + for (int col = 0; col < OSD_HD_COLS - menu_offset_cols; col++) { + display_driver->draw_character( + col + menu_offset_cols, row + menu_offset_row, menu_grid[row][col]); + } + if (out_sock > 0) { // send the line to the ground + memcpy(&payload_buffer[4], &menu_grid[row], OSD_HD_COLS - menu_offset_cols); + payload_buffer[0] = MSP_DISPLAYPORT_DRAW_STRING; + payload_buffer[1] = row + menu_offset_row; + payload_buffer[2] = menu_offset_cols; + payload_buffer[3] = 0; + + construct_msp_command(message_buffer, MSP_CMD_DISPLAYPORT, &payload_buffer[0], + OSD_HD_COLS - menu_offset_cols + 4, MSP_INBOUND); + sendto(out_sock, message_buffer, OSD_HD_COLS - menu_offset_cols + 4 + 6, 0, + (struct sockaddr *)&sin_out, sizeof(sin_out)); + } + } + + display_driver->draw_complete(); + + if (out_sock > 0) { // send to the ground + payload_buffer[0] = MSP_DISPLAYPORT_DRAW_SCREEN; + construct_msp_command( + message_buffer, MSP_CMD_DISPLAYPORT, &payload_buffer[0], 2, MSP_INBOUND); + sendto(out_sock, message_buffer, 6 + 2, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); + } } -void clear_vtx_menu() { - clearNextDraw = true; -} -void display_menu(displayport_vtable_t *display_driver,MenuSection *section, int selected_option) { - - int menu_offset_cols = 4; - int menu_offset_row = 2; - - if (clearNextDraw) { - display_driver->clear_screen(); - clearNextDraw = false; - } - - // Draw status screen when a command was triggered - if ((get_current_time_ms() - lastStatusScreen > 1500) && showStatusScreen) { - showStatusScreen = false; - clearNextDraw = true; - } - if (showStatusScreen) { - for (int row = 0; row < OSD_HD_ROWS - menu_offset_row; row++) { - for (int col = 0; col < OSD_HD_COLS - menu_offset_cols; col++) { - display_driver->draw_character(col + menu_offset_cols, row + menu_offset_row, ' '); - } - } - - const char *status_msg = "DONE"; - int msg_len = strlen(status_msg); - int start_col = OSD_HD_COLS / 2 - msg_len / 2; - - for (int i = 0; i < msg_len; i++) { - display_driver->draw_character(start_col + i, OSD_HD_ROWS / 2, status_msg[i]); - } - display_driver->draw_complete(); - - if (out_sock > 0) { // Send status screen to the ground - // Clear the screen remotely - payload_buffer[0] = MSP_DISPLAYPORT_CLEAR; - construct_msp_command(message_buffer, MSP_CMD_DISPLAYPORT, payload_buffer, 2, MSP_INBOUND); - sendto(out_sock, message_buffer, 6 + 2, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - - // Draw the "DONE" message remotely - payload_buffer[0] = MSP_DISPLAYPORT_DRAW_STRING; - payload_buffer[1] = OSD_HD_ROWS / 2; // Row for "DONE" - payload_buffer[2] = OSD_HD_COLS / 2 - msg_len / 2; // Center column - payload_buffer[3] = 0; // Reserved byte - memcpy(&payload_buffer[4], status_msg, msg_len); // Copy the message into the payload - - construct_msp_command(message_buffer, MSP_CMD_DISPLAYPORT, payload_buffer, 4 + msg_len, MSP_INBOUND); - sendto(out_sock, message_buffer, 6 + 4 + msg_len, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - - // Instruct remote display to draw the complete screen - payload_buffer[0] = MSP_DISPLAYPORT_DRAW_SCREEN; - construct_msp_command(message_buffer, MSP_CMD_DISPLAYPORT, payload_buffer, 2, MSP_INBOUND); - sendto(out_sock, message_buffer, 6 + 2, 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - } - return; - } - - // Create a 2D array to store the menu representation - char menu_grid[section->option_count+1][OSD_HD_COLS-menu_offset_cols]; - - // Initialize the 2D array to empty spaces - for (int i = 0; i < section->option_count+1; ++i) { - memset(menu_grid[i], ' ', OSD_HD_COLS-menu_offset_cols); // Fill each row with spaces - //menu_grid[i][OSD_HD_COLS - 1] = '\0'; // Ensure null termination for each string row - } - - int current_row=0; - if (verbose) printf("\n=== %s ===\n", section->name); - snprintf(menu_grid[current_row++], OSD_HD_COLS-menu_offset_cols, "=== %s ===", section->name); - - for (int i = 0; i < section->option_count; i++) { - char row_selectd[3] = " "; - if (i == selected_option) { - snprintf(row_selectd, 3, " > "); - } - else { - snprintf(row_selectd, 3, " "); - } - MenuOption *option = §ion->options[i]; - switch (option->type) { - case MENU_OPTION_LIST: { - char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; - int value_count; - split_values(option->values, value_list, &value_count); - if (verbose) printf("%s%s: %s\n",row_selectd, option->lable, value_list[section->current_value_index[i]]); - snprintf(menu_grid[current_row++], OSD_HD_COLS-menu_offset_cols, "%s%s: %s", row_selectd,option->lable, value_list[section->current_value_index[i]]); - break; - } - case MENU_OPTION_RANGE: { - if (verbose) printf("%s%s: %d\n",row_selectd, option->lable, section->current_value_index[i]); - snprintf(menu_grid[current_row++], OSD_HD_COLS-menu_offset_cols, "%s%s: %d", row_selectd, option->lable, section->current_value_index[i]); - break; - - } - case MENU_OPTION_FLOATRANGE: { - if (verbose) printf("%s%s: %.1f\n",row_selectd, option->lable, section->current_value_index[i] / 10.0f); - snprintf(menu_grid[current_row++], OSD_HD_COLS-menu_offset_cols, "%s%s: %.1f", row_selectd, option->lable, section->current_value_index[i] / 10.0f); - break; - - } - case MENU_OPTION_SUBMENU: { - int len = strlen(option->lable) + strlen(row_selectd); - if (verbose) printf("%s%s%*s>\n", row_selectd, option->lable, 30 - len, ""); - snprintf(menu_grid[current_row++], OSD_HD_COLS-menu_offset_cols, "%s%s%*s>", row_selectd, option->lable, MAX_VTX_MENU_COLS - len,""); - break; - } - case MENU_OPTION_COMMAND: { - int len = strlen(option->lable) + strlen(row_selectd); - if (verbose) printf("%s%s%*s>\n",row_selectd, option->lable, 30 - len, ""); - snprintf(menu_grid[current_row++], OSD_HD_COLS-menu_offset_cols, "%s%s%*s>", row_selectd, option->lable, MAX_VTX_MENU_COLS - len,""); - break; - } - default: - printf("\n"); - break; - } - } - - if (out_sock>0){//send to the ground - payload_buffer[0]=MSP_DISPLAYPORT_CLEAR; - construct_msp_command(&message_buffer[0], MSP_CMD_DISPLAYPORT, &payload_buffer[0], 2, MSP_INBOUND); - sendto(out_sock, message_buffer, 6 + 2 , 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - } - - // Draw the populated menu array on the OSD - for (int row = 0; row < section->option_count+1; row++) { - for (int col = 0; col < OSD_HD_COLS-menu_offset_cols; col++) { - display_driver->draw_character(col+menu_offset_cols, row+menu_offset_row, menu_grid[row][col]); - } - if (out_sock>0){//send the line to the ground - memcpy(&payload_buffer[4],&menu_grid[row], OSD_HD_COLS-menu_offset_cols); - payload_buffer[0]=MSP_DISPLAYPORT_DRAW_STRING; - payload_buffer[1]=row+menu_offset_row; - payload_buffer[2]=menu_offset_cols; - payload_buffer[3]=0; - - construct_msp_command(message_buffer, MSP_CMD_DISPLAYPORT, &payload_buffer[0], OSD_HD_COLS-menu_offset_cols +4, MSP_INBOUND); - sendto(out_sock, message_buffer, OSD_HD_COLS-menu_offset_cols + 4 + 6 , 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - } - } - - display_driver->draw_complete(); - - if (out_sock>0){//send to the ground - payload_buffer[0]=MSP_DISPLAYPORT_DRAW_SCREEN; - construct_msp_command(message_buffer, MSP_CMD_DISPLAYPORT, &payload_buffer[0], 2, MSP_INBOUND); - sendto(out_sock, message_buffer, 6 +2 , 0, (struct sockaddr *)&sin_out, sizeof(sin_out)); - } -} - - void doreboot() { - printf("Rebooting system ...\n"); + printf("Rebooting system ...\n"); - // Sync filesystems to ensure no data loss - sync(); + // Sync filesystems to ensure no data loss + sync(); - // Call the reboot system call with the "restart" command - if (reboot(LINUX_REBOOT_CMD_RESTART) == -1) { - perror("Reboot failed"); - } + // Call the reboot system call with the "restart" command + if (reboot(LINUX_REBOOT_CMD_RESTART) == -1) { + perror("Reboot failed"); + } } - void runCustomCommand() { - printf("Running custom command: %s\n",current_section->options[selected_option].read_command); - char output[MAX_VALUE_LENGTH] = ""; - run_command(current_section->options[selected_option].read_command, output, sizeof(output)); + printf("Running custom command: %s\n", current_section->options[selected_option].read_command); + char output[MAX_VALUE_LENGTH] = ""; + run_command(current_section->options[selected_option].read_command, output, sizeof(output)); } - void safeboot() { - printf("Running safeboot command\n"); - char output[MAX_VALUE_LENGTH] = ""; - run_command("/usr/bin/safeboot.sh", output, sizeof(output)); + printf("Running safeboot command\n"); + char output[MAX_VALUE_LENGTH] = ""; + run_command("/usr/bin/safeboot.sh", output, sizeof(output)); } \ No newline at end of file diff --git a/osd/msp/vtxmenu.h b/osd/msp/vtxmenu.h index ac8349d..3022401 100644 --- a/osd/msp/vtxmenu.h +++ b/osd/msp/vtxmenu.h @@ -7,7 +7,7 @@ #define OSD_HD_ROWS 20 #define MAX_VTX_MENU_COLS 30 -void display_menu(displayport_vtable_t *display_driver,MenuSection *section, int selected_option); +void display_menu(displayport_vtable_t *display_driver, MenuSection *section, int selected_option); void clear_vtx_menu(); void doreboot(); void exitVTXMenu(); diff --git a/osd/net/data_protocol.h b/osd/net/data_protocol.h index 125121b..f32242e 100644 --- a/osd/net/data_protocol.h +++ b/osd/net/data_protocol.h @@ -1,13 +1,14 @@ #include typedef struct packet_data_s { - uint16_t tx_temperature; - uint16_t version_specifier; // Used to be bitrate! Danger! 0xFFFF means V2 (no bitrate) for now. - uint16_t tx_voltage; - char fc_variant[4]; + uint16_t tx_temperature; + uint16_t version_specifier; // Used to be bitrate! Danger! 0xFFFF means V2 + // (no bitrate) for now. + uint16_t tx_voltage; + char fc_variant[4]; } __attribute__((packed)) packet_data_t; typedef struct compressed_data_header_s { - uint16_t version; - uint16_t hd_options; + uint16_t version; + uint16_t hd_options; } __attribute__((packed)) compressed_data_header_t; \ No newline at end of file diff --git a/osd/net/network.c b/osd/net/network.c index d749c5f..abbdbe9 100644 --- a/osd/net/network.c +++ b/osd/net/network.c @@ -1,63 +1,57 @@ #include -#include -#include #include +#include #include #include +#include #include "network.h" -int connect_to_server(char *address, int port) -{ - int sockfd; - struct sockaddr_in servaddr; - - // socket create and verification - sockfd = socket(AF_INET, SOCK_DGRAM, 0); - if (sockfd == -1) - { - printf("socket failed!\n"); - return -1; - } - - memset(&servaddr, 0, sizeof(servaddr)); - - // assign IP, PORT - servaddr.sin_family = AF_INET; - servaddr.sin_addr.s_addr = inet_addr(address); - servaddr.sin_port = htons(port); - - if (connect(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr)) != 0) - { - printf("connection failed!\n"); - return -1; - } - - fcntl(sockfd, F_SETFL, O_NONBLOCK); - return sockfd; +int connect_to_server(char *address, int port) { + int sockfd; + struct sockaddr_in servaddr; + + // socket create and verification + sockfd = socket(AF_INET, SOCK_DGRAM, 0); + if (sockfd == -1) { + printf("socket failed!\n"); + return -1; + } + + memset(&servaddr, 0, sizeof(servaddr)); + + // assign IP, PORT + servaddr.sin_family = AF_INET; + servaddr.sin_addr.s_addr = inet_addr(address); + servaddr.sin_port = htons(port); + + if (connect(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr)) != 0) { + printf("connection failed!\n"); + return -1; + } + + fcntl(sockfd, F_SETFL, O_NONBLOCK); + return sockfd; } -int bind_socket(int port) -{ - struct sockaddr_in si_me; - int s; - if ((s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) - { - printf("Failed to get socket!\n"); - return -1; - } - - memset((char *)&si_me, 0, sizeof(si_me)); - - si_me.sin_family = AF_INET; - si_me.sin_port = htons(port); - si_me.sin_addr.s_addr = htonl(INADDR_ANY); - - // bind socket to port - if (bind(s, (struct sockaddr *)&si_me, sizeof(si_me)) == -1) - { - printf("Failed to get bound!\n"); - return -1; - } - return s; +int bind_socket(int port) { + struct sockaddr_in si_me; + int s; + if ((s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) { + printf("Failed to get socket!\n"); + return -1; + } + + memset((char *)&si_me, 0, sizeof(si_me)); + + si_me.sin_family = AF_INET; + si_me.sin_port = htons(port); + si_me.sin_addr.s_addr = htonl(INADDR_ANY); + + // bind socket to port + if (bind(s, (struct sockaddr *)&si_me, sizeof(si_me)) == -1) { + printf("Failed to get bound!\n"); + return -1; + } + return s; } diff --git a/osd/net/serial.c b/osd/net/serial.c index 90147f3..98ed0e7 100644 --- a/osd/net/serial.c +++ b/osd/net/serial.c @@ -1,99 +1,93 @@ -#include #include -#include -#include -#include #include +#include +#include #include #include +#include #include +#include #ifdef __APPLE__ #include #endif #include "serial.h" -int open_serial_port(const char *device, speed_t baudrate) -{ - struct termios tio; - int tty_fd; - - memset(&tio, 0, sizeof(tio)); - tio.c_iflag = 0; - tio.c_oflag = 0; - tio.c_cflag = CS8 | CREAD | CLOCAL; - tio.c_lflag = 0; - tio.c_cc[VMIN] = 1; - tio.c_cc[VTIME] = 0; - - tty_fd = open(device, O_RDWR | O_NONBLOCK); - cfsetospeed(&tio, baudrate); - cfsetispeed(&tio, baudrate); - tcsetattr(tty_fd, TCSANOW, &tio); - return tty_fd; +int open_serial_port(const char *device, speed_t baudrate) { + struct termios tio; + int tty_fd; + + memset(&tio, 0, sizeof(tio)); + tio.c_iflag = 0; + tio.c_oflag = 0; + tio.c_cflag = CS8 | CREAD | CLOCAL; + tio.c_lflag = 0; + tio.c_cc[VMIN] = 1; + tio.c_cc[VTIME] = 0; + + tty_fd = open(device, O_RDWR | O_NONBLOCK); + cfsetospeed(&tio, baudrate); + cfsetispeed(&tio, baudrate); + tcsetattr(tty_fd, TCSANOW, &tio); + return tty_fd; } -int open_pty(const char **pty_name) -{ - int app_pty; - int virtual_serial_pty; - - // openpty makes a connection between the first argument, a parent FD which acts as the "receiving" end of the virtual PTY - // and the second argument, a child FD which represents a "virtual serial port." - // using ttyname on the second argument will return a /dev which can be opened as a serial port - pid_t pid = openpty(&app_pty, &virtual_serial_pty, NULL, NULL, NULL); - - if (pid != 0) - { - printf("Could not get PTY!"); - exit(1); - return pid; - } - - (*pty_name) = ttyname(virtual_serial_pty); - struct termios orig_termios; - if (tcgetattr(app_pty, &orig_termios) < 0) - { - printf("Could not get termio for current FD"); - return -1; - } - - orig_termios.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); - orig_termios.c_oflag &= ~(OPOST); - orig_termios.c_cflag |= (CS8); - orig_termios.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG); - orig_termios.c_cc[VMIN] = 0; - orig_termios.c_cc[VTIME] = 1; - - if (tcsetattr(app_pty, TCSANOW, &orig_termios) < 0) - { - perror("Could not set termio for current FD"); - return -1; - } - - if (tcgetattr(virtual_serial_pty, &orig_termios) < 0) - { - printf("Could not get termio for current FD"); - return -1; - } - - orig_termios.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); - orig_termios.c_oflag &= ~(OPOST); - orig_termios.c_cflag |= (CS8); - orig_termios.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG); - orig_termios.c_cc[VMIN] = 0; - orig_termios.c_cc[VTIME] = 1; - - if (tcsetattr(virtual_serial_pty, TCSANOW, &orig_termios) < 0) - { - perror("Could not set termio for current FD"); - return -1; - } - fcntl(app_pty, F_SETFL, O_NONBLOCK); - return app_pty; // Return the file descriptor +int open_pty(const char **pty_name) { + int app_pty; + int virtual_serial_pty; + + // openpty makes a connection between the first argument, a parent FD which + // acts as the "receiving" end of the virtual PTY and the second argument, a + // child FD which represents a "virtual serial port." using ttyname on the + // second argument will return a /dev which can be opened as a serial port + pid_t pid = openpty(&app_pty, &virtual_serial_pty, NULL, NULL, NULL); + + if (pid != 0) { + printf("Could not get PTY!"); + exit(1); + return pid; + } + + (*pty_name) = ttyname(virtual_serial_pty); + struct termios orig_termios; + if (tcgetattr(app_pty, &orig_termios) < 0) { + printf("Could not get termio for current FD"); + return -1; + } + + orig_termios.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); + orig_termios.c_oflag &= ~(OPOST); + orig_termios.c_cflag |= (CS8); + orig_termios.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG); + orig_termios.c_cc[VMIN] = 0; + orig_termios.c_cc[VTIME] = 1; + + if (tcsetattr(app_pty, TCSANOW, &orig_termios) < 0) { + perror("Could not set termio for current FD"); + return -1; + } + + if (tcgetattr(virtual_serial_pty, &orig_termios) < 0) { + printf("Could not get termio for current FD"); + return -1; + } + + orig_termios.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); + orig_termios.c_oflag &= ~(OPOST); + orig_termios.c_cflag |= (CS8); + orig_termios.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG); + orig_termios.c_cc[VMIN] = 0; + orig_termios.c_cc[VTIME] = 1; + + if (tcsetattr(virtual_serial_pty, TCSANOW, &orig_termios) < 0) { + perror("Could not set termio for current FD"); + return -1; + } + fcntl(app_pty, F_SETFL, O_NONBLOCK); + return app_pty; // Return the file descriptor } #ifdef DEBUG_TRACE -void _trace(const char* format, ...); +void _trace(const char *format, ...); #endif #ifdef DEBUG_TRACE @@ -102,47 +96,43 @@ void _trace(const char* format, ...); #define TRACE(X) #endif /*DEBUG_TRACE*/ #ifdef __ANDROID__ -int -openpty (int *amaster, int *aslave, char *name, struct termios *termp, - struct winsize *winp) -{ - int master, slave; - char *name_slave; - - master = open("/dev/ptmx", O_RDWR | O_NONBLOCK); - if (master == -1) { - TRACE(("Fail to open master")) - return -1; - } - - if (grantpt(master)) - goto fail; - - if (unlockpt(master)) - goto fail; - - name_slave = ptsname(master); - TRACE(("openpty: slave name %s", name_slave)) - slave = open(name_slave, O_RDWR | O_NOCTTY); - if (slave == -1) - { - goto fail; - } - - if(termp) - tcsetattr(slave, TCSAFLUSH, termp); - if (winp) - ioctl (slave, TIOCSWINSZ, winp); - - *amaster = master; - *aslave = slave; - if (name != NULL) - strcpy(name, name_slave); - - return 0; - - fail: - close (master); - return -1; +int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize *winp) { + int master, slave; + char *name_slave; + + master = open("/dev/ptmx", O_RDWR | O_NONBLOCK); + if (master == -1) { + TRACE(("Fail to open master")) + return -1; + } + + if (grantpt(master)) + goto fail; + + if (unlockpt(master)) + goto fail; + + name_slave = ptsname(master); + TRACE(("openpty: slave name %s", name_slave)) + slave = open(name_slave, O_RDWR | O_NOCTTY); + if (slave == -1) { + goto fail; + } + + if (termp) + tcsetattr(slave, TCSAFLUSH, termp); + if (winp) + ioctl(slave, TIOCSWINSZ, winp); + + *amaster = master; + *aslave = slave; + if (name != NULL) + strcpy(name, name_slave); + + return 0; + +fail: + close(master); + return -1; } #endif \ No newline at end of file diff --git a/osd/net/serial.h b/osd/net/serial.h index 1df9810..9e14a70 100644 --- a/osd/net/serial.h +++ b/osd/net/serial.h @@ -5,7 +5,5 @@ int open_serial_port(const char *device, speed_t baudrate); int open_pty(const char **pty_name); #ifdef __ANDROID__ -int -openpty (int *amaster, int *aslave, char *name, struct termios *termp, - struct winsize *winp); +int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize *winp); #endif \ No newline at end of file diff --git a/osd/util/Render_gs.c b/osd/util/Render_gs.c index ea9eed8..3ae48ee 100644 --- a/osd/util/Render_gs.c +++ b/osd/util/Render_gs.c @@ -1,582 +1,594 @@ - -#include -#include +#include "../../bmp/bitmap.h" +#include #include #include -#include +#include +#include #include #include #include #include -#include "../../bmp/bitmap.h" #include #include #if defined(_x86) -Display* display=NULL; -Window window =NULL; +Display *display = NULL; +Window window; Pixmap backbuffer_pixmap; -bool forcefullscreen=true; +bool forcefullscreen = true; extern struct event_base *base; -struct event *x11_event=NULL; +struct event *x11_event = NULL; +extern int AHI_TiltY; Window RootWindow; #endif #if defined(__ROCKCHIP__) #define SHM_NAME "msposd" + // Define the shared memory region structure typedef struct { - uint16_t width; // Image width - uint16_t height; // Image height - unsigned char data[]; // Flexible array for image data + uint16_t width; // Image width + uint16_t height; // Image height + unsigned char data[]; // Flexible array for image data } SharedMemoryRegion; #endif -cairo_surface_t* surface=NULL; -cairo_surface_t* surface_back=NULL; -cairo_surface_t* image_surface = NULL; -cairo_t* cr=NULL; -cairo_t* cr_back=NULL; +cairo_surface_t *surface = NULL; +cairo_surface_t *surface_back = NULL; +cairo_surface_t *image_surface = NULL; +cairo_t *cr = NULL; +cairo_t *cr_back = NULL; extern bool verbose; #if defined(_x86) -extern int AHI_TiltY; +void rotate_point(Point original, Point img_center, double angle_degrees, Point *rotated); + void handle_key_press(XEvent *event) { - KeySym keysym = XLookupKeysym(&event->xkey, 0); // Map keycode to keysym - - // Print the key that was pressed - if (keysym == XK_Escape) { - printf("Escape key pressed, exiting...\n"); - //exit(0); // Exit the program on Escape key - } - if ((event->xkey.state & Mod1Mask) && (keysym == XK_Up)) { - if (AHI_TiltY<300) - AHI_TiltY+=30; - return; - } - if ((event->xkey.state & Mod1Mask) && (keysym == XK_Down)) { - if (AHI_TiltY>-300) - AHI_TiltY-=30; - return; - } + KeySym keysym = XLookupKeysym(&event->xkey, 0); // Map keycode to keysym + + // Print the key that was pressed + if (keysym == XK_Escape) { + printf("Escape key pressed, exiting...\n"); + // exit(0); // Exit the program on Escape key + } + if ((event->xkey.state & Mod1Mask) && (keysym == XK_Up)) { + if (AHI_TiltY < 300) + AHI_TiltY += 30; + return; + } + if ((event->xkey.state & Mod1Mask) && (keysym == XK_Down)) { + if (AHI_TiltY > -300) + AHI_TiltY -= 30; + return; + } } void event_callback(evutil_socket_t fd, short event, void *arg) { - XEvent xevent; - while (XPending(display)) { // Process all queued X events - XNextEvent(display, &xevent); - if (xevent.type == Expose) { - //Do something here - } else if (xevent.type == KeyPress) { - handle_key_press(&xevent); - } - } + XEvent xevent; + while (XPending(display)) { // Process all queued X events + XNextEvent(display, &xevent); + if (xevent.type == Expose) { + // Do something here + } else if (xevent.type == KeyPress) { + handle_key_press(&xevent); + } + } } int Init(uint16_t *width, uint16_t *height) { - if (verbose) - forcefullscreen=false; - - setenv("DISPLAY", ":0", 0); - - display = XOpenDisplay(NULL); - if (!display) { - fprintf(stderr, "Cannot open display\n"); - return 1; - } - int screen = DefaultScreen(display); - RootWindow = RootWindow(display, screen); - - uint16_t screen_width = DisplayWidth(display, screen); - uint16_t screen_height = DisplayHeight(display, screen); - *width=screen_width; - *height=screen_height; - // Set up an ARGB visual for transparency - XVisualInfo vinfo; - if (!XMatchVisualInfo(display, screen, 32, TrueColor, &vinfo)) { - fprintf(stderr, "No 32-bit visual found\n"); - return 1; - } - - XSetWindowAttributes attrs; - attrs.colormap = XCreateColormap(display, RootWindow, vinfo.visual, AllocNone); - attrs.border_pixel = 0; - attrs.background_pixel = 0; -//!!!!!!!!!!!!!!!!!!!!!!!! THIS Removes window's borders - attrs.override_redirect = True; // Make the window borderless, MAKE TRUE - if (!forcefullscreen)//debug mode - attrs.override_redirect = False; - - // Create the window with transparency support - window = XCreateWindow(display, RootWindow, - 0, 0, *width, *height, 0, - vinfo.depth, InputOutput, - vinfo.visual, - CWColormap | CWBorderPixel | CWBackPixel | CWOverrideRedirect, - &attrs); - - // Set the window name (title) - //const char *window_title = "MSPOSD"; - //XStoreName(display, window, window_title); - - // Select input events: expose, key press, key release - XSelectInput(display, window, ExposureMask | KeyPressMask | KeyReleaseMask); - - char buffer[50];//tried to set env var to read it from python, didn't work .... - snprintf(buffer, sizeof(buffer), "%lu", window); - setenv("MSP_WINDOW_ID", buffer, 1); // 1 means overwrite if it already exists - - // Make the window topmost? - XMapWindow(display, window); - - // Raise the window to the top, may slow down and interfere with the UI, disable for debugging - XRaiseWindow(display, window); - - // Set input focus to the window - //XSetInputFocus(display, window, RevertToParent, CurrentTime); - - // Set window properties to make it transparent - if (false){//seems not needed - Atom windowType = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False); - Atom windowTypeDock = XInternAtom(display, "_NET_WM_WINDOW_TYPE_DOCK", False); - XChangeProperty(display, window, windowType, XA_ATOM, 32, PropModeReplace, (unsigned char*)&windowTypeDock, 1); - } - // Create a Cairo surface for drawing on the X11 window - surface_back = cairo_xlib_surface_create(display, window, vinfo.visual, *width, *height); - surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, *width, *height); - cr = cairo_create(surface); - cr_back = cairo_create(surface_back); - + if (verbose) + forcefullscreen = false; + + setenv("DISPLAY", ":0", 0); + + display = XOpenDisplay(NULL); + if (!display) { + fprintf(stderr, "Cannot open display\n"); + return 1; + } + int screen = DefaultScreen(display); + RootWindow = RootWindow(display, screen); + + uint16_t screen_width = DisplayWidth(display, screen); + uint16_t screen_height = DisplayHeight(display, screen); + *width = screen_width; + *height = screen_height; + // Set up an ARGB visual for transparency + XVisualInfo vinfo; + if (!XMatchVisualInfo(display, screen, 32, TrueColor, &vinfo)) { + fprintf(stderr, "No 32-bit visual found\n"); + return 1; + } + + XSetWindowAttributes attrs; + attrs.colormap = XCreateColormap(display, RootWindow, vinfo.visual, AllocNone); + attrs.border_pixel = 0; + attrs.background_pixel = 0; + //!!!!!!!!!!!!!!!!!!!!!!!! THIS Removes window's borders + attrs.override_redirect = True; // Make the window borderless, MAKE TRUE + if (!forcefullscreen) // debug mode + attrs.override_redirect = False; + + // Create the window with transparency support + window = XCreateWindow(display, RootWindow, 0, 0, *width, *height, 0, vinfo.depth, InputOutput, + vinfo.visual, CWColormap | CWBorderPixel | CWBackPixel | CWOverrideRedirect, &attrs); + + // Set the window name (title) + // const char *window_title = "MSPOSD"; + // XStoreName(display, window, window_title); + + // Select input events: expose, key press, key release + XSelectInput(display, window, ExposureMask | KeyPressMask | KeyReleaseMask); + + char buffer[50]; // tried to set env var to read it from python, didn't work + // .... + snprintf(buffer, sizeof(buffer), "%lu", window); + setenv("MSP_WINDOW_ID", buffer, + 1); // 1 means overwrite if it already exists + + // Make the window topmost? + XMapWindow(display, window); + + // Raise the window to the top, may slow down and interfere with the UI, + // disable for debugging + XRaiseWindow(display, window); + + // Set input focus to the window + // XSetInputFocus(display, window, RevertToParent, CurrentTime); + + // Set window properties to make it transparent + if (false) { // seems not needed + Atom windowType = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False); + Atom windowTypeDock = XInternAtom(display, "_NET_WM_WINDOW_TYPE_DOCK", False); + XChangeProperty(display, window, windowType, XA_ATOM, 32, PropModeReplace, + (unsigned char *)&windowTypeDock, 1); + } + // Create a Cairo surface for drawing on the X11 window + surface_back = cairo_xlib_surface_create(display, window, vinfo.visual, *width, *height); + surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, *width, *height); + cr = cairo_create(surface); + cr_back = cairo_create(surface_back); } #endif #if defined(__ROCKCHIP__) int Init(uint16_t *width, uint16_t *height) { - // Create shared memory region - const char *shm_name = "msposd"; // Name of the shared memory region - int shm_fd = -1; - - // Wait until the shared memory segment exists - while (shm_fd == -1) { - shm_fd = shm_open(shm_name, O_RDWR, 0666); - if (shm_fd == -1) { - if (errno == ENOENT) { - printf("Shared memory '%s' does not exist. Waiting...\n", shm_name); - sleep(1); // Wait for 1 second before trying again - continue; - } else { - perror("Failed to open shared memory"); - return -1; - } - } - - } - // Map just the header to read width and height - size_t header_size = sizeof(SharedMemoryRegion); - SharedMemoryRegion *shm_region = (SharedMemoryRegion *) mmap(0, header_size, PROT_READ, MAP_SHARED, shm_fd, 0); - if (shm_region == MAP_FAILED) { - perror("Failed to map shared memory header"); - close(shm_fd); - return -1; - } - - // Validate width and height (optional) - if (shm_region->width <= 0 || shm_region->width <= 0) { - fprintf(stderr, "Invalid width or height in shared memory\n"); - munmap(shm_region, header_size); - close(shm_fd); - return -1; - } - - int shm_width = shm_region->width; - int shm_height = shm_region->height; - *width = shm_region->width; - *height = shm_region->height; - - printf("Surface is %ix%i pixels\n",shm_width,shm_height); - - // Unmap the header (optional, as we'll remap everything) - munmap(shm_region, header_size); - - // Calculate the total size of shared memory - size_t shm_size = header_size + (shm_width * shm_height * 4); // Header + Image data - - // Remap the entire shared memory region (header + image data) - shm_region = (SharedMemoryRegion *) mmap(0, shm_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0); - if (shm_region == MAP_FAILED) { - perror("Failed to remap shared memory"); - close(shm_fd); - return -1; - } - - // Create a Cairo surface for the image data - surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, shm_width, shm_width); - if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) { - fprintf(stderr, "Failed to create Cairo surface\n"); - return -1; - } - - // Create a Cairo surface for the image data connecto to the shm - surface_back = cairo_image_surface_create_for_data( - shm_region->data, CAIRO_FORMAT_ARGB32, shm_width, shm_height, shm_width * 4); - if (cairo_surface_status(surface_back) != CAIRO_STATUS_SUCCESS) { - fprintf(stderr, "Failed to create Cairo surface_back\n"); - munmap(shm_region, shm_size); - close(shm_fd); - return -1; - } - - // Create a Cairo context - cr = cairo_create(surface); - cr_back = cairo_create(surface_back); + // Create shared memory region + const char *shm_name = "msposd"; // Name of the shared memory region + int shm_fd = -1; + + // Wait until the shared memory segment exists + while (shm_fd == -1) { + shm_fd = shm_open(shm_name, O_RDWR, 0666); + if (shm_fd == -1) { + if (errno == ENOENT) { + printf("Shared memory '%s' does not exist. Waiting...\n", shm_name); + sleep(1); // Wait for 1 second before trying again + continue; + } else { + perror("Failed to open shared memory"); + return -1; + } + } + } + // Map just the header to read width and height + size_t header_size = sizeof(SharedMemoryRegion); + SharedMemoryRegion *shm_region = + (SharedMemoryRegion *)mmap(0, header_size, PROT_READ, MAP_SHARED, shm_fd, 0); + if (shm_region == MAP_FAILED) { + perror("Failed to map shared memory header"); + close(shm_fd); + return -1; + } + + // Validate width and height (optional) + if (shm_region->width <= 0 || shm_region->width <= 0) { + fprintf(stderr, "Invalid width or height in shared memory\n"); + munmap(shm_region, header_size); + close(shm_fd); + return -1; + } + + int shm_width = shm_region->width; + int shm_height = shm_region->height; + *width = shm_region->width; + *height = shm_region->height; + + printf("Surface is %ix%i pixels\n", shm_width, shm_height); + + // Unmap the header (optional, as we'll remap everything) + munmap(shm_region, header_size); + + // Calculate the total size of shared memory + size_t shm_size = header_size + (shm_width * shm_height * 4); // Header + Image data + + // Remap the entire shared memory region (header + image data) + shm_region = + (SharedMemoryRegion *)mmap(0, shm_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0); + if (shm_region == MAP_FAILED) { + perror("Failed to remap shared memory"); + close(shm_fd); + return -1; + } + + // Create a Cairo surface for the image data + surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, shm_width, shm_width); + if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) { + fprintf(stderr, "Failed to create Cairo surface\n"); + return -1; + } + + // Create a Cairo surface for the image data connecto to the shm + surface_back = cairo_image_surface_create_for_data( + shm_region->data, CAIRO_FORMAT_ARGB32, shm_width, shm_height, shm_width * 4); + if (cairo_surface_status(surface_back) != CAIRO_STATUS_SUCCESS) { + fprintf(stderr, "Failed to create Cairo surface_back\n"); + munmap(shm_region, shm_size); + close(shm_fd); + return -1; + } + + // Create a Cairo context + cr = cairo_create(surface); + cr_back = cairo_create(surface_back); } #endif -void premultiplyAlpha(uint32_t* rgbaData, uint32_t width, uint32_t height) { - for (uint32_t i = 0; i < width * height; ++i) { - uint8_t* pixel = (uint8_t*)&rgbaData[i]; - uint8_t a = pixel[3]; // Alpha channel +void premultiplyAlpha(uint32_t *rgbaData, uint32_t width, uint32_t height) { + for (uint32_t i = 0; i < width * height; ++i) { + uint8_t *pixel = (uint8_t *)&rgbaData[i]; + uint8_t a = pixel[3]; // Alpha channel - // Premultiply RGB by alpha - pixel[0] = (pixel[0] * a) / 255; // Blue channel - pixel[1] = (pixel[1] * a) / 255; // Green channel - pixel[2] = (pixel[2] * a) / 255; // Red channel - } + // Premultiply RGB by alpha + pixel[0] = (pixel[0] * a) / 255; // Blue channel + pixel[1] = (pixel[1] * a) / 255; // Green channel + pixel[2] = (pixel[2] * a) / 255; // Red channel + } } - -void ClearScreen(){ - cairo_set_source_rgba(cr, 0, 0, 0, 0); - cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE ); - cairo_paint(cr); +void ClearScreen() { + cairo_set_source_rgba(cr, 0, 0, 0, 0); + cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); + cairo_paint(cr); } - -void Render( unsigned char* rgbaData, int u32Width, int u32Height){ - - - cairo_set_source_rgba(cr, 0, 0, 0, 0); // Transparent background for buffer - cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); // Clear everything on the buffer - cairo_paint(cr); - cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); // Restore default operator - - - //bitmap has been changed - if (image_surface != NULL && cairo_image_surface_get_data(image_surface) != rgbaData){ - cairo_surface_destroy(image_surface); - image_surface = NULL; - } - // Create a Cairo image surface from the RGBA data - if (image_surface==NULL){ - image_surface = cairo_image_surface_create_for_data( - rgbaData, CAIRO_FORMAT_ARGB32, u32Width, u32Height, u32Width * 4); - }else{ - cairo_surface_mark_dirty(image_surface); - } - cairo_set_source_surface(cr, image_surface, 1, 1); - - //cairo_set_operator(cr, CAIRO_OPERATOR_OVER);//Handles transparency and blends with the existing background, producing smooth visual results. - cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);//Faster, clears all below - cairo_paint(cr); - //XSync(display, False);//seems not needed? +void Render(unsigned char *rgbaData, int u32Width, int u32Height) { + + cairo_set_source_rgba(cr, 0, 0, 0, 0); // Transparent background for buffer + cairo_set_operator(cr, + CAIRO_OPERATOR_SOURCE); // Clear everything on the buffer + cairo_paint(cr); + cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); // Restore default operator + + // bitmap has been changed + if (image_surface != NULL && cairo_image_surface_get_data(image_surface) != rgbaData) { + cairo_surface_destroy(image_surface); + image_surface = NULL; + } + // Create a Cairo image surface from the RGBA data + if (image_surface == NULL) { + image_surface = cairo_image_surface_create_for_data( + rgbaData, CAIRO_FORMAT_ARGB32, u32Width, u32Height, u32Width * 4); + } else { + cairo_surface_mark_dirty(image_surface); + } + cairo_set_source_surface(cr, image_surface, 1, 1); + + // cairo_set_operator(cr, CAIRO_OPERATOR_OVER);//Handles transparency and + // blends with the existing background, producing smooth visual results. + cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); // Faster, clears all below + cairo_paint(cr); + // XSync(display, False);//seems not needed? #if defined(_x86) - if (forcefullscreen) - XRaiseWindow(display, window);//Raise the window to the top -#endif - + if (forcefullscreen) + XRaiseWindow(display, window); // Raise the window to the top +#endif } -void Render_rect(unsigned char* rgbaData, int u32Width, int u32Height, int src_x, int src_y, int dest_x, int dest_y, int rect_width, int rect_height) { - // Check if the bitmap has changed and recreate the image surface if necessary - if (image_surface != NULL && cairo_image_surface_get_data(image_surface) != rgbaData) { - cairo_surface_destroy(image_surface); - image_surface = NULL; - } - - // Create a Cairo image surface from the RGBA data if it hasn't been created yet - if (image_surface == NULL) { - image_surface = cairo_image_surface_create_for_data( - rgbaData, CAIRO_FORMAT_ARGB32, u32Width, u32Height, u32Width * 4); - } else { - // Mark the image surface as dirty if the RGBA data has changed - cairo_surface_mark_dirty(image_surface); - } - - // Define the clipping area to copy only a portion of the source image - cairo_rectangle(cr, dest_x, dest_y, rect_width, rect_height); - cairo_clip(cr); - - // Set the source surface, offset by src_x and src_y to start drawing from the specified portion - cairo_set_source_surface(cr, image_surface, dest_x - src_x, dest_y - src_y); - cairo_set_operator(cr, /*CAIRO_OPERATOR_SOURCE*/CAIRO_OPERATOR_OVER); // Use SOURCE to copy without blending - cairo_paint(cr); - - // Reset the clip to allow future drawings without being constrained - cairo_reset_clip(cr); - +void Render_rect(unsigned char *rgbaData, int u32Width, int u32Height, int src_x, int src_y, + int dest_x, int dest_y, int rect_width, int rect_height) { + // Check if the bitmap has changed and recreate the image surface if + // necessary + if (image_surface != NULL && cairo_image_surface_get_data(image_surface) != rgbaData) { + cairo_surface_destroy(image_surface); + image_surface = NULL; + } + + // Create a Cairo image surface from the RGBA data if it hasn't been created + // yet + if (image_surface == NULL) { + image_surface = cairo_image_surface_create_for_data( + rgbaData, CAIRO_FORMAT_ARGB32, u32Width, u32Height, u32Width * 4); + } else { + // Mark the image surface as dirty if the RGBA data has changed + cairo_surface_mark_dirty(image_surface); + } + + // Define the clipping area to copy only a portion of the source image + cairo_rectangle(cr, dest_x, dest_y, rect_width, rect_height); + cairo_clip(cr); + + // Set the source surface, offset by src_x and src_y to start drawing from + // the specified portion + cairo_set_source_surface(cr, image_surface, dest_x - src_x, dest_y - src_y); + cairo_set_operator(cr, + /*CAIRO_OPERATOR_SOURCE*/ CAIRO_OPERATOR_OVER); // Use SOURCE to copy + // without blending + cairo_paint(cr); + + // Reset the clip to allow future drawings without being constrained + cairo_reset_clip(cr); } - -void FlushDrawing(){ +void FlushDrawing() { #if defined(_x86) - //Hook keyboard- can't be in init procs since there the libevent is not still created. - // base = event_base_new(); - if (x11_event==NULL && base!=NULL){ - // Attach X11 display's file descriptor to the existing msposd event_base - struct event *x11_event = event_new(base, ConnectionNumber(display), EV_READ | EV_PERSIST, event_callback, NULL); - event_add(x11_event, NULL); - - // if (XGrabKeyboard(display, window, True, GrabModeAsync, GrabModeAsync, CurrentTime) != GrabSuccess) - // fprintf(stderr, "Failed to grab keyboard\n"); - // Grab only the specific key combinations - // XGrabKey(display, XKeysymToKeycode(display, XK_Up), Mod1Mask, window, True, - // GrabModeAsync, GrabModeAsync); // Alt + Up Arrow - // XGrabKey(display, XKeysymToKeycode(display, XK_Down), Mod1Mask, window, True, - // GrabModeAsync, GrabModeAsync); // Alt + Up Arrow - // XGrabKey(display, XKeysymToKeycode(display, XK_Left), ShiftMask, window, True, - // GrabModeAsync, GrabModeAsync); // Shift + Left Arrow - - - XGrabKey(display, XKeysymToKeycode(display, XK_Up), Mod1Mask, RootWindow, True, - GrabModeAsync, GrabModeAsync); // Alt + Up Arrow - XGrabKey(display, XKeysymToKeycode(display, XK_Down), Mod1Mask, RootWindow, True, - GrabModeAsync, GrabModeAsync); // Alt + Down Arrow - - } + // Hook keyboard- can't be in init procs since there the libevent is not + // still created. + // base = event_base_new(); + if (x11_event == NULL && base != NULL) { + // Attach X11 display's file descriptor to the existing msposd + // event_base + struct event *x11_event = + event_new(base, ConnectionNumber(display), EV_READ | EV_PERSIST, event_callback, NULL); + event_add(x11_event, NULL); + + // if (XGrabKeyboard(display, window, True, GrabModeAsync, + // GrabModeAsync, CurrentTime) != GrabSuccess) + // fprintf(stderr, "Failed to grab keyboard\n"); + // Grab only the specific key combinations + // XGrabKey(display, XKeysymToKeycode(display, XK_Up), Mod1Mask, window, + // True, + // GrabModeAsync, GrabModeAsync); // Alt + Up Arrow + // XGrabKey(display, XKeysymToKeycode(display, XK_Down), Mod1Mask, + // window, True, + // GrabModeAsync, GrabModeAsync); // Alt + Up Arrow + // XGrabKey(display, XKeysymToKeycode(display, XK_Left), ShiftMask, + // window, True, + // GrabModeAsync, GrabModeAsync); // Shift + Left Arrow + + XGrabKey(display, XKeysymToKeycode(display, XK_Up), Mod1Mask, RootWindow, True, + GrabModeAsync, + GrabModeAsync); // Alt + Up Arrow + XGrabKey(display, XKeysymToKeycode(display, XK_Down), Mod1Mask, RootWindow, True, + GrabModeAsync, + GrabModeAsync); // Alt + Down Arrow + } #endif - - // Copy work buffer to the display surface do avoid flickering - cairo_set_operator(cr_back, CAIRO_OPERATOR_SOURCE); - // Copy buffer to the display surface - cairo_set_source_surface(cr_back, surface, 0, 0); - cairo_paint(cr_back); - - cairo_surface_flush(surface_back); + + // Copy work buffer to the display surface do avoid flickering + cairo_set_operator(cr_back, CAIRO_OPERATOR_SOURCE); + // Copy buffer to the display surface + cairo_set_source_surface(cr_back, surface, 0, 0); + cairo_paint(cr_back); + + cairo_surface_flush(surface_back); #if defined(_x86) - XFlush(display); + XFlush(display); #endif - //XSync(display, False);//seems not needed? + // XSync(display, False);//seems not needed? } - -void Close(){ - // Clean up resources - cairo_destroy(cr); - cairo_destroy(cr_back); - cairo_surface_destroy(image_surface); - cairo_surface_destroy(surface); - cairo_surface_destroy(surface_back); +void Close() { + // Clean up resources + cairo_destroy(cr); + cairo_destroy(cr_back); + cairo_surface_destroy(image_surface); + cairo_surface_destroy(surface); + cairo_surface_destroy(surface_back); #if defined(_x86) - XDestroyWindow(display, window); - XCloseDisplay(display); + XDestroyWindow(display, window); + XCloseDisplay(display); - // Cleanup - event_free(x11_event); - event_base_free(base); + // Cleanup + event_free(x11_event); + event_base_free(base); #endif } - extern uint16_t Transform_OVERLAY_WIDTH; extern uint16_t Transform_OVERLAY_HEIGHT; extern float Transform_Roll; extern float Transform_Pitch; -bool outlined=true; +bool outlined = true; + void drawLineGS(int x0, int y0, int x1, int y1, uint32_t color, double thickness, bool Transpose) { - - if (Transpose){ - - uint32_t width = Transform_OVERLAY_WIDTH; - uint32_t height=Transform_OVERLAY_HEIGHT; - // Apply Transform - int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; - Point img_center = {Transform_OVERLAY_WIDTH / 2, Transform_OVERLAY_HEIGHT / 2}; // Center of the image - - // Define the four corners of the rectangle before rotation - Point A = {x0, y0-OffsY}; - Point B = {x1, y1-OffsY}; - - // Rotate each corner around the center - Point rotated_A, rotated_B; - rotate_point(A, img_center, Transform_Roll, &rotated_A); - rotate_point(B, img_center, Transform_Roll, &rotated_B); - - x0 = rotated_A.x; - y0 = rotated_A.y; - x1 = rotated_B.x; - y1 = rotated_B.y; - - } - - double r = ((color >> 24) & 0xFF) / 255.0; - double g = ((color >> 16) & 0xFF) / 255.0; - double b = ((color >> 8) & 0xFF) / 255.0; - double a = (color & 0xFF) / 255.0; //128 - - if (!outlined){ - cairo_set_source_rgba(cr, r, g, b, a); - cairo_set_line_width(cr, thickness); - cairo_move_to(cr, x0, y0); - cairo_line_to(cr, x1, y1); - cairo_stroke(cr); - }else { - if (thickness>1) - thickness--; - - //we can turn off - //cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE); - - // Save the current state of the Cairo context - cairo_save(cr); - // Draw the outline (semi-transparent black) with a thicker line width - cairo_set_source_rgba(cr, 0, 0, 0, 0.5); // Semi-transparent black (alpha = 0.5) - cairo_set_line_width(cr, thickness + 2); // Make the outline slightly thicker than the main line - cairo_move_to(cr, x0, y0); - cairo_line_to(cr, x1, y1); - - cairo_stroke(cr); - cairo_restore(cr); - - cairo_save(cr); - // Draw the main line (colored) with the original thickness - cairo_set_source_rgba(cr, r, g, b, a); // Use the desired RGBA values for the line color - cairo_set_line_width(cr, thickness ); - cairo_move_to(cr, x0, y0); - cairo_line_to(cr, x1, y1); - cairo_stroke(cr); - cairo_restore(cr); - } -} + if (Transpose) { + + uint32_t width = Transform_OVERLAY_WIDTH; + uint32_t height = Transform_OVERLAY_HEIGHT; + // Apply Transform + int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; + Point img_center = { + Transform_OVERLAY_WIDTH / 2, Transform_OVERLAY_HEIGHT / 2}; // Center of the image + + // Define the four corners of the rectangle before rotation + Point A = {x0, y0 - OffsY}; + Point B = {x1, y1 - OffsY}; + + // Rotate each corner around the center + Point rotated_A, rotated_B; + rotate_point(A, img_center, Transform_Roll, &rotated_A); + rotate_point(B, img_center, Transform_Roll, &rotated_B); + + x0 = rotated_A.x; + y0 = rotated_A.y; + x1 = rotated_B.x; + y1 = rotated_B.y; + } + + double r = ((color >> 24) & 0xFF) / 255.0; + double g = ((color >> 16) & 0xFF) / 255.0; + double b = ((color >> 8) & 0xFF) / 255.0; + double a = (color & 0xFF) / 255.0; // 128 + + if (!outlined) { + cairo_set_source_rgba(cr, r, g, b, a); + cairo_set_line_width(cr, thickness); + cairo_move_to(cr, x0, y0); + cairo_line_to(cr, x1, y1); + cairo_stroke(cr); + } else { + if (thickness > 1) + thickness--; + + // we can turn off + // cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE); + + // Save the current state of the Cairo context + cairo_save(cr); + // Draw the outline (semi-transparent black) with a thicker line width + cairo_set_source_rgba(cr, 0, 0, 0, + 0.5); // Semi-transparent black (alpha = 0.5) + cairo_set_line_width(cr, + thickness + 2); // Make the outline slightly thicker than the main line + cairo_move_to(cr, x0, y0); + cairo_line_to(cr, x1, y1); + + cairo_stroke(cr); + cairo_restore(cr); + + cairo_save(cr); + // Draw the main line (colored) with the original thickness + cairo_set_source_rgba(cr, r, g, b, + a); // Use the desired RGBA values for the line color + cairo_set_line_width(cr, thickness); + cairo_move_to(cr, x0, y0); + cairo_line_to(cr, x1, y1); + cairo_stroke(cr); + cairo_restore(cr); + } +} // Function to draw rotated text with rotation -int getTextWidth(const char* text , double size) { - cairo_set_font_size(cr, size); - cairo_text_extents_t extents; - // Get the extents of the text - cairo_text_extents(cr, text, &extents); - // Return the width of the text - return (int) extents.width; - +int getTextWidth(const char *text, double size) { + cairo_set_font_size(cr, size); + cairo_text_extents_t extents; + // Get the extents of the text + cairo_text_extents(cr, text, &extents); + // Return the width of the text + return (int)extents.width; } - // Function to draw rotated text with rotation -void drawText(const char* text, int x, int y, uint32_t color, double size, bool Transpose, int Outline) { - // Extract the RGBA components from the color - double r = ((color >> 24) & 0xFF) / 255.0; - double g = ((color >> 16) & 0xFF) / 255.0; - double b = ((color >> 8) & 0xFF) / 255.0; - double a = (color & 0xFF) / 255.0; - - // Set the color using RGBA values (each between 0.0 and 1.0) - cairo_set_source_rgba(cr, r, g, b, a); - - if (Transpose) { - uint32_t width = Transform_OVERLAY_WIDTH; - uint32_t height = Transform_OVERLAY_HEIGHT; - - // Apply Transform - int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; - Point img_center = {width / 2, height / 2}; // Center of the image - - Point original_pos = {x, y - OffsY}; - Point rotated_pos; - - // Rotate the position around the center - rotate_point(original_pos, img_center, Transform_Roll, &rotated_pos); - - // Update the transformed position - x = rotated_pos.x; - y = rotated_pos.y; - } - - cairo_set_font_size(cr, size); - - if (false){ - cairo_move_to(cr, x, y); - cairo_show_text(cr, text); - }else{ - // Save the current state of the Cairo context - cairo_save(cr); - cairo_translate(cr, x, y); - - if (Transpose) - cairo_rotate(cr, Transform_Roll * (M_PI / 180.0)); - - if (Outline){ - // Draw the outline (stroke) first with a larger line width - cairo_set_line_width(cr, Outline); // Adjust the width as needed for the outline - cairo_set_source_rgba(cr, 0, 0, 0, 1.0); // Set color for the outline (black) - cairo_move_to(cr, 0, 0); - cairo_text_path(cr, text); // Create a path for the text - cairo_stroke(cr); // Stroke the path (outline) - - } - // Draw the text itself (fill) on top of the outline - cairo_set_line_width(cr, 1.0); // Reset line width to normal - cairo_set_source_rgba(cr, r, g, b, a); // Set the original color for the text - // Fill the text path with the text color - cairo_move_to(cr, 0, 0); - cairo_text_path(cr, text); // Create the path for the text - cairo_fill(cr); // Fill the path with the text color - - - // cairo_move_to(cr, 0, 0); - // cairo_set_font_size(cr, size); - // cairo_show_text(cr, text); - - cairo_restore(cr); - - - } - +void drawText( + const char *text, int x, int y, uint32_t color, double size, bool Transpose, int Outline) { + // Extract the RGBA components from the color + double r = ((color >> 24) & 0xFF) / 255.0; + double g = ((color >> 16) & 0xFF) / 255.0; + double b = ((color >> 8) & 0xFF) / 255.0; + double a = (color & 0xFF) / 255.0; + + // Set the color using RGBA values (each between 0.0 and 1.0) + cairo_set_source_rgba(cr, r, g, b, a); + + if (Transpose) { + uint32_t width = Transform_OVERLAY_WIDTH; + uint32_t height = Transform_OVERLAY_HEIGHT; + + // Apply Transform + int OffsY = sin((Transform_Pitch) * (M_PI / 180.0)) * 400; + Point img_center = {width / 2, height / 2}; // Center of the image + + Point original_pos = {x, y - OffsY}; + Point rotated_pos; + + // Rotate the position around the center + rotate_point(original_pos, img_center, Transform_Roll, &rotated_pos); + + // Update the transformed position + x = rotated_pos.x; + y = rotated_pos.y; + } + + cairo_set_font_size(cr, size); + + if (false) { + cairo_move_to(cr, x, y); + cairo_show_text(cr, text); + } else { + // Save the current state of the Cairo context + cairo_save(cr); + cairo_translate(cr, x, y); + + if (Transpose) + cairo_rotate(cr, Transform_Roll * (M_PI / 180.0)); + + if (Outline) { + // Draw the outline (stroke) first with a larger line width + cairo_set_line_width(cr, Outline); // Adjust the width as needed for the outline + cairo_set_source_rgba(cr, 0, 0, 0, + 1.0); // Set color for the outline (black) + cairo_move_to(cr, 0, 0); + cairo_text_path(cr, text); // Create a path for the text + cairo_stroke(cr); // Stroke the path (outline) + } + // Draw the text itself (fill) on top of the outline + cairo_set_line_width(cr, 1.0); // Reset line width to normal + cairo_set_source_rgba(cr, r, g, b, + a); // Set the original color for the text + // Fill the text path with the text color + cairo_move_to(cr, 0, 0); + cairo_text_path(cr, text); // Create the path for the text + cairo_fill(cr); // Fill the path with the text color + + // cairo_move_to(cr, 0, 0); + // cairo_set_font_size(cr, size); + // cairo_show_text(cr, text); + + cairo_restore(cr); + } } - - - -void draw_rounded_rectangle(cairo_t *cr, double x, double y, double width, double height, double radius) { - cairo_move_to(cr, x + radius, y); - cairo_arc(cr, x + width - radius, y + radius, radius, -90 * (M_PI / 180), 0 * (M_PI / 180)); // Top-right corner - cairo_arc(cr, x + width - radius, y + height - radius, radius, 0 * (M_PI / 180), 90 * (M_PI / 180)); // Bottom-right corner - cairo_arc(cr, x + radius, y + height - radius, radius, 90 * (M_PI / 180), 180 * (M_PI / 180)); // Bottom-left corner - cairo_arc(cr, x + radius, y + radius, radius, 180 * (M_PI / 180), 270 * (M_PI / 180)); // Top-left corner - cairo_close_path(cr); +void draw_rounded_rectangle( + cairo_t *cr, double x, double y, double width, double height, double radius) { + cairo_move_to(cr, x + radius, y); + cairo_arc(cr, x + width - radius, y + radius, radius, -90 * (M_PI / 180), + 0 * (M_PI / 180)); // Top-right corner + cairo_arc(cr, x + width - radius, y + height - radius, radius, 0 * (M_PI / 180), + 90 * (M_PI / 180)); // Bottom-right corner + cairo_arc(cr, x + radius, y + height - radius, radius, 90 * (M_PI / 180), + 180 * (M_PI / 180)); // Bottom-left corner + cairo_arc(cr, x + radius, y + radius, radius, 180 * (M_PI / 180), + 270 * (M_PI / 180)); // Top-left corner + cairo_close_path(cr); } -void drawRC_Channels(int posX, int posY, int m1X, int m1Y, int m2X, int m2Y){//int pitch, int roll, int throttle, int yaw - int width = 100, height = 100; - - int side=64; - - // Draw the outline of the rounded rectangle - cairo_set_source_rgb(cr, 1, 1, 1); // White color for outline - cairo_set_line_width(cr, 1); // Line thickness - draw_rounded_rectangle(cr, posX, posY, side, side, 16); // 72x72 px rectangle with 10 px corner radius - cairo_stroke(cr); - // Draw a small circle at the center of the rounded rectangle - double circle_diameter = 8; - double circle_radius = circle_diameter / 2; - double rect_center_x = posX + side * (m2X-1000)/1000; - double rect_center_y = posY + side - side * (m2Y-1000)/1000; - cairo_set_source_rgb(cr, 1, 1, 1); // Set color to white for the circle - cairo_arc(cr, rect_center_x, rect_center_y, circle_radius, 0, 2 * M_PI); - cairo_fill(cr); - - // Draw next stick - cairo_set_source_rgb(cr, 1, 1, 1); // White color for outline - cairo_set_line_width(cr, 1); // Line thickness - draw_rounded_rectangle(cr, posX + side + 5 , posY, side, side, 16); // 72x72 px rectangle with 10 px corner radius - cairo_stroke(cr); - - // Draw a small circle at the center of the rounded rectangle - rect_center_x = posX + side + 5 + side * (m1X-1000)/1000; - rect_center_y = posY + side - side * (m1Y-1000)/1000; - cairo_set_source_rgb(cr, 1, 1, 1); // Set color to white for the circle - cairo_arc(cr, rect_center_x, rect_center_y, circle_radius, 0, 2 * M_PI); - cairo_fill(cr); +void drawRC_Channels(int posX, int posY, int m1X, int m1Y, int m2X, + int m2Y) { // int pitch, int roll, int throttle, int yaw + int width = 100, height = 100; + + int side = 64; + + // Draw the outline of the rounded rectangle + cairo_set_source_rgb(cr, 1, 1, 1); // White color for outline + cairo_set_line_width(cr, 1); // Line thickness + draw_rounded_rectangle(cr, posX, posY, side, side, + 16); // 72x72 px rectangle with 10 px corner radius + cairo_stroke(cr); + // Draw a small circle at the center of the rounded rectangle + double circle_diameter = 8; + double circle_radius = circle_diameter / 2; + double rect_center_x = posX + side * (m2X - 1000) / 1000; + double rect_center_y = posY + side - side * (m2Y - 1000) / 1000; + cairo_set_source_rgb(cr, 1, 1, 1); // Set color to white for the circle + cairo_arc(cr, rect_center_x, rect_center_y, circle_radius, 0, 2 * M_PI); + cairo_fill(cr); + + // Draw next stick + cairo_set_source_rgb(cr, 1, 1, 1); // White color for outline + cairo_set_line_width(cr, 1); // Line thickness + draw_rounded_rectangle(cr, posX + side + 5, posY, side, side, + 16); // 72x72 px rectangle with 10 px corner radius + cairo_stroke(cr); + + // Draw a small circle at the center of the rounded rectangle + rect_center_x = posX + side + 5 + side * (m1X - 1000) / 1000; + rect_center_y = posY + side - side * (m1Y - 1000) / 1000; + cairo_set_source_rgb(cr, 1, 1, 1); // Set color to white for the circle + cairo_arc(cr, rect_center_x, rect_center_y, circle_radius, 0, 2 * M_PI); + cairo_fill(cr); } diff --git a/osd/util/debug.h b/osd/util/debug.h index f411f44..f7a7fbc 100644 --- a/osd/util/debug.h +++ b/osd/util/debug.h @@ -1,7 +1,7 @@ // #pragma once #ifdef DEBUG_ -#define DEBUG_PRINT(fmt, args...) fprintf(stderr, fmt, ## args) +#define DEBUG_PRINT(fmt, args...) fprintf(stderr, fmt, ##args) #else #define DEBUG_PRINT(fmt, args...) #endif \ No newline at end of file diff --git a/osd/util/display_info.h b/osd/util/display_info.h index 60c65d6..1fc66f2 100644 --- a/osd/util/display_info.h +++ b/osd/util/display_info.h @@ -6,11 +6,11 @@ #define NUM_FONT_PAGES 4 typedef struct display_info_s { - uint8_t char_width; - uint8_t char_height; - uint8_t font_width; - uint8_t font_height; - uint16_t x_offset; - uint16_t y_offset; - void *fonts[NUM_FONT_PAGES]; + uint8_t char_width; + uint8_t char_height; + uint8_t font_width; + uint8_t font_height; + uint16_t x_offset; + uint16_t y_offset; + void *fonts[NUM_FONT_PAGES]; } display_info_t; \ No newline at end of file diff --git a/osd/util/fs_util.c b/osd/util/fs_util.c index e08e0a4..28199ba 100644 --- a/osd/util/fs_util.c +++ b/osd/util/fs_util.c @@ -1,49 +1,48 @@ +#include #include #include -#include -#include #include #include -#include #include #include +#include #include "fs_util.h" #define DICTIONARY_PATH "/opt/mspdictionaries" -int32_t get_int_from_fs(char* path) { - int32_t val; - char read_buffer[32]; - memset(read_buffer, 0, 32); - int fd = open(path, O_RDONLY, 0); - if(fd < 0) { - return -1; - } - int read_count = read(fd, read_buffer, 32); - if(read_count > 0) { - val = atoi(read_buffer); - } - close(fd); - return val; +int32_t get_int_from_fs(char *path) { + int32_t val; + char read_buffer[32]; + memset(read_buffer, 0, 32); + int fd = open(path, O_RDONLY, 0); + if (fd < 0) { + return -1; + } + int read_count = read(fd, read_buffer, 32); + if (read_count > 0) { + val = atoi(read_buffer); + } + close(fd); + return val; } void *open_dict(int dict_version, int *size) { - char file_path[255]; - snprintf(file_path, 255, "%s/dictionary_%d.bin", DICTIONARY_PATH, dict_version); - struct stat st; - memset(&st, 0, sizeof(st)); - stat(file_path, &st); - size_t filesize = st.st_size; - int fd = open(file_path, O_RDONLY, 0); - if (!fd) { - return NULL; - } - void* dict = malloc(filesize); - void* mmappedData = mmap(NULL, filesize, PROT_READ, MAP_PRIVATE, fd, 0); - *size = filesize; - memcpy(dict, mmappedData, filesize); - close(fd); - munmap(mmappedData, filesize); - return dict; + char file_path[255]; + snprintf(file_path, 255, "%s/dictionary_%d.bin", DICTIONARY_PATH, dict_version); + struct stat st; + memset(&st, 0, sizeof(st)); + stat(file_path, &st); + size_t filesize = st.st_size; + int fd = open(file_path, O_RDONLY, 0); + if (!fd) { + return NULL; + } + void *dict = malloc(filesize); + void *mmappedData = mmap(NULL, filesize, PROT_READ, MAP_PRIVATE, fd, 0); + *size = filesize; + memcpy(dict, mmappedData, filesize); + close(fd); + munmap(mmappedData, filesize); + return dict; } diff --git a/osd/util/fs_util.h b/osd/util/fs_util.h index 473fcfb..2a33919 100644 --- a/osd/util/fs_util.h +++ b/osd/util/fs_util.h @@ -2,5 +2,5 @@ #include -int32_t get_int_from_fs(char*); +int32_t get_int_from_fs(char *); void *open_dict(int, int *); \ No newline at end of file diff --git a/osd/util/ini_parser.c b/osd/util/ini_parser.c index 82c5cb9..c26f574 100644 --- a/osd/util/ini_parser.c +++ b/osd/util/ini_parser.c @@ -1,347 +1,371 @@ +#include "ini_parser.h" +#include "../msp/vtxmenu.h" #include #include #include -#include "ini_parser.h" -#include "../msp/vtxmenu.h" extern MenuSection *current_section; // Helper function to split the list of values in a comma-separated list -void split_values(const char *values, char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH], int *value_count) { - char temp[MAX_LINE_LENGTH]; // Temporary buffer to hold a copy of the original string - strncpy(temp, values, sizeof(temp) - 1); // Copy the original string to the temp buffer - temp[sizeof(temp) - 1] = '\0'; // Ensure null termination - - char *token = strtok(temp, ","); - *value_count = 0; // Initialize the value count - - while (token != NULL) { - if (*value_count < MAX_VALUE_LIST_ITEMS) { // Check if there's space in the value list - // Copy each token to the value_list with proper length checking - strncpy(value_list[*value_count], token, MAX_VALUE_LENGTH - 1); // Copy with limit - value_list[*value_count][MAX_VALUE_LENGTH - 1] = '\0'; // Ensure null termination - (*value_count)++; // Increment the count - } else { - // Optionally handle case when too many values are provided - printf("Warning: Maximum value count exceeded. Some values may be ignored.\n"); - break; // Exit if the limit is reached - } - token = strtok(NULL, ","); // Get the next token - } +void split_values( + const char *values, char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH], int *value_count) { + char temp[MAX_LINE_LENGTH]; // Temporary buffer to hold a copy of the + // original string + strncpy(temp, values, + sizeof(temp) - 1); // Copy the original string to the temp buffer + temp[sizeof(temp) - 1] = '\0'; // Ensure null termination + + char *token = strtok(temp, ","); + *value_count = 0; // Initialize the value count + + while (token != NULL) { + if (*value_count < MAX_VALUE_LIST_ITEMS) { // Check if there's space in the value list + // Copy each token to the value_list with proper length checking + strncpy(value_list[*value_count], token, + MAX_VALUE_LENGTH - 1); // Copy with limit + value_list[*value_count][MAX_VALUE_LENGTH - 1] = '\0'; // Ensure null termination + (*value_count)++; // Increment the count + } else { + // Optionally handle case when too many values are provided + printf("Warning: Maximum value count exceeded. Some values may be " + "ignored.\n"); + break; // Exit if the limit is reached + } + token = strtok(NULL, ","); // Get the next token + } } - void print_menu_system_state(MenuSystem *menu_system) { - printf("\n=== Menu System Internal State ===\n"); - printf("We have %i sections:\n",menu_system->section_count); - // Iterate over each section in the menu system - for (int i = 0; i < menu_system->section_count; i++) { - MenuSection *section = &menu_system->sections[i]; - printf("\nSection: %s\n", section->name); - - // Iterate over each option in the section - for (int j = 0; j < section->option_count; j++) { - MenuOption *option = §ion->options[j]; - printf(" Option: %s (Internal Name: %s)", option->lable, option->name); - switch (option->type) { - case MENU_OPTION_LIST: { - // If it's a list, display the current selected value - char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; - int value_count; - split_values(option->values, value_list, &value_count); - printf(" (List): Current Value: %s Values: %s (Index: %d)\n", value_list[section->current_value_index[j]], option->values ,section->current_value_index[j]); - break; - } - case MENU_OPTION_RANGE: { - // If it's a range, display the current value - printf(" (Range): Current Value: %d (Min: %d, Max: %d)\n", - section->current_value_index[j], option->min, option->max); - break; - } - case MENU_OPTION_FLOATRANGE: { - // If it's a range, display the current value - printf(" (FloatRange): Current Value: %.1f (Min: %.1f, Max: %.1f)\n", - section->current_value_index[j] / 10.0f, option->min / 10.0f, option->max / 10.0f); - break; - } - case MENU_OPTION_SUBMENU: { - // If it's a submenu link, display the name of the linked submenu - printf(" (Submenu Link): Links to: %s\n", option->name); - break; - } - case MENU_OPTION_COMMAND: { - // If it's a submenu link, display the name of the linked submenu - if (option->command_function == runCustomCommand) - printf(" (Command): Command to run: %s\n", option->read_command); - else - printf(" (Command): %s\n",option->lable); - break; - } - default: { - // Generic case for unsupported option types (if any) - printf(" (Unknown Option Type)\n"); - break; - } - } - } - } - printf("\n=================================\n"); + printf("\n=== Menu System Internal State ===\n"); + printf("We have %i sections:\n", menu_system->section_count); + // Iterate over each section in the menu system + for (int i = 0; i < menu_system->section_count; i++) { + MenuSection *section = &menu_system->sections[i]; + printf("\nSection: %s\n", section->name); + + // Iterate over each option in the section + for (int j = 0; j < section->option_count; j++) { + MenuOption *option = §ion->options[j]; + printf(" Option: %s (Internal Name: %s)", option->lable, option->name); + switch (option->type) { + case MENU_OPTION_LIST: { + // If it's a list, display the current selected value + char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; + int value_count; + split_values(option->values, value_list, &value_count); + printf(" (List): Current Value: %s Values: %s (Index: %d)\n", + value_list[section->current_value_index[j]], option->values, + section->current_value_index[j]); + break; + } + case MENU_OPTION_RANGE: { + // If it's a range, display the current value + printf(" (Range): Current Value: %d (Min: %d, Max: %d)\n", + section->current_value_index[j], option->min, option->max); + break; + } + case MENU_OPTION_FLOATRANGE: { + // If it's a range, display the current value + printf(" (FloatRange): Current Value: %.1f (Min: %.1f, Max: " + "%.1f)\n", + section->current_value_index[j] / 10.0f, option->min / 10.0f, + option->max / 10.0f); + break; + } + case MENU_OPTION_SUBMENU: { + // If it's a submenu link, display the name of the linked + // submenu + printf(" (Submenu Link): Links to: %s\n", option->name); + break; + } + case MENU_OPTION_COMMAND: { + // If it's a submenu link, display the name of the linked + // submenu + if (option->command_function == runCustomCommand) + printf(" (Command): Command to run: %s\n", option->read_command); + else + printf(" (Command): %s\n", option->lable); + break; + } + default: { + // Generic case for unsupported option types (if any) + printf(" (Unknown Option Type)\n"); + break; + } + } + } + } + printf("\n=================================\n"); } // Function to run a shell command and capture the output void run_command(const char *command, char *output, int output_size) { - FILE *fp; - printf("Running command: %s\n",command); - if ((fp = popen(command, "r")) == NULL) { - printf("Error running command: %s\n", command); - return; - } - fgets(output, output_size, fp); // Capture output - pclose(fp); + FILE *fp; + printf("Running command: %s\n", command); + if ((fp = popen(command, "r")) == NULL) { + printf("Error running command: %s\n", command); + return; + } + fgets(output, output_size, fp); // Capture output + pclose(fp); } // Function to execute the save command with the given value void save_value_to_system(const char *save_command, const char *value) { - char formatted_command[256]; // Buffer to hold the final formatted command - const char *placeholder = "{}"; // Define the placeholder - const char *placeholder_pos = strstr(save_command, placeholder); // Find the position of the placeholder - - if (placeholder_pos) { - // Copy the part before the placeholder - int prefix_length = placeholder_pos - save_command; - strncpy(formatted_command, save_command, prefix_length); - formatted_command[prefix_length] = '\0'; // Null-terminate the string - - // Append the value - strncat(formatted_command, value, sizeof(formatted_command) - strlen(formatted_command) - 1); - - // Append the part after the placeholder - strncat(formatted_command, placeholder_pos + strlen(placeholder), sizeof(formatted_command) - strlen(formatted_command) - 1); - } else { - // If there's no placeholder, just copy the command as-is - strncpy(formatted_command, save_command, sizeof(formatted_command) - 1); - formatted_command[sizeof(formatted_command) - 1] = '\0'; // Ensure null termination - } - - // Debug print to show the full command that will be executed - printf("Executing command: %s\n", formatted_command); - - // Execute the formatted command - int result = system(formatted_command); - - // Check the result of the system call - if (result != 0) { - printf("Error: Command failed with code %d\n", result); - } + char formatted_command[256]; // Buffer to hold the final formatted command + const char *placeholder = "{}"; // Define the placeholder + const char *placeholder_pos = + strstr(save_command, placeholder); // Find the position of the placeholder + + if (placeholder_pos) { + // Copy the part before the placeholder + int prefix_length = placeholder_pos - save_command; + strncpy(formatted_command, save_command, prefix_length); + formatted_command[prefix_length] = '\0'; // Null-terminate the string + + // Append the value + strncat( + formatted_command, value, sizeof(formatted_command) - strlen(formatted_command) - 1); + + // Append the part after the placeholder + strncat(formatted_command, placeholder_pos + strlen(placeholder), + sizeof(formatted_command) - strlen(formatted_command) - 1); + } else { + // If there's no placeholder, just copy the command as-is + strncpy(formatted_command, save_command, sizeof(formatted_command) - 1); + formatted_command[sizeof(formatted_command) - 1] = '\0'; // Ensure null termination + } + + // Debug print to show the full command that will be executed + printf("Executing command: %s\n", formatted_command); + + // Execute the formatted command + int result = system(formatted_command); + + // Check the result of the system call + if (result != 0) { + printf("Error: Command failed with code %d\n", result); + } } // Function to save all current values of options in a section void save_all_changes() { - MenuSection *section = current_section; - - for (int i = 0; i < section->option_count; i++) { - MenuOption *option = §ion->options[i]; - - // Only attempt to save if there's a save_command - if (strlen(option->save_command) > 0) { - char formatted_command[256]; // Buffer for formatted save command - char value[MAX_VALUE_LENGTH]; // Buffer for current value - - // Get the current value depending on the type of option - switch (option->type) { - case MENU_OPTION_LIST: { - // For list options, get the currently selected value - char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; - int value_count; - split_values(option->values, value_list, &value_count); - strncpy(value, value_list[section->current_value_index[i]], sizeof(value)); - value[sizeof(value) - 1] = '\0'; // Ensure null termination - break; - } - case MENU_OPTION_RANGE: - // For range options, just store the current value as a string - snprintf(value, sizeof(value), "%d", section->current_value_index[i]); - break; - case MENU_OPTION_FLOATRANGE: - // For range options, just store the current value as a string - snprintf(value, sizeof(value), "%.1f", section->current_value_index[i] / 10.0f); - break; - default: - continue; // Skip other option types - } - - // Execute the save command with the formatted value - save_value_to_system(option->save_command, value); - } - } + MenuSection *section = current_section; + + for (int i = 0; i < section->option_count; i++) { + MenuOption *option = §ion->options[i]; + + // Only attempt to save if there's a save_command + if (strlen(option->save_command) > 0) { + char formatted_command[256]; // Buffer for formatted save command + char value[MAX_VALUE_LENGTH]; // Buffer for current value + + // Get the current value depending on the type of option + switch (option->type) { + case MENU_OPTION_LIST: { + // For list options, get the currently selected value + char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; + int value_count; + split_values(option->values, value_list, &value_count); + strncpy(value, value_list[section->current_value_index[i]], sizeof(value)); + value[sizeof(value) - 1] = '\0'; // Ensure null termination + break; + } + case MENU_OPTION_RANGE: + // For range options, just store the current value as a string + snprintf(value, sizeof(value), "%d", section->current_value_index[i]); + break; + case MENU_OPTION_FLOATRANGE: + // For range options, just store the current value as a string + snprintf(value, sizeof(value), "%.1f", section->current_value_index[i] / 10.0f); + break; + default: + continue; // Skip other option types + } + + // Execute the save command with the formatted value + save_value_to_system(option->save_command, value); + } + } } -void add_option(MenuSection *section, const char *name, const char *label, void (*command_function)(void*)) { - MenuOption option; - // Copy name and label dynamically - strncpy(option.name, name, MAX_NAME_LENGTH - 1); - option.name[MAX_NAME_LENGTH - 1] = '\0'; // Ensure null termination - strncpy(option.lable, label, MAX_LABLE_LENGTH - 1); - option.lable[MAX_LABLE_LENGTH - 1] = '\0'; // Ensure null termination - option.type = MENU_OPTION_COMMAND; - option.command_function = command_function; // Function to save all changes - - // Add the save option to the section's list of options - section->options[section->option_count++] = option; +void add_option( + MenuSection *section, const char *name, const char *label, void (*command_function)(void *)) { + MenuOption option; + // Copy name and label dynamically + strncpy(option.name, name, MAX_NAME_LENGTH - 1); + option.name[MAX_NAME_LENGTH - 1] = '\0'; // Ensure null termination + strncpy(option.lable, label, MAX_LABLE_LENGTH - 1); + option.lable[MAX_LABLE_LENGTH - 1] = '\0'; // Ensure null termination + option.type = MENU_OPTION_COMMAND; + option.command_function = command_function; // Function to save all changes + + // Add the save option to the section's list of options + section->options[section->option_count++] = option; } int parse_ini(const char *filename, MenuSystem *menu_system) { - FILE *file = fopen(filename, "r"); - if (!file) { - return -1; // Error opening file - } - - char line[MAX_LINE_LENGTH]; - MenuSection *current_section = NULL; - - menu_system->section_count = 0; - - while (fgets(line, sizeof(line), file)) { - // Remove newline character - line[strcspn(line, "\n")] = 0; - - // Ignore empty lines - if (strlen(line) == 0) { - continue; - } - - // Ignore commented lines - if (line[0] == ';' || line[0] == '#') { - continue; - } - - // Check for section header - if (line[0] == '[') { - current_section = &menu_system->sections[menu_system->section_count++]; - sscanf(line + 1, "%[^]]", current_section->name); - current_section->option_count = 0; - } - // Check for Options - else if (line[0] == 'O') { - char option_name[MAX_NAME_LENGTH]; - char option_lable[MAX_LABLE_LENGTH]; - char option_value[MAX_VALUE_LENGTH]; - char read_command[MAX_VALUE_LENGTH] = ""; - char save_command[MAX_VALUE_LENGTH] = ""; - - // Updated format: Option1=Label:Values:ReadCommand:SaveCommand - sscanf(line, "%[^=]=%[^:]:%[^:]:%[^:]:%[^\n]", option_name, option_lable, option_value, read_command, save_command); - - // Add option to the current section - MenuOption *option = ¤t_section->options[current_section->option_count++]; - strcpy(option->name, option_name); - strcpy(option->lable, option_lable); - strcpy(option->values, option_value); - strcpy(option->read_command, read_command); - strcpy(option->save_command, save_command); - - // Check if the value is a list or a range and initialize current value index - if (strchr(option_value, ',')) { - option->type = MENU_OPTION_LIST; - current_section->current_value_index[current_section->option_count - 1 ] = 0; // Default to the first list item - } else if (strstr(option_value, "-")) { - if (strstr(option_value, ".")) { - option->type = MENU_OPTION_FLOATRANGE; - float min_value, max_value; - sscanf(option_value, "%f-%f", &min_value, &max_value); - option->min = (int)(min_value * 10); - option->max = (int)(max_value * 10); - current_section->current_value_index[current_section->option_count - 1 ] = option->min; // Default to min value - } else { - option->type = MENU_OPTION_RANGE; - sscanf(option_value, "%d-%d", &option->min, &option->max); - current_section->current_value_index[current_section->option_count - 1 ] = option->min; // Default to min value - } - } - // Read Values from system - if (strlen(option->read_command) > 0) { - char output[MAX_VALUE_LENGTH] = ""; - run_command(option->read_command, output, sizeof(output)); - - // Process the output to match the current value index in the list or range - output[strcspn(output, "\n")] = '\0'; // Remove the newline from output - - // For list options, match the output to the corresponding index - switch (option->type) { - case MENU_OPTION_LIST: { - char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; - int value_count; - split_values(option->values, value_list, &value_count); - - for (int i = 0; i < value_count; i++) { - if (strcmp(output, value_list[i]) == 0) { - current_section->current_value_index[current_section->option_count - 1 ] = i; - break; - } - } - break; - } - case MENU_OPTION_RANGE: { - int current_value = atoi(output); - if (current_value >= option->min && current_value <= option->max) { - current_section->current_value_index[current_section->option_count - 1 ] = current_value; - } - break; - } - case MENU_OPTION_FLOATRANGE: { - int current_value = (int)(atof(output) * 10); - if (current_value >= option->min && current_value <= option->max) { - current_section->current_value_index[current_section->option_count - 1 ] = current_value; - } - break; - } - default: - break; - - } - } - - } - // Otherwise it's a submenu - else if (line[0] == 'S') { - char option_name[MAX_NAME_LENGTH]; - char option_lable[MAX_LABLE_LENGTH]; - // Split the line into name and value - sscanf(line, "%[^=]=%[^\n]", option_name, option_lable); - - // Add option to the current section - MenuOption *option = ¤t_section->options[current_section->option_count++]; - option->type = MENU_OPTION_SUBMENU; - strcpy(option->name, option_name); - strcpy(option->lable, option_lable); - } - // parse command only options - else if (line[0] == 'C') { - char option_name[MAX_NAME_LENGTH]; - char option_lable[MAX_LABLE_LENGTH]; - char option_command[MAX_LABLE_LENGTH]; - // Split the line into name and value - sscanf(line, "%[^=]=%[^:]:%[^\n]", option_name, option_lable, option_command); - - // Add option to the current section - MenuOption *option = ¤t_section->options[current_section->option_count++]; - option->type = MENU_OPTION_COMMAND; - strcpy(option->name, option_name); - strcpy(option->lable, option_lable); - strcpy(option->read_command, option_command); //store command in read command, we onle need one - option->command_function = runCustomCommand; - } - } - - // Add programmatic commands - for (int s = 1;ssection_count;s++) { - MenuSection *cs = &menu_system->sections[s]; - add_option(cs,"Save","SAVE",save_all_changes); - } - add_option(&menu_system->sections[0],"Reboot","REBOOT",doreboot); - add_option(&menu_system->sections[0],"Exit","EXIT",exitVTXMenu); - - fclose(file); - return 0; + FILE *file = fopen(filename, "r"); + if (!file) { + return -1; // Error opening file + } + + char line[MAX_LINE_LENGTH]; + MenuSection *current_section = NULL; + + menu_system->section_count = 0; + + while (fgets(line, sizeof(line), file)) { + // Remove newline character + line[strcspn(line, "\n")] = 0; + + // Ignore empty lines + if (strlen(line) == 0) { + continue; + } + + // Ignore commented lines + if (line[0] == ';' || line[0] == '#') { + continue; + } + + // Check for section header + if (line[0] == '[') { + current_section = &menu_system->sections[menu_system->section_count++]; + sscanf(line + 1, "%[^]]", current_section->name); + current_section->option_count = 0; + } + // Check for Options + else if (line[0] == 'O') { + char option_name[MAX_NAME_LENGTH]; + char option_lable[MAX_LABLE_LENGTH]; + char option_value[MAX_VALUE_LENGTH]; + char read_command[MAX_VALUE_LENGTH] = ""; + char save_command[MAX_VALUE_LENGTH] = ""; + + // Updated format: Option1=Label:Values:ReadCommand:SaveCommand + sscanf(line, "%[^=]=%[^:]:%[^:]:%[^:]:%[^\n]", option_name, option_lable, option_value, + read_command, save_command); + + // Add option to the current section + MenuOption *option = ¤t_section->options[current_section->option_count++]; + strcpy(option->name, option_name); + strcpy(option->lable, option_lable); + strcpy(option->values, option_value); + strcpy(option->read_command, read_command); + strcpy(option->save_command, save_command); + + // Check if the value is a list or a range and initialize current + // value index + if (strchr(option_value, ',')) { + option->type = MENU_OPTION_LIST; + current_section->current_value_index[current_section->option_count - 1] = + 0; // Default to the first list item + } else if (strstr(option_value, "-")) { + if (strstr(option_value, ".")) { + option->type = MENU_OPTION_FLOATRANGE; + float min_value, max_value; + sscanf(option_value, "%f-%f", &min_value, &max_value); + option->min = (int)(min_value * 10); + option->max = (int)(max_value * 10); + current_section->current_value_index[current_section->option_count - 1] = + option->min; // Default to min value + } else { + option->type = MENU_OPTION_RANGE; + sscanf(option_value, "%d-%d", &option->min, &option->max); + current_section->current_value_index[current_section->option_count - 1] = + option->min; // Default to min value + } + } + // Read Values from system + if (strlen(option->read_command) > 0) { + char output[MAX_VALUE_LENGTH] = ""; + run_command(option->read_command, output, sizeof(output)); + + // Process the output to match the current value index in the + // list or range + output[strcspn(output, "\n")] = '\0'; // Remove the newline from output + + // For list options, match the output to the corresponding index + switch (option->type) { + case MENU_OPTION_LIST: { + char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH]; + int value_count; + split_values(option->values, value_list, &value_count); + + for (int i = 0; i < value_count; i++) { + if (strcmp(output, value_list[i]) == 0) { + current_section + ->current_value_index[current_section->option_count - 1] = i; + break; + } + } + break; + } + case MENU_OPTION_RANGE: { + int current_value = atoi(output); + if (current_value >= option->min && current_value <= option->max) { + current_section->current_value_index[current_section->option_count - 1] = + current_value; + } + break; + } + case MENU_OPTION_FLOATRANGE: { + int current_value = (int)(atof(output) * 10); + if (current_value >= option->min && current_value <= option->max) { + current_section->current_value_index[current_section->option_count - 1] = + current_value; + } + break; + } + default: + break; + } + } + + } + // Otherwise it's a submenu + else if (line[0] == 'S') { + char option_name[MAX_NAME_LENGTH]; + char option_lable[MAX_LABLE_LENGTH]; + // Split the line into name and value + sscanf(line, "%[^=]=%[^\n]", option_name, option_lable); + + // Add option to the current section + MenuOption *option = ¤t_section->options[current_section->option_count++]; + option->type = MENU_OPTION_SUBMENU; + strcpy(option->name, option_name); + strcpy(option->lable, option_lable); + } + // parse command only options + else if (line[0] == 'C') { + char option_name[MAX_NAME_LENGTH]; + char option_lable[MAX_LABLE_LENGTH]; + char option_command[MAX_LABLE_LENGTH]; + // Split the line into name and value + sscanf(line, "%[^=]=%[^:]:%[^\n]", option_name, option_lable, option_command); + + // Add option to the current section + MenuOption *option = ¤t_section->options[current_section->option_count++]; + option->type = MENU_OPTION_COMMAND; + strcpy(option->name, option_name); + strcpy(option->lable, option_lable); + strcpy(option->read_command, + option_command); // store command in read command, we onle + // need one + option->command_function = runCustomCommand; + } + } + + // Add programmatic commands + for (int s = 1; s < menu_system->section_count; s++) { + MenuSection *cs = &menu_system->sections[s]; + add_option(cs, "Save", "SAVE", save_all_changes); + } + add_option(&menu_system->sections[0], "Reboot", "REBOOT", doreboot); + add_option(&menu_system->sections[0], "Exit", "EXIT", exitVTXMenu); + + fclose(file); + return 0; } diff --git a/osd/util/ini_parser.h b/osd/util/ini_parser.h index a6caea9..aee92dc 100644 --- a/osd/util/ini_parser.h +++ b/osd/util/ini_parser.h @@ -10,43 +10,45 @@ #define MAX_VALUE_LIST_ITEMS 50 typedef enum { - MENU_OPTION_LIST, // For list options - MENU_OPTION_RANGE, // For range options - MENU_OPTION_FLOATRANGE,// For range with floating point precision - MENU_OPTION_SUBMENU, // For linking to a submenu - MENU_OPTION_COMMAND // For executing a command when selected + MENU_OPTION_LIST, // For list options + MENU_OPTION_RANGE, // For range options + MENU_OPTION_FLOATRANGE, // For range with floating point precision + MENU_OPTION_SUBMENU, // For linking to a submenu + MENU_OPTION_COMMAND // For executing a command when selected } MenuOptionType; - typedef struct { - char name[MAX_NAME_LENGTH]; - char lable[MAX_LABLE_LENGTH]; - char values[MAX_VALUE_LENGTH]; // Possible values for list/range - MenuOptionType type; // Holds the type of option (list, range, submenu, or command) - int min; // Min value for range - int max; // Max value for range - char read_command[MAX_VALUE_LENGTH]; // Command to read current system value - char save_command[MAX_VALUE_LENGTH]; // Command to save current system value - // Only used for MENU_OPTION_COMMAND to execute a function - void (*command_function)(void*); // Function pointer for command execution (modified to take void*) + char name[MAX_NAME_LENGTH]; + char lable[MAX_LABLE_LENGTH]; + char values[MAX_VALUE_LENGTH]; // Possible values for list/range + MenuOptionType type; // Holds the type of option (list, range, submenu, or command) + int min; // Min value for range + int max; // Max value for range + char read_command[MAX_VALUE_LENGTH]; // Command to read current system value + char save_command[MAX_VALUE_LENGTH]; // Command to save current system value + // Only used for MENU_OPTION_COMMAND to execute a function + void (*command_function)(void *); // Function pointer for command execution + // (modified to take void*) } MenuOption; - typedef struct { - char name[MAX_NAME_LENGTH]; - char lable[MAX_LABLE_LENGTH]; - int option_count; - MenuOption options[MAX_OPTIONS]; - int current_value_index[MAX_OPTIONS]; // Add this array to store the current value index for each option in this section + char name[MAX_NAME_LENGTH]; + char lable[MAX_LABLE_LENGTH]; + int option_count; + MenuOption options[MAX_OPTIONS]; + int current_value_index[MAX_OPTIONS]; // Add this array to store the current + // value index for each option in this + // section } MenuSection; typedef struct { - MenuSection sections[MAX_SECTIONS]; - int section_count; + MenuSection sections[MAX_SECTIONS]; + int section_count; } MenuSystem; // Function to parse the INI file -void split_values(const char *values, char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH], int *value_count); +void split_values( + const char *values, char value_list[MAX_VALUE_LIST_ITEMS][MAX_VALUE_LENGTH], int *value_count); int parse_ini(const char *filename, MenuSystem *menu_system); void print_menu_system_state(MenuSystem *menu_system); void run_command(const char *command, char *output, int output_size); diff --git a/osd/util/interface.c b/osd/util/interface.c index 394bbe2..089fdc2 100644 --- a/osd/util/interface.c +++ b/osd/util/interface.c @@ -1,152 +1,155 @@ +#include "interface.h" +#include #include #include #include -#include -#include "interface.h" #define BUFFER_SIZE 1024 -FrequencyChannel fc_list[MAX_ENTRIES]; // Array to store frequency-channel pairs +FrequencyChannel fc_list[MAX_ENTRIES]; // Array to store frequency-channel pairs // Function to extract frequency and channel from a line void parse_line(char *line, FrequencyChannel *fc, int *count) { - int frequency = 0; - int channel = 0; - - // Skip lines containing "disabled" - if (strstr(line, "disabled") != NULL) { - return; - } - - // Try to match the line to the format: * MHz [] (dBm info) - if (sscanf(line, " * %d MHz [%d]", &frequency, &channel) == 2) { - // Store the parsed values in the structure - fc[*count].frequency = frequency; - fc[*count].channel = channel; - (*count)++; // Increment the count of entries - } + int frequency = 0; + int channel = 0; + + // Skip lines containing "disabled" + if (strstr(line, "disabled") != NULL) { + return; + } + + // Try to match the line to the format: * MHz [] (dBm + // info) + if (sscanf(line, " * %d MHz [%d]", &frequency, &channel) == 2) { + // Store the parsed values in the structure + fc[*count].frequency = frequency; + fc[*count].channel = channel; + (*count)++; // Increment the count of entries + } } int query_interface_for_available_frequencies() { - FILE *fp; - char buffer[BUFFER_SIZE]; - int count = 0; - int in_frequencies_section = 0; - - // Open a pipe to the `iw list` command - fp = popen("iw list", "r"); - if (fp == NULL) { - perror("popen failed"); - return 1; - } - - // Read the output line by line - while (fgets(buffer, sizeof(buffer), fp) != NULL) { - // Check if we've entered the Frequencies section - if (strstr(buffer, "Frequencies") != NULL) { - in_frequencies_section = 1; - } - - // If we're in the Frequencies section, parse the lines with frequency/channel info - if (in_frequencies_section && strstr(buffer, " MHz [") != NULL) { - parse_line(buffer, fc_list, &count); - } - - // Stop parsing if we hit an empty line after the Frequencies section - if (in_frequencies_section && strlen(buffer) == 1) { - break; - } - } - - // Close the pipe - pclose(fp); - - // Print the stored frequency-channel pairs - printf("Stored Frequency-Channel Pairs:\n"); - for (int i = 0; i < count; i++) { - printf("Frequency: %d MHz, Channel: %d\n", fc_list[i].frequency, fc_list[i].channel); - if (i < FREQ_TABLE_SIZE) { - //printf("Adding Frequency: %d MHz\n", freq); - channelFreqTable[i] = fc_list[i].frequency; - } else { - printf("Skipping Frequency: %d MHz vtxtable is full\n", fc_list[i].frequency); - } - } - - if ( count > 0 ) { - // at least we found one supported channel on the interface - // now our default band names are useless - // fill with gerneric band name - for (int band_index = 0; band_index < FREQ_LABEL_SIZE; band_index += BAND_NAME_LENGTH) { - channelFreqLabel[band_index] = 'B'; - channelFreqLabel[band_index + 1] = 'A'; - channelFreqLabel[band_index + 2] = 'N'; - channelFreqLabel[band_index + 3] = 'D'; - channelFreqLabel[band_index + 4] = ' '; - channelFreqLabel[band_index + 5] = '1' + (band_index / BAND_NAME_LENGTH); // This appends the number '1' through '8' - channelFreqLabel[band_index + 6] = ' '; - channelFreqLabel[band_index + 7] = ' '; - } - // same goes for channel bandLetter - for ( int band_index = 0 ; band_index < BAND_COUNT; band_index++) { - bandLetter[band_index] = '1' + band_index; - } - } - printf("mspVTX: Total %i out of %i used.\n",count,FREQ_TABLE_SIZE); - - return 0; + FILE *fp; + char buffer[BUFFER_SIZE]; + int count = 0; + int in_frequencies_section = 0; + + // Open a pipe to the `iw list` command + fp = popen("iw list", "r"); + if (fp == NULL) { + perror("popen failed"); + return 1; + } + + // Read the output line by line + while (fgets(buffer, sizeof(buffer), fp) != NULL) { + // Check if we've entered the Frequencies section + if (strstr(buffer, "Frequencies") != NULL) { + in_frequencies_section = 1; + } + + // If we're in the Frequencies section, parse the lines with + // frequency/channel info + if (in_frequencies_section && strstr(buffer, " MHz [") != NULL) { + parse_line(buffer, fc_list, &count); + } + + // Stop parsing if we hit an empty line after the Frequencies section + if (in_frequencies_section && strlen(buffer) == 1) { + break; + } + } + + // Close the pipe + pclose(fp); + + // Print the stored frequency-channel pairs + printf("Stored Frequency-Channel Pairs:\n"); + for (int i = 0; i < count; i++) { + printf("Frequency: %d MHz, Channel: %d\n", fc_list[i].frequency, fc_list[i].channel); + if (i < FREQ_TABLE_SIZE) { + // printf("Adding Frequency: %d MHz\n", freq); + channelFreqTable[i] = fc_list[i].frequency; + } else { + printf("Skipping Frequency: %d MHz vtxtable is full\n", fc_list[i].frequency); + } + } + + if (count > 0) { + // at least we found one supported channel on the interface + // now our default band names are useless + // fill with gerneric band name + for (int band_index = 0; band_index < FREQ_LABEL_SIZE; band_index += BAND_NAME_LENGTH) { + channelFreqLabel[band_index] = 'B'; + channelFreqLabel[band_index + 1] = 'A'; + channelFreqLabel[band_index + 2] = 'N'; + channelFreqLabel[band_index + 3] = 'D'; + channelFreqLabel[band_index + 4] = ' '; + channelFreqLabel[band_index + 5] = + '1' + (band_index / BAND_NAME_LENGTH); // This appends the number '1' through '8' + channelFreqLabel[band_index + 6] = ' '; + channelFreqLabel[band_index + 7] = ' '; + } + // same goes for channel bandLetter + for (int band_index = 0; band_index < BAND_COUNT; band_index++) { + bandLetter[band_index] = '1' + band_index; + } + } + printf("mspVTX: Total %i out of %i used.\n", count, FREQ_TABLE_SIZE); + + return 0; } int read_current_freq_from_interface(char *interface) { - FILE *fp; - char command[100]; - char buffer[256]; - const char *freq_keyword = "Frequency:"; - char *freq_start; - float frequency = 0.0; - - // Create the command string dynamically based on the interface - snprintf(command, sizeof(command), "iwconfig %s", interface); - - // Run the iwconfig command and open a pipe to read its output - fp = popen(command, "r"); - if (fp == NULL) { - printf("Failed to run iwconfig on interface %s\n", interface); - return -1; - } - - // Read the command output line by line - while (fgets(buffer, sizeof(buffer), fp) != NULL) { - // Search for the line containing "Frequency:" - freq_start = strstr(buffer, freq_keyword); - if (freq_start) { - freq_start += strlen(freq_keyword); // Move past "Frequency:" - int x = sscanf(freq_start, "%f", &frequency); // Extract the float value - pclose(fp); // Close the pipe - return (int)(frequency * 1000); // Convert GHz to MHz - } - } - - // Close the pipe - pclose(fp); - return -1; // Return -1 if no frequency is found + FILE *fp; + char command[100]; + char buffer[256]; + const char *freq_keyword = "Frequency:"; + char *freq_start; + float frequency = 0.0; + + // Create the command string dynamically based on the interface + snprintf(command, sizeof(command), "iwconfig %s", interface); + + // Run the iwconfig command and open a pipe to read its output + fp = popen(command, "r"); + if (fp == NULL) { + printf("Failed to run iwconfig on interface %s\n", interface); + return -1; + } + + // Read the command output line by line + while (fgets(buffer, sizeof(buffer), fp) != NULL) { + // Search for the line containing "Frequency:" + freq_start = strstr(buffer, freq_keyword); + if (freq_start) { + freq_start += strlen(freq_keyword); // Move past "Frequency:" + int x = sscanf(freq_start, "%f", &frequency); // Extract the float value + pclose(fp); // Close the pipe + return (int)(frequency * 1000); // Convert GHz to MHz + } + } + + // Close the pipe + pclose(fp); + return -1; // Return -1 if no frequency is found } void set_frequency(char *interface, int channel) { - // Create a command string to set the channel using iwconfig - char command[100]; + // Create a command string to set the channel using iwconfig + char command[100]; - // Format the command to set the channel - snprintf(command, sizeof(command), "iwconfig %s channel %d", interface, channel); + // Format the command to set the channel + snprintf(command, sizeof(command), "iwconfig %s channel %d", interface, channel); - // Execute the command - int result = system(command); + // Execute the command + int result = system(command); - // Check if the command was executed successfully - if (result == 0) { - printf("Frequency set successfully on %s to channel %i\n", interface, channel); - } else { - printf("Failed to set channel on %s\n", interface); - } + // Check if the command was executed successfully + if (result == 0) { + printf("Frequency set successfully on %s to channel %i\n", interface, channel); + } else { + printf("Failed to set channel on %s\n", interface); + } } diff --git a/osd/util/interface.h b/osd/util/interface.h index c7275bd..983971d 100644 --- a/osd/util/interface.h +++ b/osd/util/interface.h @@ -1,8 +1,8 @@ #pragma once -#include #include "../msp/msp.h" +#include -#define MAX_ENTRIES 100 // Maximum number of frequency-channel pairs to store +#define MAX_ENTRIES 100 // Maximum number of frequency-channel pairs to store extern uint8_t channelFreqLabel[FREQ_TABLE_SIZE]; extern uint8_t bandLetter[BAND_COUNT]; @@ -10,8 +10,8 @@ extern uint16_t channelFreqTable[FREQ_TABLE_SIZE]; // Structure to hold frequency and channel typedef struct { - int frequency; - int channel; + int frequency; + int channel; } FrequencyChannel; // Function to extract frequency and channel from a line diff --git a/osd/util/settings.c b/osd/util/settings.c index 5865407..d0da2f5 100644 --- a/osd/util/settings.c +++ b/osd/util/settings.c @@ -1,94 +1,94 @@ +#include "settings.h" #include #include -#include "settings.h" -// Function to read a value for a given key from the config file (dynamically allocate memory) -char* read_setting(const char *filename, char *key) { - FILE *file = fopen(filename, "r"); - if (file == NULL) { - printf("Error: Could not open file %s\n", filename); - return NULL; - } - - char line[MAX_LINE_LENGTH]; - char *value = NULL; - - while (fgets(line, sizeof(line), file)) { - // Ignore comment lines starting with '#' - if (line[0] == '#') { - continue; - } - - char file_key[MAX_LINE_LENGTH]; - char file_value[MAX_LINE_LENGTH]; - - // Parse key=value pairs from the file - if (sscanf(line, "%[^=]=%s", file_key, file_value) == 2) { - // Check if the key matches - if (strcmp(file_key, key) == 0) { - // Dynamically allocate memory for the value - value = strdup(file_value); // or custom memory allocation - fclose(file); - return value; - } - } - } - - fclose(file); - printf("Error: Key %s not found in file\n", key); - return NULL; +// Function to read a value for a given key from the config file (dynamically +// allocate memory) +char *read_setting(const char *filename, char *key) { + FILE *file = fopen(filename, "r"); + if (file == NULL) { + printf("Error: Could not open file %s\n", filename); + return NULL; + } + + char line[MAX_LINE_LENGTH]; + char *value = NULL; + + while (fgets(line, sizeof(line), file)) { + // Ignore comment lines starting with '#' + if (line[0] == '#') { + continue; + } + + char file_key[MAX_LINE_LENGTH]; + char file_value[MAX_LINE_LENGTH]; + + // Parse key=value pairs from the file + if (sscanf(line, "%[^=]=%s", file_key, file_value) == 2) { + // Check if the key matches + if (strcmp(file_key, key) == 0) { + // Dynamically allocate memory for the value + value = strdup(file_value); // or custom memory allocation + fclose(file); + return value; + } + } + } + + fclose(file); + printf("Error: Key %s not found in file\n", key); + return NULL; } - // Function to update or add a key-value pair in the config file int write_setting(const char *filename, const char *key, const char *new_value) { - // Create a temp file in the same directory as the original file - char temp_filename[MAX_LINE_LENGTH]; - snprintf(temp_filename, sizeof(temp_filename), "%s.tmp", filename); - - FILE *file = fopen(filename, "r"); - FILE *temp_file = fopen(temp_filename, "w"); - - if (file == NULL || temp_file == NULL) { - printf("Error: Could not open file\n"); - return -1; - } - - char line[MAX_LINE_LENGTH]; - int found_key = 0; - - while (fgets(line, sizeof(line), file)) { - char file_key[MAX_LINE_LENGTH]; - char file_value[MAX_LINE_LENGTH]; - - // If it's a key=value line, check if the key matches - if (sscanf(line, "%[^=]=%s", file_key, file_value) == 2) { - if (strcmp(file_key, key) == 0) { - // Write the updated key=value pair - fprintf(temp_file, "%s=%s\n", key, new_value); - found_key = 1; - } else { - // Otherwise, copy the line as is - fprintf(temp_file, "%s", line); - } - } else { - // Copy comments and other non key-value lines - fprintf(temp_file, "%s", line); - } - } - - // If key was not found, append it at the end - if (!found_key) { - fprintf(temp_file, "%s=%s\n", key, new_value); - } - - fclose(file); - fclose(temp_file); - - // Replace original file with updated file - remove(filename); - rename(temp_filename, filename); - - return 0; + // Create a temp file in the same directory as the original file + char temp_filename[MAX_LINE_LENGTH]; + snprintf(temp_filename, sizeof(temp_filename), "%s.tmp", filename); + + FILE *file = fopen(filename, "r"); + FILE *temp_file = fopen(temp_filename, "w"); + + if (file == NULL || temp_file == NULL) { + printf("Error: Could not open file\n"); + return -1; + } + + char line[MAX_LINE_LENGTH]; + int found_key = 0; + + while (fgets(line, sizeof(line), file)) { + char file_key[MAX_LINE_LENGTH]; + char file_value[MAX_LINE_LENGTH]; + + // If it's a key=value line, check if the key matches + if (sscanf(line, "%[^=]=%s", file_key, file_value) == 2) { + if (strcmp(file_key, key) == 0) { + // Write the updated key=value pair + fprintf(temp_file, "%s=%s\n", key, new_value); + found_key = 1; + } else { + // Otherwise, copy the line as is + fprintf(temp_file, "%s", line); + } + } else { + // Copy comments and other non key-value lines + fprintf(temp_file, "%s", line); + } + } + + // If key was not found, append it at the end + if (!found_key) { + fprintf(temp_file, "%s=%s\n", key, new_value); + } + + fclose(file); + fclose(temp_file); + + // Replace original file with updated file + remove(filename); + rename(temp_filename, filename); + + return 0; } diff --git a/osd/util/settings.h b/osd/util/settings.h index 2631303..8667be6 100644 --- a/osd/util/settings.h +++ b/osd/util/settings.h @@ -3,5 +3,5 @@ #define MAX_LINE_LENGTH 256 -char* read_setting(const char *filename, char *key); +char *read_setting(const char *filename, char *key); int write_setting(const char *filename, const char *key, const char *new_value); diff --git a/osd/util/time_util.h b/osd/util/time_util.h index 10da606..ce076c5 100644 --- a/osd/util/time_util.h +++ b/osd/util/time_util.h @@ -1,13 +1,13 @@ #pragma once -#include #include +#include #define NSEC_PER_SEC 1000000000 #define MSEC_PER_SEC 1000 -static inline void timespec_subtract(struct timespec *res, const struct timespec *a, const struct timespec *b) -{ +static inline void timespec_subtract( + struct timespec *res, const struct timespec *a, const struct timespec *b) { res->tv_sec = a->tv_sec - b->tv_sec; res->tv_nsec = a->tv_nsec - b->tv_nsec; if (res->tv_nsec < 0) { @@ -16,8 +16,7 @@ static inline void timespec_subtract(struct timespec *res, const struct timespec } } -static inline int64_t timespec_subtract_ns(const struct timespec *a, const struct timespec *b) -{ +static inline int64_t timespec_subtract_ns(const struct timespec *a, const struct timespec *b) { struct timespec res; timespec_subtract(&res, a, b); return (int64_t)res.tv_sec * NSEC_PER_SEC + res.tv_nsec;