ports/144371: [Maintainer Update] grahpics/c-a-i-r 2.19

[Kuan-Chung Chiu]

>Number:         144371
>Category:       ports
>Synopsis:       [Maintainer Update] grahpics/c-a-i-r 2.19
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 28 18:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Kuan-Chung Chiu
>Release:        9.0-CURRENT
>Organization:
N/A
>Environment:
FreeBSD Zeta.twbbs.org 9.0-CURRENT FreeBSD 9.0-CURRENT #1: Fri Feb 26 04:23:00 CST 2010     root at Zeta.twbbs.org:/usr/obj/usr/src/sys/ZETA  i386 Zeta

>Description:
Update grahpics/c-a-i-r to 2.19
tested in i386 tinderbox for FreeBSD 6,7,8,9
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN c-a-i-r.orig/Makefile c-a-i-r/Makefile
--- c-a-i-r.orig/Makefile	2010-02-28 16:50:59.000000000 +0800
+++ c-a-i-r/Makefile	2010-02-28 16:55:37.000000000 +0800
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	c-a-i-r
-PORTVERSION=	2.17
+PORTVERSION=	2.19
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CAIR%20v${PORTVERSION}
-DISTNAME=	CAIR_MT_v2.17
+DISTNAME=	CAIR_v${PORTVERSION}
 
 MAINTAINER=	buganini at gmail.com
 COMMENT=	Content Aware Image Resizer is an implementation of seam carving
@@ -22,6 +22,6 @@
 PLIST_FILES=	bin/cair
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/cair ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/cair ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff -ruN c-a-i-r.orig/distinfo c-a-i-r/distinfo
--- c-a-i-r.orig/distinfo	2010-02-28 16:50:59.000000000 +0800
+++ c-a-i-r/distinfo	2010-02-28 16:55:37.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (CAIR_MT_v2.17.zip) = 0bf903c4550d44a3467f676d41c05a41
-SHA256 (CAIR_MT_v2.17.zip) = 85178eaba17a14e86bd5f81e345a393397db20569b79350fed6c146c89fdc188
-SIZE (CAIR_MT_v2.17.zip) = 217913
+MD5 (CAIR_v2.19.zip) = 28a9dc0dd1e9f7cb9218bb7e0d380a1d
+SHA256 (CAIR_v2.19.zip) = 41fe2f3d28de657648a543c0af98cfc646ed33b6ebef4158a3874f1bf6ff2853
+SIZE (CAIR_v2.19.zip) = 212614
diff -ruN c-a-i-r.orig/files/patch-CAIR.cpp c-a-i-r/files/patch-CAIR.cpp
--- c-a-i-r.orig/files/patch-CAIR.cpp	2010-02-28 16:50:59.000000000 +0800
+++ c-a-i-r/files/patch-CAIR.cpp	2010-02-28 16:55:37.000000000 +0800
@@ -1,56 +1,38 @@
---- CAIR.cpp.orig	2008-10-19 19:15:39.000000000 +0800
-+++ CAIR.cpp	2008-10-19 19:17:24.000000000 +0800
-@@ -252,7 +252,7 @@
+--- CAIR.cpp.orig	2010-02-28 16:52:50.000000000 +0800
++++ CAIR.cpp	2010-02-28 16:53:17.000000000 +0800
+@@ -276,7 +276,7 @@
  //Our thread function for the Grayscale
  void * Gray_Quadrant( void * id )
  {
--	int num = (int)id;
-+	long int num = (long int)id;
+-	int num = *((int *)id);
++	long int num = *((long int *)id);
  
  	while( true )
  	{
-@@ -417,7 +417,7 @@
- //This is multi-threaded to 4 threads, spliting the image into 4 strips
+@@ -437,7 +437,7 @@
+ //The thread function, splitting the image into strips
  void * Edge_Quadrant( void * id )
  {
--	int num = (int)id;
-+	long int num = (long int)id;
+-	int num = *((int *)id);
++	long int num = *((long int *)id);
  
  	while( true )
  	{
-@@ -612,7 +612,7 @@
- //=========================================================================================================//
- void * Energy_Left( void * id )
- {
--	int num = (int)id;
-+	long int num = (long int)id;
- 	int energy = 0;// current calculated enery
- 	int min_x = 0, max_x = 0;
- 
-@@ -727,7 +727,7 @@
- //=========================================================================================================//
- void * Energy_Right( void * id )
- {
--	int num = (int)id;
-+	long int num = (long int)id;
- 	int energy = 0;// current calculated enery
- 	int min_x = 0, max_x = 0;
- 
-@@ -938,7 +938,7 @@
- //This works like Remove_Quadrant, stripes across the image.
+@@ -744,7 +744,7 @@
+ //This works like Remove_Quadrant, strips across the image.
  void * Add_Quadrant( void * id )
  {
--	int num = (int)id;
-+	long int num = (long int)id;
+-	int num = *((int *)id);
++	long int num = *((long int *)id);
  	Thread_Params add_area;
  
  	while( true )
-@@ -1245,7 +1245,7 @@
+@@ -907,7 +907,7 @@
  //the areas are not quadrants, rather, more like strips, but I keep the name convention
  void * Remove_Quadrant( void * id )
  {
--	int num = (int)id;
-+	long int num = (long int)id;
+-	int num = *((int *)id);
++	long int num = *((long int *)id);
  	Thread_Params remove_area;
  
  	while( true )


>Release-Note:
>Audit-Trail:
>Unformatted: