Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ repos:
- id: cmake-format

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.13.2
rev: v0.14.14
hooks:
- id: ruff-check
args: [ --fix ]
- id: ruff-format

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: 'v19.1.4'
rev: 'v21.1.8'
hooks:
- id: clang-format
types_or: [c++, c]
Expand Down
2 changes: 1 addition & 1 deletion src/bin/apps/rv/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ extern void rvThirdPartyCustomization(TwkApp::Bundle& bundle, char* licarg);
// #error ********* NO VERSION INFORMATION ***********
#else
#ifndef _MSC_VER
#warning********* NO VERSION INFORMATION ***********
#warning ********* NO VERSION INFORMATION ***********
#endif
#endif
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/bin/apps/rvpkg/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
// #error ********* NO VERSION INFORMATION ***********
#else
#ifndef _MSC_VER
#warning********* NO VERSION INFORMATION ***********
#warning ********* NO VERSION INFORMATION ***********
#endif
#endif
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/bin/nsapps/RV/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ extern void rvThirdPartyCustomization(TwkApp::Bundle& bundle, char* licarg);
#if NDEBUG
// #error ********* NO VERSION INFORMATION ***********
#else
#warning********* NO VERSION INFORMATION ***********
#warning ********* NO VERSION INFORMATION ***********
#endif
#endif

Expand Down
14 changes: 7 additions & 7 deletions src/lib/geometry/TwkContainer/TwkContainer/Properties.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ namespace TwkContainer
// };

// #define PROPERTY_TRAITS(PTYPENAME, TYPE, TYPENAME, LAYOUT, WIDTH) \
// template <> const char* PropertyTraits<TYPE>::typeName(); \
// template <> Property::Layout PropertyTraits<TYPE>::layout(); \
// template <> size_t PropertyTraits<TYPE>::xsize(); \
// template <> size_t PropertyTraits<TYPE>::ysize(); \
// template <> size_t PropertyTraits<TYPE>::zsize(); \
// typedef TypedProperty<PropertyTraits<TYPE>::Container, \
// WIDTH, 0, 0, Property::LAYOUT> PTYPENAME;
// template <> const char* PropertyTraits<TYPE>::typeName(); \
// template <> Property::Layout PropertyTraits<TYPE>::layout(); \
// template <> size_t PropertyTraits<TYPE>::xsize(); \
// template <> size_t PropertyTraits<TYPE>::ysize(); \
// template <> size_t PropertyTraits<TYPE>::zsize(); \
// typedef TypedProperty<PropertyTraits<TYPE>::Container, \
// WIDTH, 0, 0, Property::LAYOUT> PTYPENAME;

#define PROPERTY_TRAITS(PTYPENAME, TYPE, TYPENAME, LAYOUT, WIDTH) \
typedef TypedProperty<std::vector<TYPE>, WIDTH, 0, 0, 0, Property::LAYOUT> PTYPENAME;
Expand Down
6 changes: 3 additions & 3 deletions src/lib/geometry/TwkPaint/Path.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ namespace TwkPaint
// |
// f1
// \
// \f2
// \f2
// |
// f3
// f0 will have 'location' 0, and f3 will have 'location' 1, f1 will have
Expand Down Expand Up @@ -484,8 +484,8 @@ namespace TwkPaint
//
// o + o <-- direction of stroke
// / \ / \
// / o \
// o / \ o POSITIVE CASE
// / o \
// o / \ o POSITIVE CASE
// | / \ | + == stroke point
// + / \ + o == vertex
// |/ \| x == other intersection
Expand Down
6 changes: 3 additions & 3 deletions src/lib/image/TwkFB/FastMemcpy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ void* FastMemcpy_SIMD(void* PXLRESTRICT outBuf, const void* PXLRESTRICT inBuf, s
return small_memcpy(outBuf, inBuf, n);
}

const unsigned char* PXLRESTRICT src = static_cast<const unsigned char * PXLRESTRICT>(inBuf);
unsigned char* PXLRESTRICT dst = static_cast<unsigned char * PXLRESTRICT>(outBuf);
const unsigned char* PXLRESTRICT src = static_cast<const unsigned char* PXLRESTRICT>(inBuf);
unsigned char* PXLRESTRICT dst = static_cast<unsigned char* PXLRESTRICT>(outBuf);

// memcpy until dst is aligned with simd
if (!is_aligned(dst, SSE_REGISTER_SIZE))
Expand All @@ -114,7 +114,7 @@ void* FastMemcpy_SIMD(void* PXLRESTRICT outBuf, const void* PXLRESTRICT inBuf, s
{
for (; n >= step; n -= step)
{
_mm_prefetch(reinterpret_cast<const char * PXLRESTRICT>(src) + 1024, _MM_HINT_T0);
_mm_prefetch(reinterpret_cast<const char* PXLRESTRICT>(src) + 1024, _MM_HINT_T0);
__m128 xmm0 = _mm_load_ps((float*)(src + 0 * SSE_REGISTER_SIZE));
__m128 xmm1 = _mm_load_ps((float*)(src + 1 * SSE_REGISTER_SIZE));
__m128 xmm2 = _mm_load_ps((float*)(src + 2 * SSE_REGISTER_SIZE));
Expand Down
12 changes: 6 additions & 6 deletions src/lib/ip/IPBaseNodes/OverlayIPNode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -710,23 +710,23 @@ namespace IPCore
// leftMatteWidth widthVisible rightMatteWidth
// ____/\_____ ___________/\____________ ____/\_____
// / \/ \/ \
// ------------------------[0.5]------------------------
// ------------------------[0.5]------------------------
// | |\
// | topMatte (m_top) | }
// | topMatte (m_top) | }
// topMatteHeight
// |(leftSideOfImage,topMatteVPosition) |/
// *---------------------------------------------------|
// | | | |\
// | | | | \
// | leftMatte | Visible Image | rightMatte | \
// | (m_left) | | (m_right) | }
// | | | | \
// | leftMatte | Visible Image | rightMatte | \
// | (m_left) | | (m_right) | }
// heightVisible | | | | / | |
// | | /
// |(leftSideOfImage,sideMattesVPosition)
// |(rightMatteHPosition,sideMattesVPosition)
// *--------------------------------------*------------|
// | |\
// | bottomMatte (m_bottom) | }
// | bottomMatte (m_bottom) | }
// bottomMatteHeight
// |(leftSideOfImage,-0.5) |/
// *----------------------[-0.5]------------------------
Expand Down
Loading