# HG changeset patch
# User lu_zero
# Date 1169031727 0
# Node ID d276d6eed6a0e63d2b812982cc09f30814826ada
# Parent  0924cc1db086aec49140c171a7d6f17ec5544e97
Avoid branches in the loop and solve a gcc warning

diff -r 0924cc1db086 -r d276d6eed6a0 imgconvert.c
--- a/imgconvert.c	Wed Jan 17 10:47:58 2007 +0000
+++ b/imgconvert.c	Wed Jan 17 11:02:07 2007 +0000
@@ -2256,7 +2256,7 @@
             int pix_fmt, int padtop, int padbottom, int padleft, int padright,
             int *color)
 {
-    uint8_t *optr, *iptr;
+    uint8_t *optr;
     int y_shift;
     int x_shift;
     int yheight;
@@ -2274,24 +2274,30 @@
                 dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift));
         }
 
-        if (padleft || padright || src) {
-            if (src) { /* first line */
-                iptr = src->data[i];
-                optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
-                        (padleft >> x_shift);
-                memcpy(optr, iptr, src->linesize[i]);
-                iptr += src->linesize[i];
-            }
+        if (padleft || padright) {
             optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
                 (dst->linesize[i] - (padright >> x_shift));
             yheight = (height - 1 - (padtop + padbottom)) >> y_shift;
             for (y = 0; y < yheight; y++) {
                 memset(optr, color[i], (padleft + padright) >> x_shift);
-                if (src) {
-                    memcpy(optr + ((padleft + padright) >> x_shift), iptr,
-                        src->linesize[i]);
-                    iptr += src->linesize[i];
-                }
+                optr += dst->linesize[i];
+            }
+        }
+
+        if (src) { /* first line */
+            uint8_t *iptr = src->data[i];
+            optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
+                    (padleft >> x_shift);
+            memcpy(optr, iptr, src->linesize[i]);
+            iptr += src->linesize[i];
+            optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
+                (dst->linesize[i] - (padright >> x_shift));
+            yheight = (height - 1 - (padtop + padbottom)) >> y_shift;
+            for (y = 0; y < yheight; y++) {
+                memset(optr, color[i], (padleft + padright) >> x_shift);
+                memcpy(optr + ((padleft + padright) >> x_shift), iptr,
+                    src->linesize[i]);
+                iptr += src->linesize[i];
                 optr += dst->linesize[i];
             }
         }