[Bf-blender-cvs] [961d38f8fd5] compositor-full-frame: Fix missing const

Manuel Castilla noreply at git.blender.org
Thu Jul 29 22:36:41 CEST 2021


Commit: 961d38f8fd5354b81e019a36e52e45ddb7bd5148
Author: Manuel Castilla
Date:   Thu Jul 29 18:50:00 2021 +0200
Branches: compositor-full-frame
https://developer.blender.org/rB961d38f8fd5354b81e019a36e52e45ddb7bd5148

Fix missing const

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

M	source/blender/compositor/intern/COM_MemoryBuffer.cc
M	source/blender/compositor/intern/COM_MemoryBuffer.h

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

diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cc b/source/blender/compositor/intern/COM_MemoryBuffer.cc
index 85dac123a63..6a019a01b81 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cc
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cc
@@ -407,12 +407,12 @@ void MemoryBuffer::addPixel(int x, int y, const float color[4])
 
 static void read_ewa_elem(void *userdata, int x, int y, float result[4])
 {
-  MemoryBuffer *buffer = (MemoryBuffer *)userdata;
+  const MemoryBuffer *buffer = static_cast<const MemoryBuffer *>(userdata);
   buffer->read_elem_checked(x, y, result);
 }
 
 void MemoryBuffer::read_elem_filtered(
-    const float x, const float y, float dx[2], float dy[2], float *out)
+    const float x, const float y, float dx[2], float dy[2], float *out) const
 {
   BLI_assert(this->m_datatype == DataType::Color);
   if (m_is_a_single_elem) {
@@ -438,7 +438,7 @@ void MemoryBuffer::read_elem_filtered(
                    du_normal,
                    dv_normal,
                    read_ewa_elem,
-                   this,
+                   const_cast<MemoryBuffer *>(this),
                    out);
   }
 }
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index 0488adfd26c..f23adee6d1d 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -250,7 +250,8 @@ class MemoryBuffer {
     }
   }
 
-  void read_elem_filtered(const float x, const float y, float dx[2], float dy[2], float *out);
+  void read_elem_filtered(
+      const float x, const float y, float dx[2], float dy[2], float *out) const;
 
   /**
    * Get channel value at given coordinates.



More information about the Bf-blender-cvs mailing list