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

Cleanup: various non-functional C++ changes

Browse Source
This commit is contained in:
Campbell Barton
2024-02-04 23:41:16 +11:00
parent 47cf827049
commit 80906eb02e
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenlib/intern/hash_md5.cc
View File

@@ -84,7 +84,7 @@ static const unsigned char fillbuf[64] = {0x80, 0 /* , 0, 0, ... */};
* Initialize structure containing state of computation.
* (RFC 1321, 3.3: Step 3)
*/
static void md5_init_ctx(struct md5_ctx *ctx)
static void md5_init_ctx(md5_ctx *ctx)
{
ctx->A = 0x67452301;
ctx->B = 0xefcdab89;
@@ -97,7 +97,7 @@ static void md5_init_ctx(struct md5_ctx *ctx)
* this function updates the 'ctx' context for the next 'len' bytes starting at 'buffer'.
* It is necessary that 'len' is a multiple of 64!!!
*/
static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ctx)
static void md5_process_block(const void *buffer, size_t len, md5_ctx *ctx)
{
/* These are the four functions used in the four steps of the MD5 algorithm and defined in the
* RFC 1321. The first function is a little bit optimized
@@ -257,7 +257,7 @@ static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ct
* The result is always in little endian byte order,
* so that a byte-wise output yields to the wanted ASCII representation of the message digest.
*/
static void *md5_read_ctx(const struct md5_ctx *ctx, void *resbuf)
static void *md5_read_ctx(const md5_ctx *ctx, void *resbuf)
{
md5_uint32 *digest = static_cast<md5_uint32 *>(resbuf);
digest[0] = SWAP(ctx->A);
@@ -274,7 +274,7 @@ Top level public functions. */
int BLI_hash_md5_stream(FILE *stream, void *resblock)
{
#define BLOCKSIZE 4096 /* IMPORTANT: must be a multiple of 64. */
struct md5_ctx ctx;
md5_ctx ctx;
md5_uint32 len[2];
char buffer[BLOCKSIZE + 72];
size_t pad, sum;
@@ -346,7 +346,7 @@ int BLI_hash_md5_stream(FILE *stream, void *resblock)
void *BLI_hash_md5_buffer(const char *buffer, size_t len, void *resblock)
{
struct md5_ctx ctx;
md5_ctx ctx;
char restbuf[64 + 72];
size_t blocks = len & ~63;
size_t pad, rest;

3
source/blender/editors/sculpt_paint/paint_stroke.cc
View File

@@ -920,7 +920,8 @@ PaintStroke *paint_stroke_new(bContext *C,
ups->colorspace = nullptr;
if (br->mtex.tex && br->mtex.tex->type == TEX_IMAGE && br->mtex.tex->ima) {
ImBuf *tex_ibuf = BKE_image_pool_acquire_ibuf(br->mtex.tex->ima, &br->mtex.tex->iuser, NULL);
ImBuf *tex_ibuf = BKE_image_pool_acquire_ibuf(
br->mtex.tex->ima, &br->mtex.tex->iuser, nullptr);
if (tex_ibuf && tex_ibuf->float_buffer.data == nullptr) {
ups->do_linear_conversion = true;
ups->colorspace = tex_ibuf->byte_buffer.colorspace;

4
source/blender/editors/space_view3d/view3d_gizmo_navigate.cc
View File

@@ -207,8 +207,8 @@ static void WIDGETGROUP_navigate_setup(const bContext *C, wmGizmoGroup *gzgroup)
}
wmOperatorType *ot = WM_operatortype_find(info->opname, true);
PointerRNA *ptr = WM_gizmo_operator_set(gz, 0, ot, NULL);
if (info->op_prop_fn != NULL) {
PointerRNA *ptr = WM_gizmo_operator_set(gz, 0, ot, nullptr);
if (info->op_prop_fn != nullptr) {
info->op_prop_fn(ptr);
}
}