rpms/icon-slicer/devel icon-slicer-0.3-cursor.patch, NONE, 1.1 icon-slicer.spec, 1.14, 1.15

[Simon Schampijer]

Author: erikos

Update of /cvs/pkgs/rpms/icon-slicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24512

Modified Files:
	icon-slicer.spec 
Added Files:
	icon-slicer-0.3-cursor.patch 
Log Message:
* Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.3-12
- hotspot location ignores the y-coordinate (#494521)



icon-slicer-0.3-cursor.patch:

--- NEW FILE icon-slicer-0.3-cursor.patch ---
diff -ur icon-slicer-0.3/src/main.c-old icon-slicer-0.3/src/main.c
--- icon-slicer-0.3/src/main.c-old	2009-03-19 18:21:14.490676675 +0100
+++ icon-slicer-0.3/src/main.c	2009-03-19 18:21:32.753675714 +0100
@@ -89,7 +89,7 @@ theme_source_location_bounds (ThemeSourc
 {
   ThemeImage *image = theme_source_find_image (source, frame_index);
   int start_x, start_y;
-  int i, j;
+  int x, y;
   
   const guchar *pixels;
   int rowstride;
@@ -103,7 +103,7 @@ theme_source_location_bounds (ThemeSourc
   if (n_channels == 3)
     {
       out->x = start_x;
-      out->y = start_x;
+      out->y = start_y;
       out->width = source->gridsize;
       out->height = source->gridsize;
       
@@ -116,29 +116,29 @@ theme_source_location_bounds (ThemeSourc
       
       pixels = gdk_pixbuf_get_pixels (image->image) + start_y * rowstride + start_x * 4;
 
-      for (j = 0; j < source->gridsize; j++)
+      for (y = 0; y < source->gridsize; y++)
 	{
-	  for (i = 0; i < source->gridsize; i++)
+	  for (x = 0; x < source->gridsize; x++)
 	    {
-	      if (pixels[4*i + 3] > threshold)
+	      if (pixels[4*x + 3] > threshold)
 		{
 		  if (found)
 		    {
-		      if (start_x + i < min_x)
-			min_x = start_x + i;
-		      if (start_x + i >= max_x)
-			max_x = start_x + i + 1;
-		      if (start_y + j < min_y)
-			min_y = start_y + j;
-		      if (start_y + j >= max_y)
-			max_y = start_y + j + 1;
+		      if (start_x + x < min_x)
+			min_x = start_x + x;
+		      if (start_x + x >= max_x)
+			max_x = start_x + x + 1;
+		      if (start_y + y < min_y)
+			min_y = start_y + y;
+		      if (start_y + y >= max_y)
+			max_y = start_y + y + 1;
 		    }
 		  else
 		    {
-		      min_x = start_x + i;
-		      max_x = start_x + i + 1;
-		      min_y = start_y + i;
-		      max_y = start_y + i + 1;
+		      min_x = start_x + x;
+		      max_x = start_x + x + 1;
+		      min_y = start_y + y;
+		      max_y = start_y + y + 1;
 
 		      found = TRUE;
 		    }


Index: icon-slicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icon-slicer/devel/icon-slicer.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- icon-slicer.spec	25 Feb 2009 06:43:41 -0000	1.14
+++ icon-slicer.spec	8 Apr 2009 08:16:48 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utility for icon theme generation
 Name: icon-slicer
 Version: 0.3
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Group: Development/Tools
 Source: icon-slicer-%{version}.tar.gz
@@ -10,6 +10,7 @@
 BuildRequires: popt-devel
 
 Patch1: icon-slicer-0.3-attachpoints.patch
+Patch2: icon-slicer-0.3-cursor.patch
 
 %description
 icon-slicer is a utility for generating icon themes and libXcursor cursor 
@@ -18,6 +19,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .attachpoints
+%patch2 -p1 -b .cursor
 
 %build
 %configure
@@ -37,6 +39,9 @@
 %{_bindir}/icon-slicer
 
 %changelog
+* Wed Apr 08 2009 Simon Schampijer <simon at schampijer.de> - 0.3-12
+- hotspot location ignores the y-coordinate (#494521)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild