From 8afc98052f3413fa7ceca2b22f64d31db5131975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Wed, 25 Dec 2019 16:08:58 -0800 Subject: [PATCH] update CImg --- .appveyor.yml | 5 +++-- CImg/Makefile | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 02b77dca3..c2fdd5955 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -86,9 +86,10 @@ install: # a3b57fe7f0cfbf84635e3070fc3c896b25ff6c5f is CImg 2.7.2 # 3efdd8fb35e76873edcb01f9c30af762aeccb97a is CImg 2.7.4 + # b7d35ed7dd03ff1ac58be4c10b365035454f3771 is CImg 2.8.1 - git submodule -q update --init --recursive - - curl -L -s -S -o CImg/CImg.h https://raw.githubusercontent.com/dtschump/CImg/39215451d0b839b4e72d32afb15ea69701a7f4eb/CImg.h - - curl -L -s -S -o CImg/Inpaint/inpaint.h https://raw.githubusercontent.com/dtschump/CImg/39215451d0b839b4e72d32afb15ea69701a7f4eb/plugins/inpaint.h + - curl -L -s -S -o CImg/CImg.h https://raw.githubusercontent.com/dtschump/CImg/b7d35ed7dd03ff1ac58be4c10b365035454f3771/CImg.h + - curl -L -s -S -o CImg/Inpaint/inpaint.h https://raw.githubusercontent.com/dtschump/CImg/b7d35ed7dd03ff1ac58be4c10b365035454f3771/plugins/inpaint.h - patch -p0 -dCImg < CImg/Inpaint/inpaint.h.patch #---------------------------------# diff --git a/CImg/Makefile b/CImg/Makefile index fcba397e6..130fa284d 100644 --- a/CImg/Makefile +++ b/CImg/Makefile @@ -156,7 +156,8 @@ endif # commit a3b57fe7f0cfbf84635e3070fc3c896b25ff6c5f is CImg 2.7.2 # commit 3efdd8fb35e76873edcb01f9c30af762aeccb97a is CImg 2.7.4 # commit 39215451d0b839b4e72d32afb15ea69701a7f4eb is CImg 2.8.0 -CIMGVERSION=39215451d0b839b4e72d32afb15ea69701a7f4eb +# commit b7d35ed7dd03ff1ac58be4c10b365035454f3771 is CImg 2.8.1 +CIMGVERSION=b7d35ed7dd03ff1ac58be4c10b365035454f3771 CImg.h: Inpaint/inpaint.h curl -L -s -S -o $@ https://raw.githubusercontent.com/dtschump/CImg/$(CIMGVERSION)/CImg.h