-
Notifications
You must be signed in to change notification settings - Fork 311
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CGal plugin][CImgPlugin] Image data moved from Image/ to CImgPlugin/ #1104
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it is a shame that git doesn't see the move from ImageTypes to ImageData as the same file to see only the real modifications.
I suppose you didn't change the file except the includes and class names ?
@@ -36,7 +36,7 @@ | |||
#define CGALPLUGIN_MESHGENERATIONFROMIMAGE_CPP | |||
|
|||
#include <CGALPlugin/MeshGenerationFromImage.h> | |||
#include <image/ImageTypes.h> | |||
//#include <image/ImageTypes.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can remove the line definitively
@@ -45,7 +45,9 @@ | |||
#include <sofa/defaulttype/Mat.h> | |||
#include <sofa/defaulttype/Quat.h> | |||
#include <sofa/helper/rmath.h> | |||
#include <image/ImageTypes.h> | |||
|
|||
//#include <image/ImageTypes.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same here. You can remove the line.
@@ -86,7 +87,7 @@ add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES}) | |||
|
|||
target_compile_options(${PROJECT_NAME} PUBLIC ${CIMG_CFLAGS}) | |||
target_compile_options(${PROJECT_NAME} PRIVATE "-DSOFA_BUILD_CIMGPLUGIN") | |||
target_link_libraries(${PROJECT_NAME} SofaCore ${EXTERNAL_LIBS}) | |||
target_link_libraries(${PROJECT_NAME} SofaCore SofaSimulationCommon ${EXTERNAL_LIBS}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SofaSimulationCommon is needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it is not, forgot how it ended there.
I removed it, along with the commented includes and pushed the updated code to remote.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't change the files/code/algos, I just moved classes around.
…in cmakelists (SofaSimulationCommon)
[ci-build][with-all-tests] |
This "move" is originally done to uncouple CGAL plugin and Image. This was done by moving Image class (along with dependencies) from Image plugin (ImageTypes.h) to CImgPlugin (CImgData.h).
The point is to reduce compilation time since CImg takes less time to compile than Image.
Now Image and CGAL both depend on CImgPlugin which is lighter.
This PR:
Reviewers will merge only if all these checks are true.