diff options
Diffstat (limited to 'source/blender/compositor')
18 files changed, 25 insertions, 26 deletions
diff --git a/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp b/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp index e95dd4233c4..b111fba44b7 100644 --- a/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp +++ b/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp @@ -17,7 +17,7 @@ */ #include "COM_ChunkOrderHotspot.h" -#include <math.h> +#include <cmath> ChunkOrderHotspot::ChunkOrderHotspot(int x, int y, float addition) { diff --git a/source/blender/compositor/intern/COM_CompositorContext.cpp b/source/blender/compositor/intern/COM_CompositorContext.cpp index 52e705ffb79..2e168221b7b 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.cpp +++ b/source/blender/compositor/intern/COM_CompositorContext.cpp @@ -18,7 +18,7 @@ #include "COM_CompositorContext.h" #include "COM_defines.h" -#include <stdio.h> +#include <cstdio> CompositorContext::CompositorContext() { diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp index 9b3355f535a..d8f67571ee5 100644 --- a/source/blender/compositor/intern/COM_Converter.cpp +++ b/source/blender/compositor/intern/COM_Converter.cpp @@ -16,7 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#include <string.h> +#include <cstring> #include "DNA_node_types.h" diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index 27cec28f5d5..b026d2e60d9 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -17,9 +17,9 @@ */ #include <algorithm> -#include <math.h> +#include <cmath> +#include <cstdlib> #include <sstream> -#include <stdlib.h> #include "atomic_ops.h" diff --git a/source/blender/compositor/intern/COM_Node.cpp b/source/blender/compositor/intern/COM_Node.cpp index 74aefaf0e6d..897d4e1df02 100644 --- a/source/blender/compositor/intern/COM_Node.cpp +++ b/source/blender/compositor/intern/COM_Node.cpp @@ -16,7 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#include <string.h> +#include <cstring> #include "BKE_node.h" diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp index 0842721a9e5..1a30806f28c 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.cpp +++ b/source/blender/compositor/intern/COM_NodeOperation.cpp @@ -16,7 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#include <stdio.h> +#include <cstdio> #include <typeinfo> #include "COM_ExecutionSystem.h" diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp index 1237e728079..35a3314db3b 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp @@ -304,7 +304,7 @@ void NodeOperationBuilder::add_operation_input_constants() /* Note: unconnected inputs cached first to avoid modifying * m_operations while iterating over it */ - typedef std::vector<NodeOperationInput *> Inputs; + using Inputs = std::vector<NodeOperationInput *>; Inputs pending_inputs; for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) { NodeOperation *op = *it; @@ -597,7 +597,7 @@ void NodeOperationBuilder::add_complex_operation_buffers() } } -typedef std::set<NodeOperation *> Tags; +using Tags = std::set<NodeOperation *>; static void find_reachable_operations_recursive(Tags &reachable, NodeOperation *op) { diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp b/source/blender/compositor/intern/COM_OpenCLDevice.cpp index 51ae9d6652e..acfe800e433 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp +++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp @@ -19,7 +19,7 @@ #include "COM_OpenCLDevice.h" #include "COM_WorkScheduler.h" -typedef enum COM_VendorID { NVIDIA = 0x10DE, AMD = 0x1002 } COM_VendorID; +enum COM_VendorID { NVIDIA = 0x10DE, AMD = 0x1002 }; const cl_image_format IMAGE_FORMAT_COLOR = { CL_RGBA, CL_FLOAT, diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 450b64eec5a..f726caa3d66 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ +#include <cstdio> #include <list> -#include <stdio.h> #include "COM_CPUDevice.h" #include "COM_OpenCLDevice.h" diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp index 74f5fceacfb..b2dfb558028 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp @@ -330,11 +330,11 @@ void DilateStepOperation::initExecution() } // small helper to pass data from initializeTileData to executePixel -typedef struct tile_info { +struct tile_info { rcti rect; int width; float *buffer; -} tile_info; +}; static tile_info *create_cache(int xmin, int xmax, int ymin, int ymax) { diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp index 7ef0d7b7606..fbbd373ba09 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp @@ -16,7 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#include <stdlib.h> +#include <cstdlib> #include "BLI_math.h" #include "COM_DoubleEdgeMaskOperation.h" diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp index e87d40b4c86..157c595afcb 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp @@ -16,7 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#include <limits.h> +#include <climits> #include "BLI_utildefines.h" #include "COM_FastGaussianBlurOperation.h" diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp index acc1dddacdd..362905761bb 100644 --- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp +++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp @@ -23,7 +23,7 @@ * 2D Fast Hartley Transform, used for convolution */ -typedef float fREAL; +using fREAL = float; // returns next highest power of 2 of x, as well its log2 in L2 static unsigned int nextPow2(unsigned int x, unsigned int *L2) diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp index f7fabfb9572..21d9177ddd5 100644 --- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp @@ -19,7 +19,7 @@ #include "COM_OutputFileMultiViewOperation.h" #include "COM_OutputFileOperation.h" -#include <string.h> +#include <cstring> #include "BLI_listbase.h" #include "BLI_path_util.h" diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index c5623fdbd37..2676ab1b9ca 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -18,7 +18,7 @@ #include "COM_OutputFileOperation.h" -#include <string.h> +#include <cstring> #include "BLI_listbase.h" #include "BLI_path_util.h" diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp index 0776c97563e..f7b908deaf4 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp @@ -16,7 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#include <string.h> +#include <cstring> #include "MEM_guardedalloc.h" @@ -141,7 +141,7 @@ void VectorBlurOperation::generateVectorBlur(float *data, /* ****************** Spans ******************************* */ /* span fill in method, is also used to localize data for zbuffering */ -typedef struct ZSpan { +struct ZSpan { /* range for clipping */ int rectx, recty; @@ -157,8 +157,7 @@ typedef struct ZSpan { int *rectz; DrawBufPixel *rectdraw; float clipcrop; - -} ZSpan; +}; /* each zbuffer has coordinates transformed to local rect coordinates, so we can simply clip */ void zbuf_alloc_span(ZSpan *zspan, int rectx, int recty, float clipcrop) @@ -294,10 +293,10 @@ static void zbuf_add_to_span(ZSpan *zspan, const float v1[2], const float v2[2]) /* ******************** VECBLUR ACCUM BUF ************************* */ -typedef struct DrawBufPixel { +struct DrawBufPixel { const float *colpoin; float alpha; -} DrawBufPixel; +}; static void zbuf_fill_in_rgba( ZSpan *zspan, DrawBufPixel *col, float *v1, float *v2, float *v3, float *v4) diff --git a/source/blender/compositor/operations/COM_WrapOperation.cpp b/source/blender/compositor/operations/COM_WrapOperation.cpp index 7f7c1b7b639..37b7d68d495 100644 --- a/source/blender/compositor/operations/COM_WrapOperation.cpp +++ b/source/blender/compositor/operations/COM_WrapOperation.cpp @@ -16,7 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#include <math.h> +#include <cmath> #include "COM_WrapOperation.h" diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp index 574978e5a5f..9fb995bf463 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp @@ -19,7 +19,7 @@ #include "COM_WriteBufferOperation.h" #include "COM_OpenCLDevice.h" #include "COM_defines.h" -#include <stdio.h> +#include <cstdio> WriteBufferOperation::WriteBufferOperation(DataType datatype) { |