Optimize a little bit. (More for consistency than because it makes much of

Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
	a little bit. (More for consistency than because it
	makes much of a difference.)

ChangeLog

+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+	a little bit. (More for consistency than because it
+	makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

ChangeLog.pre-2-0

+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+	a little bit. (More for consistency than because it
+	makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

ChangeLog.pre-2-10

+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+	a little bit. (More for consistency than because it
+	makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

ChangeLog.pre-2-2

+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+	a little bit. (More for consistency than because it
+	makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

ChangeLog.pre-2-4

+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+	a little bit. (More for consistency than because it
+	makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

ChangeLog.pre-2-6

+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+	a little bit. (More for consistency than because it
+	makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

ChangeLog.pre-2-8

+Fri Jan  4 01:36:48 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkdrawable-x11.c (convert_to_format): Optimize
+	a little bit. (More for consistency than because it
+	makes much of a difference.)
+
 Thu Jan  3 22:18:15 2002  Owen Taylor  <otaylor@redhat.com>
 	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkprivate-x11.h

gdk/x11/gdkdrawable-x11.c

@@ -1042,20 +1042,18 @@ convert_to_format (guchar        *src_buf,
 	    guchar *p = (src_buf + i * src_rowstride);
 	    guchar *q = (dest_buf + i * dest_rowstride);
 	    guchar *end = p + 4 * width;
-	    guchar a;
-	    guint t;
+	    guint t1,t2,t3;
 	    
-#define MULT(d,c,a) G_STMT_START { t = c * a; d = ((t >> 8) + t) >> 8; } G_STMT_END
+#define MULT(d,c,a,t) G_STMT_START { t = c * a; d = ((t >> 8) + t) >> 8; } G_STMT_END
 	    
 	    if (dest_byteorder == GDK_LSB_FIRST)
 	      {
 		while (p < end)
 		  {
-		    a = p[3];
-		    MULT(q[0], p[2], a);
-		    MULT(q[1], p[1], a);
-		    MULT(q[2], p[0], a);
-		    q[3] = a;
+		    MULT(q[0], p[2], p[3], t1);
+		    MULT(q[1], p[1], p[3], t2);
+		    MULT(q[2], p[0], p[3], t3);
+		    q[3] = p[3];
 		    p += 4;
 		    q += 4;
 		  }
@@ -1064,11 +1062,10 @@ convert_to_format (guchar        *src_buf,
 	      {
 		while (p < end)
 		  {
-		    a = p[3];
-		    q[0] = a;
-		    MULT(q[1], p[0], a);
-		    MULT(q[2], p[1], a);
-		    MULT(q[3], p[2], a);
+		    q[0] = p[3];
+		    MULT(q[1], p[0], p[3], t1);
+		    MULT(q[2], p[1], p[3], t2);
+		    MULT(q[3], p[2], p[3], t3);
 		    p += 4;
 		    q += 4;
 		  }