[Bf-blender-cvs] [a3d0b50d750] master: Cleanup: use underscore suffix for private data members

Manuel Castilla noreply at git.blender.org
Sat Oct 23 22:10:08 CEST 2021


Commit: a3d0b50d75030dd3d75056dd6722403ad5258a5d
Author: Manuel Castilla
Date:   Sat Oct 23 20:52:30 2021 +0200
Branches: master
https://developer.blender.org/rBa3d0b50d75030dd3d75056dd6722403ad5258a5d

Cleanup: use underscore suffix for private data members

===================================================================

M	source/blender/compositor/operations/COM_DenoiseOperation.cc

===================================================================

diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.cc b/source/blender/compositor/operations/COM_DenoiseOperation.cc
index 14822e9a49c..0174c50450c 100644
--- a/source/blender/compositor/operations/COM_DenoiseOperation.cc
+++ b/source/blender/compositor/operations/COM_DenoiseOperation.cc
@@ -44,8 +44,8 @@ bool COM_is_denoise_supported()
 class DenoiseFilter {
  private:
 #ifdef WITH_OPENIMAGEDENOISE
-  oidn::DeviceRef device;
-  oidn::FilterRef filter;
+  oidn::DeviceRef device_;
+  oidn::FilterRef filter_;
 #endif
   bool initialized_ = false;
 
@@ -63,10 +63,10 @@ class DenoiseFilter {
      * nonetheless. */
     BLI_mutex_lock(&oidn_lock);
 
-    device = oidn::newDevice();
-    device.set("setAffinity", false);
-    device.commit();
-    filter = device.newFilter("RT");
+    device_ = oidn::newDevice();
+    device_.set("setAffinity", false);
+    device_.commit();
+    filter_ = device_.newFilter("RT");
     initialized_ = true;
     set_image("output", output);
   }
@@ -81,26 +81,26 @@ class DenoiseFilter {
   {
     BLI_assert(initialized_);
     BLI_assert(!buffer->is_a_single_elem());
-    filter.setImage(name.data(),
-                    buffer->get_buffer(),
-                    oidn::Format::Float3,
-                    buffer->get_width(),
-                    buffer->get_height(),
-                    0,
-                    buffer->get_elem_bytes_len());
+    filter_.setImage(name.data(),
+                     buffer->get_buffer(),
+                     oidn::Format::Float3,
+                     buffer->get_width(),
+                     buffer->get_height(),
+                     0,
+                     buffer->get_elem_bytes_len());
   }
 
   template<typename T> void set(const StringRef option_name, T value)
   {
     BLI_assert(initialized_);
-    filter.set(option_name.data(), value);
+    filter_.set(option_name.data(), value);
   }
 
   void execute()
   {
     BLI_assert(initialized_);
-    filter.commit();
-    filter.execute();
+    filter_.commit();
+    filter_.execute();
   }
 
 #else



More information about the Bf-blender-cvs mailing list