Mercurial > mplayer.hg

changeset 34131:db5ddd7433c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Adjust indent.
author ib
date Thu, 20 Oct 2011 12:12:51 +0000
parents b0c63b098b6b
children 085b62ad0cf9
files gui/util/bitmap.c
diffstat 1 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/gui/util/bitmap.c	Thu Oct 20 12:05:47 2011 +0000
+++ b/gui/util/bitmap.c	Thu Oct 20 12:12:51 2011 +0000
@@ -291,31 +291,31 @@
     buf = (uint32_t *)in->Image;
 
     for (y = 0; y < in->Height; y++) {
-    for (x = 0; x < in->Width; x++) {
-        if (!IS_TRANSPARENT(buf[i]))
-            tmp |= b;
-        else {
-            buf[i] = 0;
-            shaped = 1;
+        for (x = 0; x < in->Width; x++) {
+            if (!IS_TRANSPARENT(buf[i]))
+                tmp |= b;
+            else {
+                buf[i] = 0;
+                shaped = 1;
+            }
+
+            i++;
+            b <<= 1;
+
+            if (b == 0) {
+                out->Image[c++] = tmp;
+                tmp = 0;
+                b   = 1;
+            }
         }
 
-        i++;
-        b <<= 1;
-
-        if (b == 0) {
+        if (b != 1) {
             out->Image[c++] = tmp;
             tmp = 0;
             b   = 1;
         }
     }
 
-    if (b != 1) {
-        out->Image[c++] = tmp;
-        tmp = 0;
-        b   = 1;
-    }
-    }
-
     if (!shaped)
         bpFree(out);