5 files changed, 36 insertions, 52 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 118dc9db6499..b4d1b255797c 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cimg
-DISTVERSION=	1-18
+DISTVERSION=	1-19
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index e9d04a96aa43..9cd9c72a97d5 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,3 +1,3 @@
-MD5 (cimg-1.18/CImg-1-18.zip) = 04cfec2237a87fab394e48a814b346f1
-SHA256 (cimg-1.18/CImg-1-18.zip) = c00f0616e1dc4d6bcf532107404589b49ccfacfb1e24f10830a99727d27a1d8e
-SIZE (cimg-1.18/CImg-1-18.zip) = 3730154
+MD5 (cimg-1.19/CImg-1-19.zip) = 9da47027db53bb2e3ff4e490a524dd9a
+SHA256 (cimg-1.19/CImg-1-19.zip) = 9019f7d8930be73eeb8106c4e9467dd3c1ce804327361fb9414d182879ba6123
+SIZE (cimg-1.19/CImg-1-19.zip) = 3764965
diff --git a/graphics/cimg/files/patch-CImg.h b/graphics/cimg/files/patch-CImg.h
index 553df423e69c..32e7fc5e6706 100644
--- a/graphics/cimg/files/patch-CImg.h
+++ b/graphics/cimg/files/patch-CImg.h
@@ -1,6 +1,15 @@
---- CImg.h.orig	Mon Nov  6 15:26:08 2006
-+++ CImg.h	Mon Nov  6 19:33:58 2006
-@@ -20255,10 +20255,10 @@
+--- CImg.h.orig	Mon Mar  5 18:56:32 2007
++++ CImg.h	Mon Mar  5 20:47:05 2007
+@@ -3778,7 +3778,7 @@
+    */
+   //! Class used to compute basic statistics on pixel values of a \ref CImg image.
+   /**
+-      Constructing a CImgStats instance from an image CImg<T> or a list CImgList<T>
++      Constructing a CImgStats instance from an image CImg&lt;T&gt; or a list CImgList&lt;T&gt;
+       will compute the minimum, maximum and average pixel values of the input object.
+       Optionally, the variance of the pixel values can be computed.
+       Coordinates of the pixels whose values are minimum and maximum are also stored.
+@@ -21622,10 +21622,10 @@
    \ref cimg_library::cimg namespace as a default namespace, since it contains functions whose names are already
    defined in the standard C/C++ library.
  
@@ -13,30 +22,7 @@
    to store different frames of an image sequence.
  
    - The class \ref cimg_library::CImgDisplay is able to display images or image lists into graphical display windows.
-@@ -20411,16 +20411,16 @@
-   compressed image format (GIF,PNG,...).
-   See also cimg_library::CImg::get_load_convert() and cimg_library::CImg::save_convert() for more informations.
- 
--  - \b \c cimg_plugin : This variable tells the library to use a plugin file to add features to the CImg<T> class.
--  Define it with the path of your plugin file, if you want to add member functions to the CImg<T> class,
--  without having to modify directly the \c "CImg.h" file. An include of the plugin file is performed in the CImg<T>
-+  - \b \c cimg_plugin : This variable tells the library to use a plugin file to add features to the CImg&lt;T&gt; class.
-+  Define it with the path of your plugin file, if you want to add member functions to the CImg&lt;T&gt; class,
-+  without having to modify directly the \c "CImg.h" file. An include of the plugin file is performed in the CImg&lt;T&gt;
-   class. If \c cimg_plugin if not specified (default), no include is done.
-   
--  - \b \c cimglist_plugin : Same as \c cimg_plugin, but to add features to the CImgList<T> class.
-+  - \b \c cimglist_plugin : Same as \c cimg_plugin, but to add features to the CImgList&lt;T&gt; class.
-   
--  - \b \c cimgdisplay_plugin : Same as \c cimg_plugin, but to add features to the CImgDisplay<T> class.
-+  - \b \c cimgdisplay_plugin : Same as \c cimg_plugin, but to add features to the CImgDisplay&lt;T&gt; class.
- 
--  - \b \c cimgstats_plugin : Same as \c cimg_plugin, but to add features to the CImgStats<T> class.
-+  - \b \c cimgstats_plugin : Same as \c cimg_plugin, but to add features to the CImgStats&lt;T&gt; class.
- 
-   All these compilation variables can be checked, using the function cimg_library::cimg::info(), which
-   displays a list of the different configuration variables and their values on the standard error output.
-@@ -20587,7 +20587,7 @@
+@@ -21966,7 +21966,7 @@
    This macro loops over the pixel data buffer of the image \c img, using an offset \c ,
    starting from the beginning of the buffer (first pixel, \c off=0)
    till the end of the buffer (last pixel value, <tt>off = img.size()-1</tt>).
@@ -45,7 +31,7 @@
        - \c off is an inner-loop variable, only defined inside the scope of the loop.
  
    Here is an example of use :
-@@ -20683,7 +20683,7 @@
+@@ -22062,7 +22062,7 @@
  
    For all these loops, \c x and \c y are inner-defined variables only visible inside the scope of the loop.
    They don't have to be defined before the call of the macro.
@@ -54,7 +40,7 @@
    vector channel the loop must apply (usually both 0 for grayscale 2D images).
    Finally, \c I is the 2x2, 3x3, 4x4 or 5x5 neighborhood that will be updated with the correct pixel values
    during the loop (see \ref lo9).
-@@ -20697,7 +20697,7 @@
+@@ -22076,7 +22076,7 @@
  
    For all these loops, \c x, \c y and \c z are inner-defined variables only visible inside the scope of the loop.
    They don't have to be defined before the call of the macro.
@@ -63,7 +49,7 @@
    the loop must apply (usually 0 for grayscale 3D images).
    Finally, \c I is the 2x2x2 or 3x3x3 neighborhood that will be updated with the correct pixel values
    during the loop (see \ref lo9).
-@@ -20741,7 +20741,7 @@
+@@ -22120,7 +22120,7 @@
    values than the nearest valid pixel in the image (this is also called the \e Neumann \e border \e condition).
  
    \subsection lo10 Neighborhood as a reference
@@ -72,7 +58,7 @@
    allocating new variables. This is done by adding \c _ref to the macro names used for the neighborhood definition :
  
    - \b CImg_2x2x1_ref(I,type,tab) : Define a 2x2 neighborhood named \c I, of type \c type, as a reference to \c tab.
-@@ -20751,7 +20751,7 @@
+@@ -22130,7 +22130,7 @@
    - \b CImg_2x2x2_ref(I,type,tab) : Define a 2x2x2 neighborhood named \c I, of type \c type, as a reference to \c tab.
    - \b CImg_3x3x3_ref(I,type,tab) : Define a 3x3x3 neighborhood named \c I, of type \c type, as a reference to \c tab.
  
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile
index c9e171252568..74d0d983ea7f 100644
--- a/graphics/cimg/files/patch-examples::Makefile
+++ b/graphics/cimg/files/patch-examples::Makefile
@@ -1,21 +1,21 @@
---- examples/Makefile.orig	Fri Jan 26 11:09:14 2007
-+++ examples/Makefile	Sat Jan 27 14:37:02 2007
-@@ -7,10 +7,10 @@
- # -----------------------------------------------------------------------------------
+--- examples/Makefile.orig	Mon Mar  5 18:56:32 2007
++++ examples/Makefile	Mon Mar  5 20:52:01 2007
+@@ -29,10 +29,10 @@
+ 	     inrcast
  
  # Set correct variables and paths
 -CC       = g++
 -X11PATH  = /usr/X11R6
--CFLAGS   = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
--LDFLAGS  = -L$(X11PATH)/lib -lm -lpthread -lX11
+-CFLAGS   = -Wall -W -ansi -pedantic -ffast-math
+-LDFLAGS  = -lm -lpthread
 +CC       = $(CXX)
 +#X11PATH  = /usr/X11R6
-+#CFLAGS   = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include
-+#LDFLAGS  = -L$(X11PATH)/lib -lm -lpthread -lX11
++#CFLAGS   = -Wall -W -ansi -pedantic -ffast-math
++#LDFLAGS  = -lm -lpthread
  
  # Set CImg version number
- CIMG_VERSION = 1.18
-@@ -25,21 +25,21 @@
+ CIMG_VERSION = 1.19
+@@ -54,19 +54,19 @@
  CIMG_XRANDR_FLAGS = -Dcimg_use_xrandr -lXrandr
  
  # Uncomment to enable native support for PNG image files, using the PNG library.
@@ -38,21 +38,18 @@
 -#CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
 +CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
  
--OPTFLAGS = -O3 $(CIMG_STRICT_FLAG) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
-+OPTFLAGS = $(CIMG_STRICT_FLAG) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
+ EXTRA_FLAGS = $(CIMG_STRICT_FLAG) $(CIMG_XSHM_FLAGS) $(CIMG_XRANDR_FLAGS) $(CIMG_PNG_FLAGS) $(CIMG_JPEG_FLAGS) $(CIMG_TIFF_FLAGS) $(CIMG_MAGICK_FLAGS) $(CIMG_FFTW3_FLAGS)
  
- CIMG_FILES = CImg_demo \
- 	     dtmri_view \
-@@ -67,7 +67,7 @@
+@@ -75,7 +75,7 @@
  	@echo
  	@echo "** Compiling '$* ($(CIMG_VERSION))' with '`$(CC) -v 2>&1 | grep version`'"
  	@echo
 -	$(CC) -o $* $< $(CFLAGS) $(LDFLAGS) $(ARCHFLAGS)
-+	$(CC) -o $* $< $(CPPFLAGS) -ansi -ffast-math  -I$(X11PATH)/include $(OPTFLAGS) -lX11 -L$(X11PATH)/lib $(LDFLAGS)
++	$(CC) -o $* $< $(CPPFLAGS) -ansi -ffast-math  -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib $(LDFLAGS)
  menu:
  	@echo
  	@echo "CImg Library $(CIMG_VERSION) : Examples"
-@@ -92,7 +92,7 @@
+@@ -100,7 +100,7 @@
  all: $(CIMG_FILES)
  
  clean:
diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist
index 6efd046c7eff..d935954da243 100644
--- a/graphics/cimg/pkg-plist
+++ b/graphics/cimg/pkg-plist
@@ -135,6 +135,7 @@ include/CImg.h
 %%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__displays.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__drawing.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__environment.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__faq.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__files__io.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__loops.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__options.html