WebSVN – wimsdev – Diff – /trunk/wims/src/Misc/canvasdraw/canvasdraw.c

 * This source code file, and compiled objects derived from it,                  *
 * can be used and distributed without restriction, including for commercial use *
 * No warrenty whatsoever                                                        *
 *********************************************************************************
 */
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h> /* use for random id's */
-#include <math.h>
-/*
-#include <ctype.h>
-/2013
-removed: FreeBSD 9.0 / 9.1 C-lib bug...in chroot it will result in: Undefined symbol "_ThreadRuneLocale" implemented own versions of tolower() / toupper()
-Clang is fine (FreeBSD 10.0)
-*/
-/*
-in case svgdraw is in ~/src/Misc/svgdraw
-#include "../svgdraw/include/matheval.h"
+#include "../../Lib/libwims.h"
-*/
-#include "include/matheval.h"
+#include "canvasdraw.h"
 #include <assert.h>
-#include "canvasdraw.h"
+#include "canvasmacro.c"
-#include<sys/stat.h>
-/* needed for gettimeofday */
-#include <sys/time.h>
-#include "canvasmacro.c"
 /******************************************************************************
 **  Internal Functions
 ******************************************************************************/
 void    add_to_buffer(char *tmp); /* add tmp_buffer to the buffer */
 void    sync_input(FILE *infile);/* proceed with inputfile */
+                }
+            }
             else
             if(strcmp(draw_type,"arrow") == 0 ){
                 if( js_function[DRAW_ARROWS] != 1 ){ js_function[DRAW_ARROWS] = 1;}
                 if(reply_format < 1){reply_format = 11;}
                 add_js_arrows(js_include_file,1,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1],arrow_head);
                 if(use_input_xy == 1){
                     add_input_arrow(js_include_file,1);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
+                }
         @ hatchfill x0,y0,dx,dy,color
         @ x0,y0 in xrange / yrange
         @ distances dx,dy in pixels
         */
             if( js_function[DRAW_HATCHFILL] != 1 ){ js_function[DRAW_HATCHFILL] = 1;}
             for(i=0;i<5;i++){
                 switch(i){
                     case 0: int_data[0] = x2px(get_real(infile,0)); break; /* x */
                     case 1: int_data[1] = y2px(get_real(infile,0)); break; /* y  */
                     case 2: int_data[2] = (int) (get_real(infile,0)); break; /* dx pixel */
                     case 3: int_data[3] = (int) (get_real(infile,0)); break; /* dy pixel*/
                     case 4: stroke_color = get_color(infile,1);
                     /* draw_hatchfill(ctx,x0,y0,dx,dy,linewidth,color,opacity,xsize,ysize) */
 /*
 avoid the use of ctypes.h for tolower() toupper();
 it gives trouble in FreeBSD 9.0 / 9.1 when used in a chroot environment (C library bug) : Undefined symbol "_ThreadRuneLocale"
 Upper case -> Lower case : c = c - 'A'+ 'a';
 Lower case ->  Upper case  c = c + 'A'  - 'a';
-*/
 int tolower(int c){
  if(c <= 'Z'){
   if (c >= 'A'){
    return c - 'A' + 'a';
+  }
  }
  return c;
 }
 int toupper(int c){
  if(c >= 'a' && c <= 'z'){
    return c + 'A' - 'a';
+ }
  return c;
+}
+*/
 char *get_color(FILE *infile , int last){
     int c,i = 0,is_hex = 0;
     char temp[MAX_COLOR_STRING], *string;
     while(( (c=getc(infile)) != EOF ) && ( c != '\n') && ( c != ',' ) && ( c != ';' ) ){
         if( i > MAX_COLOR_STRING ){ canvas_error("colour string is too big ... ? ");}
     if( c == '\n' || c == ';' ){ done = TRUE; line_number++; }
     if( c == EOF ){done = TRUE ; finished = 1;}
     tmp[i]='\0';
     if( strlen(tmp) == 0 ){canvas_error("expected a number , but found nothing !!");}
     if( found_calc == 1 ){ /* use libmatheval to calculate 2*pi/3 */
-     void *f = evaluator_create(tmp);
+     void *f = eval_create(tmp);
      assert(f);if( f == NULL ){canvas_error("I'm having trouble parsing your \"expression\" ") ;}
-     y = evaluator_evaluate_x(f, 1);
+     y = eval_x(f, 1);
      /* if function is bogus; y = 1 : so no core dumps */
-     evaluator_destroy(f);
+     eval_destroy(f);
+    }
     else
+    {
      y = atof(tmp);
+    }

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 7842 → 7848