style: unify identifier naming per updated conventions
Automated with clang-tidy readability-identifier-naming (config added to .clang-tidy) plus scripted passes, per the updated rules now documented in CONTRIBUTING.md: - types (class/struct/enum/alias/template params): PascalCase - functions, variables, members: snake_case (incl. rational -> Rational) - private/protected members: trailing underscore; static member variables likewise (instance_, available_themes_) - constants and enum values: snake_case (kLinear -> k_linear, F32P -> f32p); ALL_CAPS reserved for macros - macros: OAK_ prefix (OLIVE_ADD_TEST/OLIVE_ASSERT/OLIVE_CONFIG -> OAK_ADD_TEST/OAK_ASSERT/OAK_CONFIG, GL_PREAMBLE -> OAK_GL_PREAMBLE, include guards -> OAK_*) - file names: all lowercase (Current/Plugin/OliveHost/OliveClip/ OlivePluginInstance -> current/plugin/olivehost/oliveclip/ oliveplugininstance) - getters share the member name sans underscore, setters set_foo() - Qt and third-party (OpenFX) virtual overrides and framework callbacks keep their original names (exempt in .clang-tidy) Manual follow-ups required where automation could not reach: - string-based QMetaObject/SIGNAL/SLOT references updated to renamed methods (AddTask, CreatedFile, DeleteSpecificFile, moveSelectionUp, ...) - macro bodies referencing renamed methods (OLIVE_CONFIG, NODE_DEFAULT_DESTRUCTOR, MANAGEDDISPLAYWIDGET_*) - self-shadowing locals renamed where signals/methods became same-named (size_changed, worker_count, selected_items, import param, filters) - third_party OFX member/namespace usages restored (OFX::Host::*, _created, _clipPrefsDirty, createInstance, clearPersistentMessage) - STL protocol aliases restored (const_iterator) with .clang-tidy ignore rules; qHash overloads restored Full build and test suite pass: ctest 4/4, ~1960 gtest cases green.
This commit is contained in:
+15
-15
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef OIIOUTILS_H
|
||||
#define OIIOUTILS_H
|
||||
#ifndef OAK_OIIOUTILS_H
|
||||
#define OAK_OIIOUTILS_H
|
||||
|
||||
#include <OpenImageIO/imagebuf.h>
|
||||
#include <OpenImageIO/typedesc.h>
|
||||
@@ -34,36 +34,36 @@ namespace olive
|
||||
class OIIOUtils {
|
||||
public:
|
||||
static OIIO::TypeDesc::BASETYPE
|
||||
GetOIIOBaseTypeFromFormat(PixelFormat format)
|
||||
get_oiio_base_type_from_format(PixelFormat format)
|
||||
{
|
||||
switch (format) {
|
||||
case PixelFormat::U8:
|
||||
case PixelFormat::u8:
|
||||
return OIIO::TypeDesc::UINT8;
|
||||
case PixelFormat::U10:
|
||||
case PixelFormat::u10:
|
||||
return OIIO::TypeDesc::UNKNOWN;
|
||||
case PixelFormat::U16:
|
||||
case PixelFormat::u16:
|
||||
return OIIO::TypeDesc::UINT16;
|
||||
case PixelFormat::F16:
|
||||
case PixelFormat::f16:
|
||||
return OIIO::TypeDesc::HALF;
|
||||
case PixelFormat::F32:
|
||||
case PixelFormat::f32:
|
||||
return OIIO::TypeDesc::FLOAT;
|
||||
case PixelFormat::INVALID:
|
||||
case PixelFormat::COUNT:
|
||||
case PixelFormat::invalid:
|
||||
case PixelFormat::count:
|
||||
break;
|
||||
}
|
||||
|
||||
return OIIO::TypeDesc::UNKNOWN;
|
||||
}
|
||||
|
||||
static void FrameToBuffer(const Frame *frame, OIIO::ImageBuf *buf);
|
||||
static void frame_to_buffer(const Frame *frame, OIIO::ImageBuf *buf);
|
||||
|
||||
static void BufferToFrame(OIIO::ImageBuf *buf, Frame *frame);
|
||||
static void buffer_to_frame(OIIO::ImageBuf *buf, Frame *frame);
|
||||
|
||||
static PixelFormat GetFormatFromOIIOBasetype(OIIO::TypeDesc::BASETYPE type);
|
||||
static PixelFormat get_format_from_oiio_basetype(OIIO::TypeDesc::BASETYPE type);
|
||||
|
||||
static rational GetPixelAspectRatioFromOIIO(const OIIO::ImageSpec &spec);
|
||||
static Rational get_pixel_aspect_ratio_from_oiio(const OIIO::ImageSpec &spec);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // OIIOUTILS_H
|
||||
#endif // OAK_OIIOUTILS_H
|
||||
|
||||
Reference in New Issue
Block a user