[Bf-blender-cvs] [934c2c8ac58] master: Cleanup: clang-tidy, remove invalid comments
Campbell Barton
noreply at git.blender.org
Thu Nov 12 05:18:25 CET 2020
Commit: 934c2c8ac58c10a2b729435c40c96443371bc21b
Author: Campbell Barton
Date: Thu Nov 12 15:17:07 2020 +1100
Branches: master
https://developer.blender.org/rB934c2c8ac58c10a2b729435c40c96443371bc21b
Cleanup: clang-tidy, remove invalid comments
===================================================================
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/intern/dds/dds_api.cpp
M source/blender/imbuf/intern/dds/dds_api.h
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 0459d669789..23a92903d66 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -538,7 +538,9 @@ bool outliner_tree_traverse(const SpaceOutliner *space_outliner,
float outliner_restrict_columns_width(const struct SpaceOutliner *space_outliner);
TreeElement *outliner_find_element_with_flag(const ListBase *lb, short flag);
bool outliner_is_element_visible(const TreeElement *te);
-void outliner_scroll_view(struct SpaceOutliner *space_outliner, struct ARegion *region, int delta_y);
+void outliner_scroll_view(struct SpaceOutliner *space_outliner,
+ struct ARegion *region,
+ int delta_y);
void outliner_tag_redraw_avoid_rebuild_on_open_change(const struct SpaceOutliner *space_outliner,
struct ARegion *region);
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index d947f4229a0..957352595ed 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -475,7 +475,7 @@ bool IMB_prepare_write_ImBuf(const bool isfloat, struct ImBuf *ibuf);
*/
bool IMB_ispic(const char *filepath);
bool IMB_ispic_type_matches(const char *filepath, int filetype);
-int IMB_ispic_type_from_memory(const unsigned char *mem, const size_t mem_size);
+int IMB_ispic_type_from_memory(const unsigned char *buf, const size_t buf_size);
int IMB_ispic_type(const char *filepath);
/**
diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp
index 5687824f9fd..804d8130b4c 100644
--- a/source/blender/imbuf/intern/dds/dds_api.cpp
+++ b/source/blender/imbuf/intern/dds/dds_api.cpp
@@ -72,7 +72,6 @@ bool imb_save_dds(struct ImBuf *ibuf, const char *name, int /*flags*/)
return true;
}
-/* note: use at most first 32 bytes */
bool imb_is_a_dds(const unsigned char *mem, const size_t size)
{
if (size < 8) {
diff --git a/source/blender/imbuf/intern/dds/dds_api.h b/source/blender/imbuf/intern/dds/dds_api.h
index 9020529f210..931c4f267f9 100644
--- a/source/blender/imbuf/intern/dds/dds_api.h
+++ b/source/blender/imbuf/intern/dds/dds_api.h
@@ -26,7 +26,6 @@
extern "C" {
#endif
-/* use only first 32 bytes of mem */
bool imb_is_a_dds(const unsigned char *mem, const size_t size);
bool imb_save_dds(struct ImBuf *ibuf, const char *name, int flags);
struct ImBuf *imb_load_dds(const unsigned char *mem,
More information about the Bf-blender-cvs
mailing list