Add cimg 1.0.6, the C++ Template Image Processing Library.

3 files changed, 256 insertions, 0 deletions

diff --git a/graphics/cimg/files/patch-CImg.h b/graphics/cimg/files/patch-CImg.h
new file mode 100644
index 000000000000..f83efccbf38e
--- /dev/null
+++ b/graphics/cimg/files/patch-CImg.h
@@ -0,0 +1,54 @@
+--- CImg.h.orig	Mon Oct 11 21:46:09 2004
++++ CImg.h	Mon Oct 11 22:04:08 2004
+@@ -55,7 +55,7 @@
+ 
+ // Autodetection of the current OS
+ #ifndef cimg_OS
+-#if defined(sun) || defined(__sun)        
++#if defined(sun) || defined(__sun)
+ // Solaris
+ #define cimg_OS            0
+ #ifndef cimg_display_type
+@@ -82,6 +82,15 @@
+ #ifndef cimg_display_type
+ #define cimg_display_type  1
+ #endif
++#elif defined(__FreeBSD__)
++// FreeBSD
++#define cimg_OS            4
++#ifndef cimg_display_type
++#define cimg_display_type  1
++#endif
++#ifndef cimg_color_terminal
++#define cimg_color_terminal
++#endif
+ #else 
+ // Other configurations
+ #define cimg_OS           -1
+@@ -1110,7 +1119,7 @@
+                  t_red,cimg_version,t_normal,__DATE__,__TIME__);
+     std::fprintf(stderr,"  > Architecture   : %s%-12s%s %s(cimg_OS=%d)\n%s",
+                  t_bold,
+-                 cimg_OS==0?"Solaris":(cimg_OS==1?"Linux":(cimg_OS==2?"Windows":(cimg_OS==3?"Mac OS X":"Unknown"))),
++                 cimg_OS==0?"Solaris":(cimg_OS==1?"Linux":(cimg_OS==2?"Windows":(cimg_OS==3?"Mac OS X":(cimg_OS==4?"FreeBSD":"Unknown")))),
+                  t_normal,t_purple,cimg_OS,t_normal);
+     std::fprintf(stderr,"  > Display type   : %s%-12s%s %s(cimg_display_type=%d)%s\n",
+                  t_bold,cimg_display_type==0?"No":(cimg_display_type==1?"X11":(cimg_display_type==2?"WindowsGDI":"Unknown")),t_normal,t_purple,cimg_display_type,t_normal);
+@@ -1542,7 +1551,7 @@
+   uint width;                 //!< Width of the display window.
+   uint height;                //!< Height of the display window.
+   uint normalize;             //!< Pixel value normalization.
+-  const uint attributes;      //!< Attributes of the display window.
++  uint attributes;            //!< Attributes of the display window.
+   volatile int mousex;        //!< When (attributes&3)>=2, this variable corresponds to the mouse pointer X-coordinate into the display window.
+   volatile int mousey;        //!< When (attributes&3)>=2, this variable corresponds to the mouse pointer Y-coordinate into the display window.
+   volatile uint button;       //!< When (attributes&3)>=2, these variables corresponds to the mouse button clicked into the display window.
+@@ -6575,7 +6584,7 @@
+   Here are the different environment variables used by the CImg Library :
+   
+   - \b \c cimg_OS : This variable defines the type of your current OS. It can be set to 0 (Solaris), 1 (Linux),
+-  2 (Windows), 3 (Mac OS X) or -1 (Other configuration).
++  2 (Windows), 3 (Mac OS X), 4 (FreeBSD) or -1 (Other configuration).
+   It should be actually auto-detected by the CImg library. If this is not the case (cimg_OS=-1), then you
+   will probably have to tune the environment variables described below.
+   - \b \c cimg_display_type : This variable defines the type of display library that will be used to
diff --git a/graphics/cimg/files/patch-Makefile b/graphics/cimg/files/patch-Makefile
new file mode 100644
index 000000000000..ba77f4b95dde
--- /dev/null
+++ b/graphics/cimg/files/patch-Makefile
@@ -0,0 +1,85 @@
+--- Makefile.orig	Fri Aug  6 17:35:44 2004
++++ Makefile	Mon Oct 11 22:42:11 2004
+@@ -1,41 +1,41 @@
+-#--------------------------------------------------------------------------------------

+-#

+-#  File :                 Makefile

+-#	

+-#  Description :          Makefile to compile CImg for Linux and Solaris

+-#

+-#  Author :               David Tschumperlé

+-#

+-#  Institution :          ODYSSEE, INRIA Sophia Antipolis.

+-#

+-#  Contact :              David.Tschumperle@sophia.inria.fr

+-#

+-#  Date :                 Project started november 1999.

+-#

+-# -----------------------------------------------------------------------------------

+-

+-# Set correct variables and paths

+-CC          = g++ -O4 -Wall-ansi -ffast-math

+-X11PATH     = /usr/X11R6

+-X11FLAGS    = -I$(X11PATH)/include -L$(X11PATH)/lib -lX11

+-

+-# Compilation rules

+-.cpp:	

+-	@echo "> Compiling '$*'"

+-	@$(CC) -o $* $< $(CFLAGS) $(X11FLAGS) $(LDFLAGS)

+-linux:

+-	@echo -e "\n** Starting the compilation of the entire CImg package for Linux. Please wait...\n"

+-	make "LDFLAGS=-lm -lpthread -Wl,-rpath $(X11PATH)/lib" all

+-solaris:

+-	@echo -e "\n** Starting the compilation of the entire CImg package for Solaris. Please wait...\n"

+-	make "LDFLAGS=-lm -lpthread -R$(X11PATH)/lib -lnsl -lsocket" all

+-doc:

+-	@echo "> Create documentation (you need the 'doxygen' tool, see http://www.doxygen.org)."

+-	@doxygen CImg.doxygen >/dev/null

+-all: CImg_test

+-	cd examples && make all

+-	make doc

+-	@echo -e "\n** All done successfully. You can launch 'CImg_test', or read documentation 'html/index.html'. **\n"

+-clean:

+-	cd examples && make clean

+-	rm -rf documentation CImg_test cimg_new core *~ *.o *.exe

++#--------------------------------------------------------------------------------------
++#
++#  File :                 Makefile
++#
++#  Description :          Makefile to compile CImg for Linux and Solaris
++#
++#  Author :               David Tschumperlé
++#
++#  Institution :          ODYSSEE, INRIA Sophia Antipolis.
++#
++#  Contact :              David.Tschumperle@sophia.inria.fr
++#
++#  Date :                 Project started november 1999.
++#
++# -----------------------------------------------------------------------------------
++
++# Set correct variables and paths
++CC          = $(CXX)
++#X11PATH     = /usr/X11R6
++X11FLAGS    = -I$(X11PATH)/include -L$(X11PATH)/lib -lX11
++
++# Compilation rules
++.cpp:
++	@echo "> Compiling '$*'"
++	$(CC) -o $* $< $(CPPFLAGS) -Wall -ansi -ffast-math $(X11FLAGS) $(LDFLAGS)
++linux:
++	@echo -e "\n** Starting the compilation of the entire CImg package for Linux. Please wait...\n"
++	make "LDFLAGS=-lm -lpthread -Wl,-rpath $(X11PATH)/lib" all
++solaris:
++	@echo -e "\n** Starting the compilation of the entire CImg package for Solaris. Please wait...\n"
++	make "LDFLAGS=-lm -lpthread -R$(X11PATH)/lib -lnsl -lsocket" all
++doc:
++	@echo "> Create documentation (you need the 'doxygen' tool, see http://www.doxygen.org)."
++	@doxygen CImg.doxygen >/dev/null
++all: CImg_test
++	cd examples && make all
++	make doc
++	@echo -e "\n** All done successfully. After install, you can launch 'CImg_test', or read documentation 'html/index.html'. **\n"
++clean:
++	cd examples && make clean
++	rm -rf documentation CImg_test cimg_new core *~ *.o *.exe
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
new file mode 100644
index 000000000000..d6ea6f6ad975
--- /dev/null
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -0,0 +1,117 @@
+--- examples/Makefile.orig	Fri Aug  6 17:35:46 2004
++++ examples/Makefile	Mon Oct 11 22:43:13 2004
+@@ -1,57 +1,57 @@
+-#--------------------------------------------------------------------------------------

+-#

+-#  Makefile :             Makefile for compiling CImg examples

+-#

+-#  Author :               David Tschumperlé

+-#

+-#  Institution :          ODYSSEE, INRIA Sophia Antipolis.

+-#

+-#  Contact :              David.Tschumperle@sophia.inria.fr

+-#

+-#  Date :                 Project started november 1999.

+-#

+-# -----------------------------------------------------------------------------------

+-

+-# Set correct variables and paths

+-CC         = g++ -O4 -Wall -ansi -ffast-math

+-X11PATH    = /usr/X11R6

+-X11FLAGS   = -I$(X11PATH)/include -L$(X11PATH)/lib -lX11

+-

+-# Compilation rules

+-.cpp:

+-	@echo "> Compiling '$*'"

+-	@$(CC) -o $* $< $(CFLAGS) $(X11FLAGS) $(LDFLAGS)

+-linux:

+-	make "LDFLAGS=-lm -lpthread -Wl,-rpath $(X11PATH)/lib" all

+-solaris:

+-	make "LDFLAGS=-lm -lpthread -R$(X11PATH)/lib -lnsl -lsocket" all

+-

+-all: fade_images \

+-     inpainter \

+-     odykill \

+-     pslider \

+-     inrcast \

+-     inrcrop \

+-     optical_flow \

+-     hough_transform \

+-     render3d \

+-     tutorial \

+-     tetris \

+-     pde_heatflow2D \

+-     pde_TschumperleDeriche2D

+-

+-clean:

+-	rm -f *.exe *~ \

+-	fade_images \

+-        inpainter \

+-        odykill \

+-        pslider \

+-        inrcast \

+-        inrcrop \

+-        optical_flow \

+-        hough_transform \

+-        render3d \

+-        tutorial \

+-        tetris \

+-        pde_heatflow2D \

+-        pde_TschumperleDeriche2D

++#--------------------------------------------------------------------------------------
++#
++#  Makefile :             Makefile for compiling CImg examples
++#
++#  Author :               David Tschumperlé
++#
++#  Institution :          ODYSSEE, INRIA Sophia Antipolis.
++#
++#  Contact :              David.Tschumperle@sophia.inria.fr
++#
++#  Date :                 Project started november 1999.
++#
++# -----------------------------------------------------------------------------------
++
++# Set correct variables and paths
++CC         = $(CXX)
++#X11PATH    = /usr/X11R6
++X11FLAGS   = -I$(X11PATH)/include -L$(X11PATH)/lib -lX11
++
++# Compilation rules
++.cpp:
++	@echo "> Compiling '$*'"
++	$(CC) -o $* $< $(CPPFLAGS) -Wall -ansi -ffast-math $(X11FLAGS) $(LDFLAGS)
++linux:
++	make "LDFLAGS=-lm -lpthread -Wl,-rpath $(X11PATH)/lib" all
++solaris:
++	make "LDFLAGS=-lm -lpthread -R$(X11PATH)/lib -lnsl -lsocket" all
++
++all: fade_images \
++     inpainter \
++     odykill \
++     pslider \
++     inrcast \
++     inrcrop \
++     optical_flow \
++     hough_transform \
++     render3d \
++     tutorial \
++     tetris \
++     pde_heatflow2D \
++     pde_TschumperleDeriche2D
++
++clean:
++	rm -f *.exe *~ *.orig \
++	fade_images \
++        inpainter \
++        odykill \
++        pslider \
++        inrcast \
++        inrcrop \
++        optical_flow \
++        hough_transform \
++        render3d \
++        tutorial \
++        tetris \
++        pde_heatflow2D \
++        pde_TschumperleDeriche2D