Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Commit

Permalink
Refactoring (continued)
Browse files Browse the repository at this point in the history
  • Loading branch information
EleonoreMizo committed Jul 22, 2021
1 parent 1c7fae3 commit cc076e1
Show file tree
Hide file tree
Showing 44 changed files with 2,599 additions and 1,511 deletions.
11 changes: 11 additions & 0 deletions build/unix/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ libfmtconv_la_SOURCES = \
../../src/fmtcl/FilterResize.h \
../../src/fmtcl/fnc.cpp \
../../src/fmtcl/fnc.h \
../../src/fmtcl/InterlacingType.h \
../../src/fmtcl/KernelData.cpp \
../../src/fmtcl/KernelData.h \
../../src/fmtcl/Mat3.h \
Expand All @@ -194,9 +195,14 @@ libfmtconv_la_SOURCES = \
../../src/fmtcl/MatrixProc.cpp \
../../src/fmtcl/MatrixProc.h \
../../src/fmtcl/MatrixProc_macro.h \
../../src/fmtcl/MatrixUtil.cpp \
../../src/fmtcl/MatrixUtil.h \
../../src/fmtcl/MatrixWrap.h \
../../src/fmtcl/MatrixWrap.hpp \
../../src/fmtcl/PicFmt.h \
../../src/fmtcl/PrimariesPreset.h \
../../src/fmtcl/PrimUtil.cpp \
../../src/fmtcl/PrimUtil.h \
../../src/fmtcl/Proxy.h \
../../src/fmtcl/Proxy.hpp \
../../src/fmtcl/ProxyRwCpp.h \
Expand All @@ -207,8 +213,11 @@ libfmtconv_la_SOURCES = \
../../src/fmtcl/ReadWrapperFlt.hpp \
../../src/fmtcl/ReadWrapperInt.h \
../../src/fmtcl/ReadWrapperInt.hpp \
../../src/fmtcl/ResamplePlaneData.h \
../../src/fmtcl/ResampleSpecPlane.cpp \
../../src/fmtcl/ResampleSpecPlane.h \
../../src/fmtcl/ResampleUtil.cpp \
../../src/fmtcl/ResampleUtil.h \
../../src/fmtcl/ResizeData.cpp \
../../src/fmtcl/ResizeData.h \
../../src/fmtcl/ResizeData.hpp \
Expand Down Expand Up @@ -256,6 +265,8 @@ libfmtconv_la_SOURCES = \
../../src/fmtcl/TransOpSLog.h \
../../src/fmtcl/TransOpSLog3.cpp \
../../src/fmtcl/TransOpSLog3.h \
../../src/fmtcl/TransUtil.cpp \
../../src/fmtcl/TransUtil.h \
../../src/fmtcl/Vec3.h \
../../src/fmtcl/Vec3.hpp \
../../src/fmtcl/VoidAndCluster.cpp \
Expand Down
11 changes: 11 additions & 0 deletions build/win/fmtconv.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@
<ClInclude Include="..\..\src\fmtcl\ErrDifBufFactory.h" />
<ClInclude Include="..\..\src\fmtcl\FilterResize.h" />
<ClInclude Include="..\..\src\fmtcl\fnc.h" />
<ClInclude Include="..\..\src\fmtcl\InterlacingType.h" />
<ClInclude Include="..\..\src\fmtcl\KernelData.h" />
<ClInclude Include="..\..\src\fmtcl\Mat3.h" />
<ClInclude Include="..\..\src\fmtcl\Mat3.hpp" />
Expand All @@ -163,9 +164,12 @@
<ClInclude Include="..\..\src\fmtcl\Matrix2020CLProc_macro.h" />
<ClInclude Include="..\..\src\fmtcl\MatrixProc.h" />
<ClInclude Include="..\..\src\fmtcl\MatrixProc_macro.h" />
<ClInclude Include="..\..\src\fmtcl\MatrixUtil.h" />
<ClInclude Include="..\..\src\fmtcl\MatrixWrap.h" />
<ClInclude Include="..\..\src\fmtcl\MatrixWrap.hpp" />
<ClInclude Include="..\..\src\fmtcl\PicFmt.h" />
<ClInclude Include="..\..\src\fmtcl\PrimariesPreset.h" />
<ClInclude Include="..\..\src\fmtcl\PrimUtil.h" />
<ClInclude Include="..\..\src\fmtcl\Proxy.h" />
<ClInclude Include="..\..\src\fmtcl\Proxy.hpp" />
<ClInclude Include="..\..\src\fmtcl\ProxyRwAvx2.h" />
Expand All @@ -178,7 +182,9 @@
<ClInclude Include="..\..\src\fmtcl\ReadWrapperFlt.hpp" />
<ClInclude Include="..\..\src\fmtcl\ReadWrapperInt.h" />
<ClInclude Include="..\..\src\fmtcl\ReadWrapperInt.hpp" />
<ClInclude Include="..\..\src\fmtcl\ResamplePlaneData.h" />
<ClInclude Include="..\..\src\fmtcl\ResampleSpecPlane.h" />
<ClInclude Include="..\..\src\fmtcl\ResampleUtil.h" />
<ClInclude Include="..\..\src\fmtcl\ResizeData.h" />
<ClInclude Include="..\..\src\fmtcl\ResizeData.hpp" />
<ClInclude Include="..\..\src\fmtcl\ResizeDataFactory.h" />
Expand Down Expand Up @@ -210,6 +216,7 @@
<ClInclude Include="..\..\src\fmtcl\TransOpPow.h" />
<ClInclude Include="..\..\src\fmtcl\TransOpSLog.h" />
<ClInclude Include="..\..\src\fmtcl\TransOpSLog3.h" />
<ClInclude Include="..\..\src\fmtcl\TransUtil.h" />
<ClInclude Include="..\..\src\fmtcl\Vec3.h" />
<ClInclude Include="..\..\src\fmtcl\Vec3.hpp" />
<ClInclude Include="..\..\src\fmtcl\VoidAndCluster.h" />
Expand Down Expand Up @@ -339,7 +346,10 @@
<ClCompile Include="..\..\src\fmtcl\MatrixProc_avx2.cpp">
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<ClCompile Include="..\..\src\fmtcl\MatrixUtil.cpp" />
<ClCompile Include="..\..\src\fmtcl\PrimUtil.cpp" />
<ClCompile Include="..\..\src\fmtcl\ResampleSpecPlane.cpp" />
<ClCompile Include="..\..\src\fmtcl\ResampleUtil.cpp" />
<ClCompile Include="..\..\src\fmtcl\ResizeData.cpp" />
<ClCompile Include="..\..\src\fmtcl\ResizeDataFactory.cpp" />
<ClCompile Include="..\..\src\fmtcl\RgbSystem.cpp" />
Expand All @@ -365,6 +375,7 @@
<ClCompile Include="..\..\src\fmtcl\TransOpPow.cpp" />
<ClCompile Include="..\..\src\fmtcl\TransOpSLog.cpp" />
<ClCompile Include="..\..\src\fmtcl\TransOpSLog3.cpp" />
<ClCompile Include="..\..\src\fmtcl\TransUtil.cpp" />
<ClCompile Include="..\..\src\fmtcl\VoidAndCluster.cpp" />
<ClCompile Include="..\..\src\fmtc\Bitdepth.cpp" />
<ClCompile Include="..\..\src\fmtc\Convert.cpp" />
Expand Down
33 changes: 33 additions & 0 deletions build/win/fmtconv.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,27 @@
<ClInclude Include="..\..\src\fmtcl\Dither.h">
<Filter>fmtcl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\fmtcl\MatrixUtil.h">
<Filter>fmtcl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\fmtcl\PicFmt.h">
<Filter>fmtcl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\fmtcl\PrimUtil.h">
<Filter>fmtcl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\fmtcl\TransUtil.h">
<Filter>fmtcl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\fmtcl\ResampleUtil.h">
<Filter>fmtcl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\fmtcl\ResamplePlaneData.h">
<Filter>fmtcl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\fmtcl\InterlacingType.h">
<Filter>fmtcl</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\fmtc\Bitdepth.cpp">
Expand Down Expand Up @@ -756,6 +777,18 @@
<ClCompile Include="..\..\src\fmtcl\Dither.cpp">
<Filter>fmtcl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\fmtcl\MatrixUtil.cpp">
<Filter>fmtcl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\fmtcl\PrimUtil.cpp">
<Filter>fmtcl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\fmtcl\TransUtil.cpp">
<Filter>fmtcl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\fmtcl\ResampleUtil.cpp">
<Filter>fmtcl</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\unix\configure.ac" />
Expand Down
6 changes: 3 additions & 3 deletions src/fmtc/Bitdepth.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ const ::VSFrameRef * Bitdepth::get_frame (int n, int activation_reason, void * &
}
}

return (dst_ptr);
return dst_ptr;
}


Expand Down Expand Up @@ -306,7 +306,7 @@ int Bitdepth::do_process_plane (::VSFrameRef &dst, int n, int plane_index, void
}
}

return (ret_val);
return ret_val;
}


Expand Down Expand Up @@ -404,7 +404,7 @@ const ::VSFormat & Bitdepth::get_output_colorspace (const ::VSMap &in, ::VSMap &
}
}

return (*fmt_dst_ptr);
return *fmt_dst_ptr;
}


Expand Down
2 changes: 2 additions & 0 deletions src/fmtc/Bitdepth.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ class Bitdepth

Bitdepth () = delete;
Bitdepth (const Bitdepth &other) = delete;
Bitdepth (Bitdepth &&other) = delete;
Bitdepth & operator = (const Bitdepth &other) = delete;
Bitdepth & operator = (Bitdepth &&other) = delete;
bool operator == (const Bitdepth &other) const = delete;
bool operator != (const Bitdepth &other) const = delete;

Expand Down
Loading

0 comments on commit cc076e1

Please sign in to comment.