WebSVN – filter_foundry – Path Comparison – /

Regard whitespace Rev 300 → Rev 301

 /trunk/ff.h
 ,7 → 77,8
 extern struct node *tree[4];
 extern char *err[4];
 extern int errpos[4],errstart[4];//,nplanes;
-extern value_type slider[8],cell[NUM_CELLS],map[4][0x100];
+extern uint8_t slider[8],map[4][0x100];
+extern value_type cell[NUM_CELLS];
 extern char *expr[4];
 // extern long maxSpace;

 /trunk/funcs.c
 ,7 → 276,8
 // -------------------------------------------------------------------------------------------
-extern value_type slider[],cell[],var[],map[][0x100];
+extern uint8_t slider[],map[][0x100];
+extern value_type cell[], var[];
 extern unsigned char *image_ptr;
 // -------------------------------------------------------------------------------------------
 ,7 → 838,11
 #ifdef PARSERTEST
         return 0;
 #else
-        return (value_type)round(pow((double)b, (double)e));
+        double a = pow((double)b, (double)e);
+        if (a - floor(a) >= 0.5)
+                return (value_type)(floor(a) + 1);
+        else
+                return (value_type)(floor(a));
 #endif
 }

 /trunk/main.c
 ,7 → 40,8
 struct node *tree[4];
 char *err[4];
 int errpos[4],errstart[4],nplanes,cnvused,chunksize,toprow;
-value_type slider[8],cell[NUM_CELLS],map[4][0x100];
+uint8_t slider[8],map[4][0x100];
+value_type cell[NUM_CELLS];
 char *expr[4];
 // long maxSpace;
 globals_t *gdata;

 /trunk/node.c
 ,7 → 95,7
                                 #ifdef FP_VALUE
                                 printf("constant: %g\n",root->v.value);
                                 #else
-                                printf("constant: %ld\n",root->v.value);
+                                printf("constant: %d\n",root->v.value);
                                 #endif
                                 break;
                         case TOK_SPECIALVAR:
 ,7 → 105,7
                                 #ifdef FP_VALUE
                                 printf("variable: %s (%g)\n",root->v.sym->name,*root->v.sym->pvar);
                                 #else
-                                printf("variable: %s (%ld)\n",root->v.sym->name,*root->v.sym->pvar);
+                                printf("variable: %s (%d)\n",root->v.sym->name,*root->v.sym->pvar);
                                 #endif
                                 break;
                         case TOK_FN1:

 /trunk/read.c
 ,7 → 275,7
         }
         for(i = 0; i < 8; ++i)
-                slider[i] = pparm->val[i];
+                slider[i] = (uint8_t)pparm->val[i];
         return true;
 }

 /trunk/save.c
 ,7 → 61,7
                 /* then slider values, one per line */
                 for( i=0 ; i<8 ; ++i )
-                        p += sprintf(p, "%ld\r", slider[i]);
+                        p += sprintf(p, "%d\r", slider[i]);
                 /* expressions, broken into lines no longer than CHOPLINES characters */
                 for( i=0 ; i<4 ; ++i ){

 /trunk/telegraphics_common/tt/ui_compat_win.c
 ,12 → 135,13
 void _doMonitorAdjustments(LPRECT rcPlugin) {
         RECT rcMonitorWork;
         _HMONITOR hMonitor;
-        _MONITORINFO grMonitorInfo = { sizeof(grMonitorInfo) };
+        _MONITORINFO grMonitorInfo;
         int nXAdjust = 0, nYAdjust = 0, nPluginWidth, nPluginHeight, nMonitorWorkWidth, nMonitorWorkHeight;
         hMonitor = _MonitorFromRect(rcPlugin, _MONITOR_DEFAULTTONEAREST);
         if (hMonitor == NULL) return;
+        grMonitorInfo.cbSize = sizeof(grMonitorInfo);
         if (!_GetMonitorInfoA(hMonitor, &grMonitorInfo)) return;
         rcMonitorWork = grMonitorInfo.rcWork;

/trunk/testcases/pow.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property