griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: quite MSVC warning in datatoc_icon.cc

Browse Source
This commit is contained in:
Campbell Barton
2023-07-31 09:58:39 +10:00
parent f324cbf2a6
commit d5fc5c5a04
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/datatoc/datatoc_icon.cc
View File

@@ -33,6 +33,20 @@
# define SEP '/'
#endif
/* -------------------------------------------------------------------- */
/** \name Endian Defines
* \{ */
#define L_ENDIAN 1
#define B_ENDIAN 0
#ifdef __BIG_ENDIAN__
# define ENDIAN_ORDER B_ENDIAN
#else
# define ENDIAN_ORDER L_ENDIAN
#endif
/** \} */
/* -------------------------------------------------------------------- */
/** \name Utility Functions
* \{ */
@@ -155,9 +169,9 @@ static bool write_png(const char *filepath, const uint *pixels, const int width,
/* write the file header information */
png_write_info(png_ptr, info_ptr);
#ifdef __LITTLE_ENDIAN__
png_set_swap(png_ptr);
#endif
if (ENDIAN_ORDER == L_ENDIAN) {
png_set_swap(png_ptr);
}
/* allocate memory for an array of row-pointers */
row_pointers = (png_bytepp)malloc(height * sizeof(png_bytep));
@@ -272,20 +286,17 @@ static void icon_merge_context_free(IconMergeContext *context)
static bool icon_decode_head(FILE *f_src, IconHead *r_head)
{
if (fread(r_head, 1, sizeof(*r_head), f_src) == sizeof(*r_head)) {
#ifndef __LITTLE_ENDIAN__
endian_switch_uint32(&r_head->icon_w);
endian_switch_uint32(&r_head->icon_h);
endian_switch_uint32(&r_head->orig_x);
endian_switch_uint32(&r_head->orig_y);
endian_switch_uint32(&r_head->canvas_w);
endian_switch_uint32(&r_head->canvas_h);
#endif
if (ENDIAN_ORDER == B_ENDIAN) {
endian_switch_uint32(&r_head->icon_w);
endian_switch_uint32(&r_head->icon_h);
endian_switch_uint32(&r_head->orig_x);
endian_switch_uint32(&r_head->orig_y);
endian_switch_uint32(&r_head->canvas_w);
endian_switch_uint32(&r_head->canvas_h);
}
return true;
}
/* quiet warning */
(void)endian_switch_uint32;
return false;
}