aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/seam-carving-gui/Makefile6
-rw-r--r--graphics/seam-carving-gui/distinfo6
-rw-r--r--graphics/seam-carving-gui/files/patch-cair_CAIR.cpp48
3 files changed, 21 insertions, 39 deletions
diff --git a/graphics/seam-carving-gui/Makefile b/graphics/seam-carving-gui/Makefile
index 5388411d13c3..89d85d4112ee 100644
--- a/graphics/seam-carving-gui/Makefile
+++ b/graphics/seam-carving-gui/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= seam-carving-gui
-PORTVERSION= 1.10
-PORTREVISION= 1
+PORTVERSION= 1.11
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+DISTNAME= SeamCarvingGui-Src-${PORTVERSION}
MAINTAINER= buganini@gmail.com
COMMENT= The Seam Carving GUI is a GUI front end to CAIR
@@ -20,7 +20,7 @@ USE_GMAKE= yes
USE_QT_VER= 4
QT_COMPONENTS= gui imageformats_run moc_build qmake_build uic_build
-WRKSRC= ${WRKDIR}/${PORTNAME}
+WRKSRC= ${WRKDIR}/Src\ Seam\ Carving\ GUI\ ${PORTVERSION}
PLIST_FILES= bin/SeamCarvingGui
diff --git a/graphics/seam-carving-gui/distinfo b/graphics/seam-carving-gui/distinfo
index 1b81822371a7..801e34410ee0 100644
--- a/graphics/seam-carving-gui/distinfo
+++ b/graphics/seam-carving-gui/distinfo
@@ -1,3 +1,3 @@
-MD5 (seam-carving-gui-1.10.tar.gz) = 38ff9e6f1284a84c76730f18fd5d26f0
-SHA256 (seam-carving-gui-1.10.tar.gz) = 0d626b0f1653fc21dadd3c1c79fa56ca1a59a280ee5d9292da7a15271006a568
-SIZE (seam-carving-gui-1.10.tar.gz) = 130729
+MD5 (SeamCarvingGui-Src-1.11.tar.gz) = 5e247850cb22633cfdca048973ed1749
+SHA256 (SeamCarvingGui-Src-1.11.tar.gz) = 688e34b8e2934fe80f30d457d20feb3a599804aafe49d5acf6d26dfe81549c5c
+SIZE (SeamCarvingGui-Src-1.11.tar.gz) = 4334039
diff --git a/graphics/seam-carving-gui/files/patch-cair_CAIR.cpp b/graphics/seam-carving-gui/files/patch-cair_CAIR.cpp
index 46d1b5db8105..3c66e1a8ef49 100644
--- a/graphics/seam-carving-gui/files/patch-cair_CAIR.cpp
+++ b/graphics/seam-carving-gui/files/patch-cair_CAIR.cpp
@@ -1,56 +1,38 @@
---- cair/CAIR.cpp.orgi 2008-11-23 23:22:33.000000000 +0100
-+++ cair/CAIR.cpp 2008-11-23 23:23:59.000000000 +0100
-@@ -260,7 +260,7 @@
+--- cair/CAIR.cpp.orig 2010-02-28 16:44:47.000000000 +0800
++++ cair/CAIR.cpp 2010-02-28 16:45:32.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 )
{
-@@ -425,7 +425,7 @@
+@@ -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 )
{
-@@ -619,7 +619,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;
-
-@@ -734,7 +734,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;
-
-@@ -945,7 +945,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 )
-@@ -1260,7 +1260,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 )