mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[winpr,image] add winpr_bitmap_write_ex

Browse Source 
Added a helper function writing a bitmap from an image that has a stride
that is not width * <bytes per pixel>
This commit is contained in:
akallabeth 2022-12-16 10:08:02 +01:00 committed by Martin Fleisz
parent 9d6a06a197
commit 784becd946
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winpr/include/winpr/image.h
View File

@ -83,6 +83,8 @@ extern "C"
WINPR_API int winpr_bitmap_write(const char* filename, const BYTE* data, size_t width, WINPR_API int winpr_bitmap_write(const char* filename, const BYTE* data, size_t width,
size_t height, size_t bpp); size_t height, size_t bpp);
WINPR_API int winpr_bitmap_write_ex(const char* filename, const BYTE* data, size_t stride,
size_t width, size_t height, size_t bpp);
WINPR_API BYTE* winpr_bitmap_construct_header(size_t width, size_t height, size_t bpp); WINPR_API BYTE* winpr_bitmap_construct_header(size_t width, size_t height, size_t bpp);
WINPR_API int winpr_image_write(wImage* image, const char* filename); WINPR_API int winpr_image_write(wImage* image, const char* filename);

21
winpr/libwinpr/utils/image.c
View File

@ -151,10 +151,19 @@ fail:
int winpr_bitmap_write(const char* filename, const BYTE* data, size_t width, size_t height, int winpr_bitmap_write(const char* filename, const BYTE* data, size_t width, size_t height,
size_t bpp) size_t bpp)
{
return winpr_bitmap_write_ex(filename, data, 0, width, height, bpp);
}
int winpr_bitmap_write_ex(const char* filename, const BYTE* data, size_t stride, size_t width,
size_t height, size_t bpp)
{ {
FILE* fp; FILE* fp;
BYTE* bmp_header = NULL; BYTE* bmp_header = NULL;
size_t img_size = width * height * (bpp / 8); const size_t bpp_stride = width * (bpp / 8);
if (stride == 0)
stride = bpp_stride;
int ret = -1; int ret = -1;
fp = winpr_fopen(filename, "w+b"); fp = winpr_fopen(filename, "w+b");
@ -169,10 +178,16 @@ int winpr_bitmap_write(const char* filename, const BYTE* data, size_t width, siz
if (!bmp_header) if (!bmp_header)
goto fail; goto fail;
if (fwrite(bmp_header, WINPR_IMAGE_BMP_HEADER_LEN, 1, fp) != 1 || if (fwrite(bmp_header, WINPR_IMAGE_BMP_HEADER_LEN, 1, fp) != 1)
fwrite((const void*)data, img_size, 1, fp) != 1)
goto fail; goto fail;
for (size_t y = 0; y < height; y++)
{
const void* line = &data[stride * y];
if (fwrite(line, bpp_stride, 1, fp) != 1)
goto fail;
}
ret = 1; ret = 1;
fail: fail:
fclose(fp); fclose(fp);