From b3f78d2f4d8f524e705c42e6aea55c6082dee87f Mon Sep 17 00:00:00 2001 From: kubistika Date: Mon, 2 Sep 2019 16:02:55 +0300 Subject: [PATCH] winpr: utils: image: fix const correctness --- winpr/include/winpr/image.h | 4 ++-- winpr/libwinpr/utils/image.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/winpr/include/winpr/image.h b/winpr/include/winpr/image.h index ecdba60cf..be784717c 100644 --- a/winpr/include/winpr/image.h +++ b/winpr/include/winpr/image.h @@ -82,12 +82,12 @@ typedef struct _wImage wImage; extern "C" { #endif -WINPR_API int winpr_bitmap_write(const char* filename, BYTE* data, int width, int height, int bpp); +WINPR_API int winpr_bitmap_write(const char* filename, const BYTE* data, int width, int height, int bpp); WINPR_API int winpr_image_write(wImage* image, const char* filename); WINPR_API int winpr_image_read(wImage* image, const char* filename); -WINPR_API int winpr_image_read_buffer(wImage* image, BYTE* buffer, int size); +WINPR_API int winpr_image_read_buffer(wImage* image, const BYTE* buffer, int size); WINPR_API wImage* winpr_image_new(); WINPR_API void winpr_image_free(wImage* image, BOOL bFreeBuffer); diff --git a/winpr/libwinpr/utils/image.c b/winpr/libwinpr/utils/image.c index d98243c67..cb60d814e 100644 --- a/winpr/libwinpr/utils/image.c +++ b/winpr/libwinpr/utils/image.c @@ -104,7 +104,7 @@ static BOOL readBitmapInfoHeader(wStream* s, WINPR_BITMAP_INFO_HEADER* bi) * Refer to "Compressed Image File Formats: JPEG, PNG, GIF, XBM, BMP" book */ -int winpr_bitmap_write(const char* filename, BYTE* data, int width, int height, int bpp) +int winpr_bitmap_write(const char* filename, const BYTE* data, int width, int height, int bpp) { FILE* fp; WINPR_BITMAP_FILE_HEADER bf; @@ -214,7 +214,7 @@ static int winpr_image_png_read_fp(wImage* image, FILE* fp) return 1; } -static int winpr_image_png_read_buffer(wImage* image, BYTE* buffer, size_t size) +static int winpr_image_png_read_buffer(wImage* image, const BYTE* buffer, size_t size) { UINT32 width; UINT32 height; @@ -318,7 +318,7 @@ fail: return 1; } -static int winpr_image_bitmap_read_buffer(wImage* image, BYTE* buffer, size_t size) +static int winpr_image_bitmap_read_buffer(wImage* image, const BYTE* buffer, size_t size) { int rc = -1; int index; @@ -326,7 +326,7 @@ static int winpr_image_bitmap_read_buffer(wImage* image, BYTE* buffer, size_t si BYTE* pDstData; WINPR_BITMAP_FILE_HEADER bf; WINPR_BITMAP_INFO_HEADER bi; - wStream* s = Stream_New(buffer, size); + wStream* s = Stream_New((BYTE*) buffer, size); if (!s) return -1; @@ -425,7 +425,7 @@ int winpr_image_read(wImage* image, const char* filename) return status; } -int winpr_image_read_buffer(wImage* image, BYTE* buffer, int size) +int winpr_image_read_buffer(wImage* image, const BYTE* buffer, int size) { BYTE sig[8]; int status = -1;