Fossil SCM

Update to the latest pikchr.c sources. (pikchr.wasm is not updated.)

drh 2022-12-07 11:17 trunk
Commit 544eefd722964e6644dce1f26553dfc8bd829d44ab149708f45230d992764bcc
Parent 5405aa57389ef96…
1 file changed +7 -8
~ extsrc/pikchr.c
M extsrc/pikchr.c
+7 -8
--- extsrc/pikchr.c
+++ extsrc/pikchr.c
@@ -4681,27 +4681,26 @@
46814681
 ** on the value.
46824682
 */
46834683
 static void pik_append_x(Pik *p, const char *z1, PNum v, const char *z2){
46844684
 char buf[200];
46854685
 v -= p->bbox.sw.x;
4686
- snprintf(buf, sizeof(buf)-1, "%s%d%s", z1, pik_round(p->rScale*v), z2);
4686
+ snprintf(buf, sizeof(buf)-1, "%s%g%s", z1, p->rScale*v, z2);
46874687
 buf[sizeof(buf)-1] = 0;
46884688
 pik_append(p, buf, -1);
46894689
 }
46904690
 static void pik_append_y(Pik *p, const char *z1, PNum v, const char *z2){
46914691
 char buf[200];
46924692
 v = p->bbox.ne.y - v;
4693
- snprintf(buf, sizeof(buf)-1, "%s%d%s", z1, pik_round(p->rScale*v), z2);
4693
+ snprintf(buf, sizeof(buf)-1, "%s%g%s", z1, p->rScale*v, z2);
46944694
 buf[sizeof(buf)-1] = 0;
46954695
 pik_append(p, buf, -1);
46964696
 }
46974697
 static void pik_append_xy(Pik *p, const char *z1, PNum x, PNum y){
46984698
 char buf[200];
46994699
 x = x - p->bbox.sw.x;
47004700
 y = p->bbox.ne.y - y;
4701
- snprintf(buf, sizeof(buf)-1, "%s%d,%d", z1,
4702
- pik_round(p->rScale*x), pik_round(p->rScale*y));
4701
+ snprintf(buf, sizeof(buf)-1, "%s%g,%g", z1, p->rScale*x, p->rScale*y);
47034702
 buf[sizeof(buf)-1] = 0;
47044703
 pik_append(p, buf, -1);
47054704
 }
47064705
 static void pik_append_dis(Pik *p, const char *z1, PNum v, const char *z2){
47074706
 char buf[200];
@@ -4742,13 +4741,13 @@
47424741
 */
47434742
 static void pik_append_arc(Pik *p, PNum r1, PNum r2, PNum x, PNum y){
47444743
 char buf[200];
47454744
 x = x - p->bbox.sw.x;
47464745
 y = p->bbox.ne.y - y;
4747
- snprintf(buf, sizeof(buf)-1, "A%d %d 0 0 0 %d %d",
4748
- pik_round(p->rScale*r1), pik_round(p->rScale*r2),
4749
- pik_round(p->rScale*x), pik_round(p->rScale*y));
4746
+ snprintf(buf, sizeof(buf)-1, "A%g %g 0 0 0 %g %g",
4747
+ p->rScale*r1, p->rScale*r2,
4748
+ p->rScale*x, p->rScale*y);
47504749
 buf[sizeof(buf)-1] = 0;
47514750
 pik_append(p, buf, -1);
47524751
 }
47534752
47544753
 /* Append a style="..." text. But, leave the quote unterminated, in case
@@ -8123,6 +8122,6 @@
81238122
81248123
81258124
 #endif /* PIKCHR_TCL */
81268125
81278126
8128
-#line 8153 "pikchr.c"
8127
+#line 8152 "pikchr.c"
81298128
--- extsrc/pikchr.c
+++ extsrc/pikchr.c
@@ -4681,27 +4681,26 @@
4681 ** on the value.
4682 */
4683 static void pik_append_x(Pik *p, const char *z1, PNum v, const char *z2){
4684 char buf[200];
4685 v -= p->bbox.sw.x;
4686 snprintf(buf, sizeof(buf)-1, "%s%d%s", z1, pik_round(p->rScale*v), z2);
4687 buf[sizeof(buf)-1] = 0;
4688 pik_append(p, buf, -1);
4689 }
4690 static void pik_append_y(Pik *p, const char *z1, PNum v, const char *z2){
4691 char buf[200];
4692 v = p->bbox.ne.y - v;
4693 snprintf(buf, sizeof(buf)-1, "%s%d%s", z1, pik_round(p->rScale*v), z2);
4694 buf[sizeof(buf)-1] = 0;
4695 pik_append(p, buf, -1);
4696 }
4697 static void pik_append_xy(Pik *p, const char *z1, PNum x, PNum y){
4698 char buf[200];
4699 x = x - p->bbox.sw.x;
4700 y = p->bbox.ne.y - y;
4701 snprintf(buf, sizeof(buf)-1, "%s%d,%d", z1,
4702 pik_round(p->rScale*x), pik_round(p->rScale*y));
4703 buf[sizeof(buf)-1] = 0;
4704 pik_append(p, buf, -1);
4705 }
4706 static void pik_append_dis(Pik *p, const char *z1, PNum v, const char *z2){
4707 char buf[200];
@@ -4742,13 +4741,13 @@
4742 */
4743 static void pik_append_arc(Pik *p, PNum r1, PNum r2, PNum x, PNum y){
4744 char buf[200];
4745 x = x - p->bbox.sw.x;
4746 y = p->bbox.ne.y - y;
4747 snprintf(buf, sizeof(buf)-1, "A%d %d 0 0 0 %d %d",
4748 pik_round(p->rScale*r1), pik_round(p->rScale*r2),
4749 pik_round(p->rScale*x), pik_round(p->rScale*y));
4750 buf[sizeof(buf)-1] = 0;
4751 pik_append(p, buf, -1);
4752 }
4753
4754 /* Append a style="..." text. But, leave the quote unterminated, in case
@@ -8123,6 +8122,6 @@
8123
8124
8125 #endif /* PIKCHR_TCL */
8126
8127
8128 #line 8153 "pikchr.c"
8129
--- extsrc/pikchr.c
+++ extsrc/pikchr.c
@@ -4681,27 +4681,26 @@
4681 ** on the value.
4682 */
4683 static void pik_append_x(Pik *p, const char *z1, PNum v, const char *z2){
4684 char buf[200];
4685 v -= p->bbox.sw.x;
4686 snprintf(buf, sizeof(buf)-1, "%s%g%s", z1, p->rScale*v, z2);
4687 buf[sizeof(buf)-1] = 0;
4688 pik_append(p, buf, -1);
4689 }
4690 static void pik_append_y(Pik *p, const char *z1, PNum v, const char *z2){
4691 char buf[200];
4692 v = p->bbox.ne.y - v;
4693 snprintf(buf, sizeof(buf)-1, "%s%g%s", z1, p->rScale*v, z2);
4694 buf[sizeof(buf)-1] = 0;
4695 pik_append(p, buf, -1);
4696 }
4697 static void pik_append_xy(Pik *p, const char *z1, PNum x, PNum y){
4698 char buf[200];
4699 x = x - p->bbox.sw.x;
4700 y = p->bbox.ne.y - y;
4701 snprintf(buf, sizeof(buf)-1, "%s%g,%g", z1, p->rScale*x, p->rScale*y);
 
4702 buf[sizeof(buf)-1] = 0;
4703 pik_append(p, buf, -1);
4704 }
4705 static void pik_append_dis(Pik *p, const char *z1, PNum v, const char *z2){
4706 char buf[200];
@@ -4742,13 +4741,13 @@
4741 */
4742 static void pik_append_arc(Pik *p, PNum r1, PNum r2, PNum x, PNum y){
4743 char buf[200];
4744 x = x - p->bbox.sw.x;
4745 y = p->bbox.ne.y - y;
4746 snprintf(buf, sizeof(buf)-1, "A%g %g 0 0 0 %g %g",
4747 p->rScale*r1, p->rScale*r2,
4748 p->rScale*x, p->rScale*y);
4749 buf[sizeof(buf)-1] = 0;
4750 pik_append(p, buf, -1);
4751 }
4752
4753 /* Append a style="..." text. But, leave the quote unterminated, in case
@@ -8123,6 +8122,6 @@
8122
8123
8124 #endif /* PIKCHR_TCL */
8125
8126
8127 #line 8152 "pikchr.c"
8128

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button