[CGal plugin][CImgPlugin] Image data moved from Image/ to CImgPlugin/ #1104
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
epernod
added
location: plugins
refactoring
epernod
changed the title
epernod
reviewed
Jul 18, 2019
| @@ -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.
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.
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.
SofaSimulationCommon is needed?
There was a problem hiding this comment.
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.
I didn't change the files/code/algos, I just moved classes around.
…in cmakelists (SofaSimulationCommon)
epernod
approved these changes
Jul 19, 2019
|
[ci-build][with-all-tests] |
hugtalbot
added
pr: status ready
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.