From 1a451c2cde0a7d26c66661acb77062193b37e42b Mon Sep 17 00:00:00 2001 From: Moritz Heinemann Date: Wed, 10 Jul 2024 20:05:11 +0200 Subject: [PATCH] run format --- plugins/datatools/src/ParticleNeighborhoodGraph.cpp | 2 +- plugins/protein_cuda/src/quicksurf/WKFThreads.cpp | 2 +- vislib/include/vislib/math/AbstractMatrix.h | 2 +- vislib/include/vislib/math/AbstractMatrixImpl.h | 4 ++-- vislib/src/sys/sysfunctions.cpp | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/datatools/src/ParticleNeighborhoodGraph.cpp b/plugins/datatools/src/ParticleNeighborhoodGraph.cpp index 326a530fbb..f0634565b9 100644 --- a/plugins/datatools/src/ParticleNeighborhoodGraph.cpp +++ b/plugins/datatools/src/ParticleNeighborhoodGraph.cpp @@ -245,7 +245,7 @@ void ParticleNeighborhoodGraph::calcData(geocalls::MultiParticleDataCall* data) float bboxCentY = bboxCent.Y(); float bboxCentZ = bboxCent.Z(); -#define _COORD(x, y, z) ((x) + ((y) + ((z) *y_size)) * x_size) +#define _COORD(x, y, z) ((x) + ((y) + ((z) * y_size)) * x_size) std::vector grid(d.get_count()); std::vector gridCell(x_size * y_size * z_size); diff --git a/plugins/protein_cuda/src/quicksurf/WKFThreads.cpp b/plugins/protein_cuda/src/quicksurf/WKFThreads.cpp index 3db35999e5..13cf28a5df 100644 --- a/plugins/protein_cuda/src/quicksurf/WKFThreads.cpp +++ b/plugins/protein_cuda/src/quicksurf/WKFThreads.cpp @@ -254,7 +254,7 @@ static void wkf_cpuid(unsigned int eax, unsigned int ecx, unsigned int* abcd) { #if defined(_MSC_VER) __cpuidex((int*) abcd, eax, ecx); #else - // uint32_t ebx, edx; + // uint32_t ebx, edx; unsigned int ebx = 0, edx = 0; #if defined(__i386__) && defined(__PIC__) /* in case of PIC under 32-bit EBX cannot be clobbered */ diff --git a/vislib/include/vislib/math/AbstractMatrix.h b/vislib/include/vislib/math/AbstractMatrix.h index 7a82f4dc1a..6be1664b86 100644 --- a/vislib/include/vislib/math/AbstractMatrix.h +++ b/vislib/include/vislib/math/AbstractMatrix.h @@ -177,7 +177,7 @@ unsigned int AbstractMatrix::FindEigenvalues( */ template T AbstractMatrix::Determinant() const { -#define A(r, c) a[(r) *D + (c)] +#define A(r, c) a[(r) * D + (c)] double a[D * D]; // input matrix for algorithm double f; // Multiplication factor. double max; // Row pivotising. diff --git a/vislib/include/vislib/math/AbstractMatrixImpl.h b/vislib/include/vislib/math/AbstractMatrixImpl.h index 408adf4af7..3c9e4b62b9 100644 --- a/vislib/include/vislib/math/AbstractMatrixImpl.h +++ b/vislib/include/vislib/math/AbstractMatrixImpl.h @@ -778,7 +778,7 @@ Vector AbstractMatrixImpl::GetRow(const int row) const { template class C> bool AbstractMatrixImpl::Invert() { -#define A(r, c) a[(r) *2 * D + (c)] +#define A(r, c) a[(r) * 2 * D + (c)] double a[2 * D * D]; // input matrix for algorithm double f; // Multiplication factor. double max; // Row pivotising. @@ -1382,7 +1382,7 @@ unsigned int AbstractMatrixImpl::findEigenvaluesSym( if (((outEigenvalues == NULL) && (outEigenvectors == NULL)) || (size == 0)) return 0; -#define A(r, c) a[(r) *D + (c)] +#define A(r, c) a[(r) * D + (c)] double a[D * D]; // input matrix for algorithm double d[D]; // diagonal elements double e[D]; // off-diagonal elements diff --git a/vislib/src/sys/sysfunctions.cpp b/vislib/src/sys/sysfunctions.cpp index 92673dda0d..893a277a4d 100644 --- a/vislib/src/sys/sysfunctions.cpp +++ b/vislib/src/sys/sysfunctions.cpp @@ -319,7 +319,7 @@ bool vislib::sys::ReadTextFile( } break; case TEXTFF_UNICODE: #ifdef _WIN32 - CASE_TEXTFF_UNICODE : + CASE_TEXTFF_UNICODE: #endif /* _WIN32 */ { vislib::StringW tmp; @@ -402,7 +402,7 @@ bool vislib::sys::ReadTextFile( } break; case TEXTFF_UNICODE: #ifdef _WIN32 - CASE_TEXTFF_UNICODE : + CASE_TEXTFF_UNICODE: #endif /* _WIN32 */ { wchar_t* src = outStr.AllocateBuffer(static_cast((len / sizeof(wchar_t)) + sizeof(wchar_t))); @@ -615,7 +615,7 @@ bool vislib::sys::WriteTextFile( goto CASE_TEXTFF_ASCII; break; case TEXTFF_ASCII: - CASE_TEXTFF_ASCII : { + CASE_TEXTFF_ASCII: { // no BOM possible StringA::Size len = text.Length(); return (static_cast(file.Write(text.PeekBuffer(), len)) == len); @@ -697,7 +697,7 @@ bool vislib::sys::WriteTextFile( break; case TEXTFF_UNICODE: #ifdef _WIN32 - CASE_TEXTFF_UNICODE : + CASE_TEXTFF_UNICODE: #endif /* _WIN32 */ { #ifdef _WIN32 @@ -710,7 +710,7 @@ bool vislib::sys::WriteTextFile( return (static_cast(file.Write(text.PeekBuffer(), len)) == len); } break; case TEXTFF_UTF8: - CASE_TEXTFF_UTF8 : { + CASE_TEXTFF_UTF8: { vislib::StringA bytes; UTF8Encoder::Encode(bytes, text); if (bom != TEXTFF_BOM_NO) {