-
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
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 commentThe reason will be displayed to describe this comment to others. Learn more. same here. You can remove the line. |
||
#include <CImgPlugin/CImgData.h> | ||
|
||
//CGAL | ||
typedef CGAL::Exact_predicates_inexact_constructions_kernel K; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,8 @@ project(CImgPlugin VERSION 0.1) | |
set(HEADER_FILES | ||
src/CImgPlugin/ImageCImg.h | ||
src/CImgPlugin/CImgPlugin.h | ||
src/CImgPlugin/SOFACImg.h | ||
src/CImgPlugin/SOFACImg.h | ||
src/CImgPlugin/CImgData.h | ||
) | ||
|
||
set(SOURCE_FILES | ||
|
@@ -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 commentThe 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 commentThe reason will be displayed to describe this comment to others. Learn more. it is not, forgot how it ended there. There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. |
||
target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>") | ||
target_include_directories(${PROJECT_NAME} PUBLIC "$<BUILD_INTERFACE:${CImg_INCLUDE_DIRS}>") | ||
target_include_directories(${PROJECT_NAME} PUBLIC "$<INSTALL_INTERFACE:include>") | ||
|
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