diff options
Diffstat (limited to 'source/blender/blenkernel/intern/icons.cc')
-rw-r--r-- | source/blender/blenkernel/intern/icons.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/icons.cc b/source/blender/blenkernel/intern/icons.cc index f59f5352aad..7fd0515b52c 100644 --- a/source/blender/blenkernel/intern/icons.cc +++ b/source/blender/blenkernel/intern/icons.cc @@ -479,7 +479,7 @@ PreviewImage *BKE_previewimg_cached_thumbnail_read(const char *name, if (prv && force_update) { const char *prv_deferred_data = (char *)PRV_DEFERRED_DATA(prv); - if (((int)prv_deferred_data[0] == source) && STREQ(&prv_deferred_data[1], filepath)) { + if ((int(prv_deferred_data[0]) == source) && STREQ(&prv_deferred_data[1], filepath)) { /* If same filepath, no need to re-allocate preview, just clear it up. */ BKE_previewimg_clear(prv); } @@ -530,7 +530,7 @@ void BKE_previewimg_ensure(PreviewImage *prv, const int size) thumb = IMB_thumb_manage(filepath, THB_LARGE, (ThumbSource)source); if (thumb) { - /* PreviewImage assumes premultiplied alhpa... */ + /* #PreviewImage assumes pre-multiplied alpha. */ IMB_premultiply_alpha(thumb); if (do_preview) { @@ -566,9 +566,9 @@ void BKE_previewimg_ensure(PreviewImage *prv, const int size) ImBuf *BKE_previewimg_to_imbuf(PreviewImage *prv, const int size) { - const unsigned int w = prv->w[size]; - const unsigned int h = prv->h[size]; - const unsigned int *rect = prv->rect[size]; + const uint w = prv->w[size]; + const uint h = prv->h[size]; + const uint *rect = prv->rect[size]; ImBuf *ima = nullptr; @@ -971,8 +971,8 @@ struct Icon_Geom *BKE_icon_geom_from_memory(uchar *data, size_t data_len) p += 4; struct Icon_Geom *geom = (struct Icon_Geom *)MEM_mallocN(sizeof(*geom), __func__); - geom->coords_range[0] = (int)*p++; - geom->coords_range[1] = (int)*p++; + geom->coords_range[0] = int(*p++); + geom->coords_range[1] = int(*p++); /* x, y ignored for now */ p += 2; |