diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2006-11-06 23:13:07 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2006-11-06 23:13:07 +0000 |
commit | 7295aa88c989fbf546cd293135c33627184a4fa5 (patch) | |
tree | 6efbf6f05737d74d5b8685a3cdeba21cbdf645e2 /graphics/cimg | |
parent | Add p5-Class-DBI-Plugin-Pager 0.561, perl extension to paged queries for (diff) |
Upgrade to CImg v.1.1.7.
Changelog at
<https://sourceforge.net/project/shownotes.php?release_id=461390>.
Notes
Notes:
svn path=/head/; revision=176662
Diffstat (limited to 'graphics/cimg')
-rw-r--r-- | graphics/cimg/Makefile | 6 | ||||
-rw-r--r-- | graphics/cimg/distinfo | 6 | ||||
-rw-r--r-- | graphics/cimg/files/patch-CImg.h | 83 | ||||
-rw-r--r-- | graphics/cimg/files/patch-examples::Makefile | 6 | ||||
-rw-r--r-- | graphics/cimg/pkg-plist | 14 |
5 files changed, 102 insertions, 13 deletions
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 50aabbd50ad5..6a423d1a95da 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cimg -DISTVERSION= 1-16 +DISTVERSION= 1-17 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -27,8 +27,8 @@ USE_GCC= 3.4 REINPLACE_ARGS= -i "" DOCBASE= CHANGES.txt README.txt DOCREFS= download.shtml favicon.ico favicon.png foot_reference.html \ - head.html head_reference.html img index.shtml news.html \ - reference screenshots.shtml + head.html head_reference.html img index.shtml links.shtml \ + news.shtml reference screenshots.shtml .else NOBUILD= yes .endif diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo index 05a78783206c..18cf517c04fc 100644 --- a/graphics/cimg/distinfo +++ b/graphics/cimg/distinfo @@ -1,3 +1,3 @@ -MD5 (CImg-1-16.zip) = 2da106df51c5e5052ccbc3830c79bae8 -SHA256 (CImg-1-16.zip) = 7236aa9dba702983bf5ba52e6c7743b50bc8f998c8100520e3ffb08c314917b4 -SIZE (CImg-1-16.zip) = 3601071 +MD5 (CImg-1-17.zip) = d12cbd6bfec6b9e3a3fabf5e5249c09d +SHA256 (CImg-1-17.zip) = 39cec14502593958c80b3428414b6ec64f911b3b9b942a0b14f6bf3baad781c6 +SIZE (CImg-1-17.zip) = 3626765 diff --git a/graphics/cimg/files/patch-CImg.h b/graphics/cimg/files/patch-CImg.h new file mode 100644 index 000000000000..553df423e69c --- /dev/null +++ b/graphics/cimg/files/patch-CImg.h @@ -0,0 +1,83 @@ +--- CImg.h.orig Mon Nov 6 15:26:08 2006 ++++ CImg.h Mon Nov 6 19:33:58 2006 +@@ -20255,10 +20255,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. + +- - The class \ref cimg_library::CImg<T> represents images up to 4-dimensions wide, containing pixels of type \c T ++ - The class \ref cimg_library::CImg<T> represents images up to 4-dimensions wide, containing pixels of type \c T + (template parameter). This is actually the main class of the library. + +- - The class \ref cimg_library::CImgList<T> represents lists of cimg_library::CImg<T> images. It can be used for instance ++ - The class \ref cimg_library::CImgList<T> represents lists of cimg_library::CImg<T> images. It can be used for instance + 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<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> + 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<T> 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<T> 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<T> 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 @@ + 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>). +- - \c img must be a (non empty) cimg_library::CImg<T> image of pixels \c T. ++ - \c img must be a (non empty) cimg_library::CImg<T> image of pixels \c T. + - \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 @@ + + 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. +- \c img is a non empty CImg<T> image. \c z and \c v are constants that define on which image slice and ++ \c img is a non empty CImg<T> image. \c z and \c v are constants that define on which image slice and + 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 @@ + + 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. +- \c img is a non empty CImg<T> image. \c v is a constant that defines on which image channel ++ \c img is a non empty CImg<T> image. \c v is a constant that defines on which image channel + 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 @@ + 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 +- It is also possible to define neighborhood variables as references to classical C-arrays or CImg<T> images, instead of ++ It is also possible to define neighborhood variables as references to classical C-arrays or CImg<T> images, instead of + 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 @@ + - \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. + +- \c tab can be a one-dimensionnal C-style array, or a non empty \c CImg<T> image. Both objects must have ++ \c tab can be a one-dimensionnal C-style array, or a non empty \c CImg<T> image. Both objects must have + same sizes as the considered neighborhoods. + + \subsection lo11 Example codes diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile index 4e72f92ea65d..9623d5f9623f 100644 --- a/graphics/cimg/files/patch-examples::Makefile +++ b/graphics/cimg/files/patch-examples::Makefile @@ -1,9 +1,9 @@ ---- examples/Makefile.orig Thu Sep 21 15:25:22 2006 -+++ examples/Makefile Thu Sep 21 20:34:29 2006 +--- examples/Makefile.orig Mon Nov 6 15:26:08 2006 ++++ examples/Makefile Mon Nov 6 16:16:00 2006 @@ -8,10 +8,10 @@ # Set correct variables and paths - CIMGVER = 1.16 + CIMGVER = 1.17 -CC = g++ -X11PATH = /usr/X11R6 -CFLAGS = -Wall -W -ansi -pedantic -ffast-math -I$(X11PATH)/include diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist index 2946f898ec65..64817f60d5c1 100644 --- a/graphics/cimg/pkg-plist +++ b/graphics/cimg/pkg-plist @@ -11,16 +11,19 @@ include/CImg.h %%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo.jpg %%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo2.jpg %%PORTDOCS%%%%DOCSDIR%%/img/FAQ_item.jpg -%%PORTDOCS%%%%DOCSDIR%%/img/LastNews.jpg %%PORTDOCS%%%%DOCSDIR%%/img/download_item.jpg %%PORTDOCS%%%%DOCSDIR%%/img/item_codesample.jpg %%PORTDOCS%%%%DOCSDIR%%/img/item_getting.jpg %%PORTDOCS%%%%DOCSDIR%%/img/item_intro.jpg +%%PORTDOCS%%%%DOCSDIR%%/img/item_links.jpg +%%PORTDOCS%%%%DOCSDIR%%/img/item_news.jpg %%PORTDOCS%%%%DOCSDIR%%/img/logoCNRS.gif %%PORTDOCS%%%%DOCSDIR%%/img/logoGREYC.gif %%PORTDOCS%%%%DOCSDIR%%/img/logoIMAGE.gif %%PORTDOCS%%%%DOCSDIR%%/img/logoINRIA.gif %%PORTDOCS%%%%DOCSDIR%%/img/logoODYSSEE.png +%%PORTDOCS%%%%DOCSDIR%%/img/postcard1.jpg +%%PORTDOCS%%%%DOCSDIR%%/img/postcard2.jpg %%PORTDOCS%%%%DOCSDIR%%/img/project-support.jpg %%PORTDOCS%%%%DOCSDIR%%/img/screenshots_item.jpg %%PORTDOCS%%%%DOCSDIR%%/img/ss_blobs.jpg @@ -55,6 +58,7 @@ include/CImg.h %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000019.jpg %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000020.jpg %%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000021.jpg +%%PORTDOCS%%%%DOCSDIR%%/img/ss_mini_000022.jpg %%PORTDOCS%%%%DOCSDIR%%/img/ss_odykill.jpg %%PORTDOCS%%%%DOCSDIR%%/img/ss_optflow.jpg %%PORTDOCS%%%%DOCSDIR%%/img/ss_paint.jpg @@ -67,9 +71,11 @@ include/CImg.h %%PORTDOCS%%%%DOCSDIR%%/img/ss_tetris.jpg %%PORTDOCS%%%%DOCSDIR%%/img/ss_triangle.jpg %%PORTDOCS%%%%DOCSDIR%%/img/ss_volume3d.jpg +%%PORTDOCS%%%%DOCSDIR%%/img/ss_waves.jpg %%PORTDOCS%%%%DOCSDIR%%/img/tutorial.jpg %%PORTDOCS%%%%DOCSDIR%%/index.shtml -%%PORTDOCS%%%%DOCSDIR%%/news.html +%%PORTDOCS%%%%DOCSDIR%%/links.shtml +%%PORTDOCS%%%%DOCSDIR%%/news.shtml %%PORTDOCS%%%%DOCSDIR%%/reference/annotated.html %%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.css %%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png @@ -151,10 +157,10 @@ include/CImg.h %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_display.html %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_exception-members.html %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_exception.html +%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_list-members.html +%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_list.html %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_stats-members.html %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_img_stats.html -%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_imgl-members.html -%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1_c_imgl.html %%PORTDOCS%%%%DOCSDIR%%/reference/tab_b.gif %%PORTDOCS%%%%DOCSDIR%%/reference/tab_l.gif %%PORTDOCS%%%%DOCSDIR%%/reference/tab_r.gif |