Date: | 2010-12-14 17:54:00 (13 years 3 months ago) |
---|---|
Author: | Werner Almesberger |
Commit: | 1f63ef6391fe92b69f489f6952afe22efe70016f |
Message: | cameo: changed dog_bone from global variable to argument - cameo.c (dog_bone, main): moved global variable to "main" - cameo.c (process_path, process_paths, main): pass dog_bone as argument |
Files: |
cameo/cameo.c (5 diffs) |
Change Details
cameo/cameo.c | ||
---|---|---|
20 | 20 | #include "gerber.h" |
21 | 21 | |
22 | 22 | |
23 | static int dog_bone = 0; | |
24 | ||
25 | ||
26 | static void process_path(struct path *path, int inside) | |
23 | static void process_path(struct path *path, int inside, int dog_bone) | |
27 | 24 | { |
28 | 25 | int left; |
29 | 26 | struct path *new; |
... | ... | |
37 | 34 | } |
38 | 35 | |
39 | 36 | |
40 | static void process_paths(struct path *paths) | |
37 | static void process_paths(struct path *paths, int dog_bone) | |
41 | 38 | { |
42 | 39 | struct path *leftmost, *path; |
43 | 40 | |
... | ... | |
55 | 52 | leftmost = path_find_leftmost(paths); |
56 | 53 | for (path = paths; path; path = path->next) |
57 | 54 | if (path != leftmost && !path->outside) |
58 | process_path(path, 1); | |
55 | process_path(path, 1, dog_bone); | |
59 | 56 | for (path = paths; path; path = path->next) |
60 | 57 | if (path != leftmost && path->outside) |
61 | process_path(path, 0); | |
62 | process_path(leftmost, 0); | |
58 | process_path(path, 0, dog_bone); | |
59 | process_path(leftmost, 0, dog_bone); | |
63 | 60 | } |
64 | 61 | |
65 | 62 | |
... | ... | |
78 | 75 | int main(int argc, char **argv) |
79 | 76 | { |
80 | 77 | char *in = NULL, *out = NULL; |
81 | int gerber = 0; | |
78 | int gerber = 0, dog_bone = 0; | |
82 | 79 | double r; |
83 | 80 | struct path *paths; |
84 | 81 | int c; |
... | ... | |
113 | 110 | paths = gerber_read(in, r); |
114 | 111 | else |
115 | 112 | paths = gnuplot_read(in, r); |
116 | process_paths(paths); | |
113 | process_paths(paths, dog_bone); | |
117 | 114 | gnuplot_write(out, paths); |
118 | 115 | |
119 | 116 | return 0; |
Branches:
master