Mercurial > hg > forks > multipaint-js

changeset 224:33a5c7670e66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 05 Sep 2018 20:08:57 +0300
parents 62016fa40651
children 1c9deae71fb1
files exporters.pde
diffstat 1 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/exporters.pde	Wed Sep 05 13:12:24 2018 +0300
+++ b/exporters.pde	Wed Sep 05 20:08:57 2018 +0300
@@ -1092,13 +1092,13 @@
     if (image.width <= 16 || image.height <= 16)
         return false;
 
-    int balx, baly, xx, yy, x2, y2, rr, gg, bb, avg, i, j, target;
+    int balx, baly, xx, yy, x2, y2, rr, gg, bb, avg, i, j;
     int cx, cy;
     int swap, idefix, avx, avy;
     int[] pixut = new int[260];
     int[] idx = new int[260];
     int[] histog = new int[8192];
-    float ww, hh, fld, compa;
+    float ww, hh, fld;
     color c;
     int xcolors, limitter, vertti, erkki;
     int rh, gh, bh;
@@ -1107,6 +1107,7 @@
     vertti = 8;
     erkki = 1;
     limitter = 2;
+
     if (g_britemode == 1) {
         xcolors = 8;
     }
@@ -1224,9 +1225,9 @@
             rr = int(rr / avg);
             gg = int(gg / avg);
             bb = int(bb / avg);
-            g_farge = 0;
-            target = -1;
-            compa = 9999;
+
+            int target = -1;
+            float compa = 9999;
             for (i = 0; i < xcolors; i++)
             {
                 fld = dist(rr, gg, bb, g_r[i], g_g[i], g_b[i]);
@@ -1283,9 +1284,8 @@
                 gg = int(gg / avg);
                 bb = int(bb / avg);
 
-                g_farge = 0;
-                target = -1;
-                compa = 9999;
+                int target = -1;
+                float compa = 9999;
                 for (j = 0; j < limitter; j++)
                 {
                     fld = dist(rr, gg, bb, g_r[idx[j]], g_g[idx[j]], g_b[idx[j]]);
@@ -1300,6 +1300,8 @@
                     g_farge = target;
                     makepoint(xx, yy);
                 }
+                else
+                    g_farge = 0;
             }
 
             if (idefix == 0)