From e0d1c947e6feae0d6257f56a3477b23872d257bf Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Mon, 4 Sep 2023 16:53:10 +0900 Subject: [PATCH] infra: renamed the files for the consistency. --- src/loaders/lottie/tvgLottieBuilder.cpp | 2 +- src/loaders/svg/tvgSvgSceneBuilder.cpp | 2 +- src/loaders/tvg/tvgTvgBinInterpreter.cpp | 2 +- src/renderer/meson.build | 8 ++++---- src/renderer/sw_engine/tvgSwImage.cpp | 2 +- src/renderer/tvgAnimation.cpp | 3 +-- src/renderer/tvgCanvas.cpp | 2 +- src/renderer/{tvgCanvasImpl.h => tvgCanvas.h} | 0 src/renderer/tvgGlCanvas.cpp | 2 +- src/renderer/tvgPicture.cpp | 2 +- src/renderer/{tvgPictureImpl.h => tvgPicture.h} | 0 src/renderer/tvgScene.cpp | 2 +- src/renderer/{tvgSceneImpl.h => tvgScene.h} | 0 src/renderer/tvgShape.cpp | 2 +- src/renderer/{tvgShapeImpl.h => tvgShape.h} | 0 src/renderer/tvgSwCanvas.cpp | 2 +- src/savers/tvg/tvgTvgSaver.cpp | 4 ++-- 17 files changed, 17 insertions(+), 18 deletions(-) rename src/renderer/{tvgCanvasImpl.h => tvgCanvas.h} (100%) rename src/renderer/{tvgPictureImpl.h => tvgPicture.h} (100%) rename src/renderer/{tvgSceneImpl.h => tvgScene.h} (100%) rename src/renderer/{tvgShapeImpl.h => tvgShape.h} (100%) diff --git a/src/loaders/lottie/tvgLottieBuilder.cpp b/src/loaders/lottie/tvgLottieBuilder.cpp index 50e14038..bb578a7c 100644 --- a/src/loaders/lottie/tvgLottieBuilder.cpp +++ b/src/loaders/lottie/tvgLottieBuilder.cpp @@ -22,7 +22,7 @@ #include "tvgCommon.h" #include "tvgPaint.h" -#include "tvgShapeImpl.h" +#include "tvgShape.h" #include "tvgLottieModel.h" #include "tvgLottieBuilder.h" diff --git a/src/loaders/svg/tvgSvgSceneBuilder.cpp b/src/loaders/svg/tvgSvgSceneBuilder.cpp index a76a76ab..567f9a22 100644 --- a/src/loaders/svg/tvgSvgSceneBuilder.cpp +++ b/src/loaders/svg/tvgSvgSceneBuilder.cpp @@ -23,7 +23,7 @@ #include "tvgMath.h" /* to include math.h before cstring */ #include #include -#include "tvgShapeImpl.h" +#include "tvgShape.h" #include "tvgCompressor.h" #include "tvgPaint.h" #include "tvgFill.h" diff --git a/src/loaders/tvg/tvgTvgBinInterpreter.cpp b/src/loaders/tvg/tvgTvgBinInterpreter.cpp index 185d5235..e246af60 100644 --- a/src/loaders/tvg/tvgTvgBinInterpreter.cpp +++ b/src/loaders/tvg/tvgTvgBinInterpreter.cpp @@ -31,7 +31,7 @@ #endif #include "tvgTvgCommon.h" -#include "tvgShapeImpl.h" +#include "tvgShape.h" /************************************************************************/ diff --git a/src/renderer/meson.build b/src/renderer/meson.build index d982291e..c00a513c 100644 --- a/src/renderer/meson.build +++ b/src/renderer/meson.build @@ -9,19 +9,19 @@ if get_option('engines').contains('gl_beta') == true endif source_file = [ - 'tvgCanvasImpl.h', + 'tvgCanvas.h', 'tvgCommon.h', 'tvgBinaryDesc.h', 'tvgFill.h', 'tvgFrameModule.h', 'tvgLoader.h', 'tvgLoadModule.h', - 'tvgPictureImpl.h', + 'tvgPicture.h', 'tvgRender.h', 'tvgIteratorAccessor.h', 'tvgSaveModule.h', - 'tvgSceneImpl.h', - 'tvgShapeImpl.h', + 'tvgScene.h', + 'tvgShape.h', 'tvgTaskScheduler.h', 'tvgAccessor.cpp', 'tvgAnimation.cpp', diff --git a/src/renderer/sw_engine/tvgSwImage.cpp b/src/renderer/sw_engine/tvgSwImage.cpp index fb8581b4..b1624037 100644 --- a/src/renderer/sw_engine/tvgSwImage.cpp +++ b/src/renderer/sw_engine/tvgSwImage.cpp @@ -48,7 +48,7 @@ static bool _genOutline(SwImage* image, const RenderMesh* mesh, const Matrix* tr if (mesh->triangleCnt > 0) { // TODO: Optimise me. We appear to calculate this exact min/max bounding area in multiple // places. We should be able to re-use one we have already done? Also see: - // tvgPictureImpl.h --> bounds + // tvgPicture.h --> bounds // tvgSwRasterTexmap.h --> _rasterTexmapPolygonMesh // // TODO: Should we calculate the exact path(s) of the triangle mesh instead? diff --git a/src/renderer/tvgAnimation.cpp b/src/renderer/tvgAnimation.cpp index 4e8c8568..4d08665c 100644 --- a/src/renderer/tvgAnimation.cpp +++ b/src/renderer/tvgAnimation.cpp @@ -20,11 +20,10 @@ * SOFTWARE. */ -//#include "tvgAnimationImpl.h" #include "tvgCommon.h" #include "tvgFrameModule.h" #include "tvgPaint.h" -#include "tvgPictureImpl.h" +#include "tvgPicture.h" /************************************************************************/ /* Internal Class Implementation */ diff --git a/src/renderer/tvgCanvas.cpp b/src/renderer/tvgCanvas.cpp index 1dee3703..2d4cbd04 100644 --- a/src/renderer/tvgCanvas.cpp +++ b/src/renderer/tvgCanvas.cpp @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include "tvgCanvasImpl.h" +#include "tvgCanvas.h" /************************************************************************/ /* External Class Implementation */ diff --git a/src/renderer/tvgCanvasImpl.h b/src/renderer/tvgCanvas.h similarity index 100% rename from src/renderer/tvgCanvasImpl.h rename to src/renderer/tvgCanvas.h diff --git a/src/renderer/tvgGlCanvas.cpp b/src/renderer/tvgGlCanvas.cpp index dbbab516..aa7f8dbe 100644 --- a/src/renderer/tvgGlCanvas.cpp +++ b/src/renderer/tvgGlCanvas.cpp @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include "tvgCanvasImpl.h" +#include "tvgCanvas.h" #ifdef THORVG_GL_RASTER_SUPPORT #include "tvgGlRenderer.h" diff --git a/src/renderer/tvgPicture.cpp b/src/renderer/tvgPicture.cpp index 254d940f..07877b92 100644 --- a/src/renderer/tvgPicture.cpp +++ b/src/renderer/tvgPicture.cpp @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include "tvgPictureImpl.h" +#include "tvgPicture.h" /************************************************************************/ /* Internal Class Implementation */ diff --git a/src/renderer/tvgPictureImpl.h b/src/renderer/tvgPicture.h similarity index 100% rename from src/renderer/tvgPictureImpl.h rename to src/renderer/tvgPicture.h diff --git a/src/renderer/tvgScene.cpp b/src/renderer/tvgScene.cpp index 9fd2ad70..b3bf2940 100644 --- a/src/renderer/tvgScene.cpp +++ b/src/renderer/tvgScene.cpp @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include "tvgSceneImpl.h" +#include "tvgScene.h" /************************************************************************/ /* External Class Implementation */ diff --git a/src/renderer/tvgSceneImpl.h b/src/renderer/tvgScene.h similarity index 100% rename from src/renderer/tvgSceneImpl.h rename to src/renderer/tvgScene.h diff --git a/src/renderer/tvgShape.cpp b/src/renderer/tvgShape.cpp index 23b6fa18..f07e8803 100644 --- a/src/renderer/tvgShape.cpp +++ b/src/renderer/tvgShape.cpp @@ -21,7 +21,7 @@ */ #include "tvgMath.h" -#include "tvgShapeImpl.h" +#include "tvgShape.h" /************************************************************************/ /* Internal Class Implementation */ diff --git a/src/renderer/tvgShapeImpl.h b/src/renderer/tvgShape.h similarity index 100% rename from src/renderer/tvgShapeImpl.h rename to src/renderer/tvgShape.h diff --git a/src/renderer/tvgSwCanvas.cpp b/src/renderer/tvgSwCanvas.cpp index 7e6bc40c..95df6b48 100644 --- a/src/renderer/tvgSwCanvas.cpp +++ b/src/renderer/tvgSwCanvas.cpp @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include "tvgCanvasImpl.h" +#include "tvgCanvas.h" #ifdef THORVG_SW_RASTER_SUPPORT #include "tvgSwRenderer.h" diff --git a/src/savers/tvg/tvgTvgSaver.cpp b/src/savers/tvg/tvgTvgSaver.cpp index 29edea4a..fa80f611 100644 --- a/src/savers/tvg/tvgTvgSaver.cpp +++ b/src/savers/tvg/tvgTvgSaver.cpp @@ -25,8 +25,8 @@ #include "tvgSaveModule.h" #include "tvgTvgSaver.h" #include "tvgCompressor.h" -#include "tvgShapeImpl.h" -#include "tvgPictureImpl.h" +#include "tvgShape.h" +#include "tvgPicture.h" #ifdef _WIN32 #include