Skip to content

Commit

Permalink
CImg: update
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Apr 10, 2017
1 parent 2eca7fc commit ccda06f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CImg/CImgFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ inline void gImageEffectAbort();
#ifdef PLUGIN_PACK_GPL2

// include the inpaint and nlmeans cimg plugins
#if 0 // not necessary since CImg cimmit 7c83bdad65ab7447220b54851a5a1035976777fa
namespace cimg_library_openfx_misc {
namespace cimg {
//! Return the maximum between two values.
Expand All @@ -152,7 +153,7 @@ namespace cimg_library_openfx_misc {
}
}
}

#endif
#define cimg_plugin "Inpaint/inpaint.h"
//#define cimg_plugin1 "nlmeans.h"
#endif
Expand Down
3 changes: 2 additions & 1 deletion CImg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ CXXFLAGS += \
# commit 0728d3e6833de1dfe16734fdef416b5051d4df7e is CImg pre-2.0.0 with nb_iter argument to boxfilter
# commit 2067bd0765d23afc4c41b706bc57d094a2dce51d is CImg pre-2.0.0 with precision fix to boxfilter
# commit 63a4356e9e93ff3cd407e1ae1264a616ea4ba0f2 is CImg pre-2.0.0 with the clamping on sigma_r fixed in blur_bilateral
CIMGVERSION=63a4356e9e93ff3cd407e1ae1264a616ea4ba0f2
# commit 7c83bdad65ab7447220b54851a5a1035976777fa is CImg pre-2.0.0 with a fix to compile inpaint.h
CIMGVERSION=7c83bdad65ab7447220b54851a5a1035976777fa

CImg.h: Inpaint/inpaint.h
curl -s -S -o $@ https://raw.githubusercontent.com/dtschump/CImg/$(CIMGVERSION)/CImg.h
Expand Down

0 comments on commit ccda06f

Please sign in to comment.