Changeset 2288 for research/2008-displacement/main.cTweet

Timestamp:

Apr 16, 2008, 12:11:38 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Add mode 8, for the very first graphic in the paper.
• Add results for mode 8 in part0/lena-values.txt.
• Make the bytecode version use less memory.

File:

• research/2008-displacement/main.c (modified) (8 diffs)

research/2008-displacement/main.c

@@ -25 +25 @@
 
 #ifdef BYTECODE
-#   define MAXIMAGES 128
+#   define MAXIMAGES 6
 static int slots[MAXIMAGES];
 static double slotbuf[MAXIMAGES * MAXWIDTH * MAXHEIGHT];
@@ -383 +383 @@
 {
     double *floats;
-    int x, y;
+    int w, h, x, y;
 
 #ifdef BYTECODE
@@ -390 +390 @@
     if(sys_read(0, &c, 1) != 1)
         sys_exit(-5);
-    WIDTH = ((int)(unsigned char)c) << 8;
+    w = ((int)(unsigned char)c) << 8;
     if(sys_read(0, &c, 1) != 1)
         sys_exit(-5);
-    WIDTH |= (int)(unsigned char)c;
+    w |= (int)(unsigned char)c;
 
     if(sys_read(0, &c, 1) != 1)
         sys_exit(-5);
-    HEIGHT = ((int)(unsigned char)c) << 8;
+    h = ((int)(unsigned char)c) << 8;
     if(sys_read(0, &c, 1) != 1)
         sys_exit(-5);
-    HEIGHT |= (int)(unsigned char)c;
+    h |= (int)(unsigned char)c;
+#else
+    SDL_Surface *tmp, *surface;
+    uint32_t *pixels;
+
+    tmp = IMG_Load(name);
+    if(!tmp)
+        return NULL;
+
+    w = tmp->w;
+    h = tmp->h;
+#endif
+
+    WIDTH = w > MAXWIDTH ? MAXWIDTH : w;
+    HEIGHT = h > MAXHEIGHT ? MAXHEIGHT : h;
 
     floats = new();
@@ -406 +420 @@
         return NULL;
 
-    for(y = 0; y < HEIGHT; y++)
-    for(x = 0; x < WIDTH; x++)
+#ifdef BYTECODE
+    for(y = 0; y < h; y++)
+    for(x = 0; x < w; x++)
     {
         if(sys_read(0, &c, 1) != 1)
             sys_exit(-5);
+        if(x >= WIDTH || y >= HEIGHT)
+            continue;
         put(floats, x, y, (double)(unsigned char)c / 0xff);
-    }   
+    }
 #else
-    SDL_Surface *tmp, *surface;
-    uint32_t *pixels;
-
-    tmp = IMG_Load(name);
-    if(!tmp)
-        return NULL;
-
-    WIDTH = tmp->w > MAXWIDTH ? MAXWIDTH : tmp->w;
-    HEIGHT = tmp->h > MAXHEIGHT ? MAXHEIGHT : tmp->h;
-    floats = new();
-    if(!floats)
-        return NULL;
-
     surface = SDL_CreateRGBSurface(SDL_SWSURFACE, WIDTH, HEIGHT, 32,
                                    0xff0000, 0xff00, 0xff, 0x0);
@@ -859 +863 @@
     msg(" -6 <src>           restrained (a,b,c,d) ED kernel analysis on src\n");
     msg(" -7 <src>           restrained displacement study on src\n");
+    msg(" -8 <src>           displacement values on src\n");
 }
 
@@ -891 +896 @@
         {
             double *dest = ed(src, false, 7, 0,
-                                0, 3, 5, 1, 0,
-                                0, 0, 0, 0, 0);
+                                 0, 3, 5, 1, 0,
+                                 0, 0, 0, 0, 0);
             study(src, dest, 1.2, 0.001, .16, .28);
             del(dest);
@@ -1068 +1073 @@
         break;
 
+        case 8:
+        {
+            const int STEP = 32;
+            double mat[NN][NN];
+            double *dest = ed(src, false, 7, 0,
+                                 0, 3, 5, 1, 0,
+                                 0, 0, 0, 0, 0);
+            double *tmp, *tmp2;
+            int dx, dy;
+
+            makegauss(mat, 1.2, 0., 0.);
+            tmp = gauss(src, mat);
+            for(dy = 0; dy <= STEP; dy++)
+            {
+                for(dx = 0; dx <= STEP; dx++)
+                {
+                    double fy = 2. / STEP * (dy - STEP / 2.);
+                    double fx = 2. / STEP * (dx - STEP / 2.);
+
+                    makegauss(mat, 1.2, fx, fy);
+                    tmp2 = gauss(dest, mat);
+                    msg("%g %g %g\n", fy, fx, 1000. * dist(tmp, tmp2, 1.));
+                    del(tmp2);
+                }
+                msg("\n");
+            }
+            del(tmp);
+            del(dest);
+            del(src);
+        }
+        break;
+
 #if 0
     tmp = ed(src, 7, 0, 0, 3, 5, 1, 0, 0, 0, 0, 0, 0);
@@ -1099 +1136 @@
 
 #if 0
-#   define STEP 32
-    dest = ed(src, 7, 0, 0, 3, 5, 1, 0, 0, 0, 0, 0, 0);
-    makegauss(mat, 1.2, 0., 0.);
-    tmp = gauss(src, mat);
-    for(dy = 0; dy < STEP; dy++)
-    {
-        for(dx = 0; dx < STEP; dx++)
-        {
-            double fy = 2. / STEP * (dy - STEP / 2.);
-            double fx = 2. / STEP * (dx - STEP / 2.);
-
-            makegauss(mat, 1.2, fx, fy);
-            tmp2 = gauss(dest, mat);
-            msg("%g %g %g\n", fy, fx, 1000. * dist(tmp, tmp2, 1.));
-            fflush(stdout);
-            del(tmp2);
-        }
-        msg("\n");
-    }
 
     save(dest, "output.bmp");