3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-05 21:21:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Coerce PathData float values to double

Browse source 
For avoid equality issues on JVM
This commit is contained in:
Andrey Antukh 2025-04-10 09:25:10 +02:00
parent 1c77126fe6
commit 6f2ccabaa2
1 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

55
common/src/app/common/types/path/impl.cljc
View file

@ -180,14 +180,16 @@
y #?(:clj (.getFloat ^ByteBuffer buffer (+ offset 24)) y #?(:clj (.getFloat ^ByteBuffer buffer (+ offset 24))
:cljs (.getFloat32 buffer (+ offset 24)))] :cljs (.getFloat32 buffer (+ offset 24)))]
{:command :move-to {:command :move-to
:params {:x x :y y}}) :params {:x (double x)
:y (double y)}})
2 (let [x #?(:clj (.getFloat ^ByteBuffer buffer (+ offset 20)) 2 (let [x #?(:clj (.getFloat ^ByteBuffer buffer (+ offset 20))
:cljs (.getFloat32 buffer (+ offset 20))) :cljs (.getFloat32 buffer (+ offset 20)))
y #?(:clj (.getFloat ^ByteBuffer buffer (+ offset 24)) y #?(:clj (.getFloat ^ByteBuffer buffer (+ offset 24))
:cljs (.getFloat32 buffer (+ offset 24)))] :cljs (.getFloat32 buffer (+ offset 24)))]
{:command :line-to {:command :line-to
:params {:x x :y y}}) :params {:x (double x)
:y (double y)}})
3 (let [c1x #?(:clj (.getFloat ^ByteBuffer buffer (+ offset 4)) 3 (let [c1x #?(:clj (.getFloat ^ByteBuffer buffer (+ offset 4))
:cljs (.getFloat32 buffer (+ offset 4))) :cljs (.getFloat32 buffer (+ offset 4)))
@ -202,7 +204,12 @@
y #?(:clj (.getFloat ^ByteBuffer buffer (+ offset 24)) y #?(:clj (.getFloat ^ByteBuffer buffer (+ offset 24))
:cljs (.getFloat32 buffer (+ offset 24)))] :cljs (.getFloat32 buffer (+ offset 24)))]
{:command :curve-to {:command :curve-to
:params {:x x :y y :c1x c1x :c1y c1y :c2x c2x :c2y c2y}}) :params {:x (double x)
:y (double y)
:c1x (double c1x)
:c1y (double c1y)
:c2x (double c2x)
:c2y (double c2y)}})
4 {:command :close-path 4 {:command :close-path
:params {}}))) :params {}})))
@ -273,13 +280,13 @@
(if (< index size) (if (< index size)
(let [offset (* index SEGMENT-BYTE-SIZE) (let [offset (* index SEGMENT-BYTE-SIZE)
type (.getShort ^ByteBuffer buffer offset) type (.getShort ^ByteBuffer buffer offset)
c1x (.getFloat ^ByteBuffer buffer (+ offset 4)) c1x (double (.getFloat ^ByteBuffer buffer (+ offset 4)))
c1y (.getFloat ^ByteBuffer buffer (+ offset 8)) c1y (double (.getFloat ^ByteBuffer buffer (+ offset 8)))
c2x (.getFloat ^ByteBuffer buffer (+ offset 12)) c2x (double (.getFloat ^ByteBuffer buffer (+ offset 12)))
c2y (.getFloat ^ByteBuffer buffer (+ offset 16)) c2y (double (.getFloat ^ByteBuffer buffer (+ offset 16)))
x (.getFloat ^ByteBuffer buffer (+ offset 20)) x (double (.getFloat ^ByteBuffer buffer (+ offset 20)))
y (.getFloat ^ByteBuffer buffer (+ offset 24)) y (double (.getFloat ^ByteBuffer buffer (+ offset 24)))
type (case type type (case (int type)
1 :line-to 1 :line-to
2 :move-to 2 :move-to
3 :curve-to 3 :curve-to
@ -297,13 +304,13 @@
(if (< index size) (if (< index size)
(let [offset (* index SEGMENT-BYTE-SIZE) (let [offset (* index SEGMENT-BYTE-SIZE)
type (.getShort ^ByteBuffer buffer offset) type (.getShort ^ByteBuffer buffer offset)
c1x (.getFloat ^ByteBuffer buffer (+ offset 4)) c1x (double (.getFloat ^ByteBuffer buffer (+ offset 4)))
c1y (.getFloat ^ByteBuffer buffer (+ offset 8)) c1y (double (.getFloat ^ByteBuffer buffer (+ offset 8)))
c2x (.getFloat ^ByteBuffer buffer (+ offset 12)) c2x (double (.getFloat ^ByteBuffer buffer (+ offset 12)))
c2y (.getFloat ^ByteBuffer buffer (+ offset 16)) c2y (double (.getFloat ^ByteBuffer buffer (+ offset 16)))
x (.getFloat ^ByteBuffer buffer (+ offset 20)) x (double (.getFloat ^ByteBuffer buffer (+ offset 20)))
y (.getFloat ^ByteBuffer buffer (+ offset 24)) y (double (.getFloat ^ByteBuffer buffer (+ offset 24)))
type (case type type (case (int type)
1 :line-to 1 :line-to
2 :move-to 2 :move-to
3 :curve-to 3 :curve-to
@ -319,13 +326,13 @@
(< index size)) (< index size))
(let [offset (* index SEGMENT-BYTE-SIZE) (let [offset (* index SEGMENT-BYTE-SIZE)
type (.getShort ^ByteBuffer buffer offset) type (.getShort ^ByteBuffer buffer offset)
c1x (.getFloat ^ByteBuffer buffer (+ offset 4)) c1x (double (.getFloat ^ByteBuffer buffer (+ offset 4)))
c1y (.getFloat ^ByteBuffer buffer (+ offset 8)) c1y (double (.getFloat ^ByteBuffer buffer (+ offset 8)))
c2x (.getFloat ^ByteBuffer buffer (+ offset 12)) c2x (double (.getFloat ^ByteBuffer buffer (+ offset 12)))
c2y (.getFloat ^ByteBuffer buffer (+ offset 16)) c2y (double (.getFloat ^ByteBuffer buffer (+ offset 16)))
x (.getFloat ^ByteBuffer buffer (+ offset 20)) x (double (.getFloat ^ByteBuffer buffer (+ offset 20)))
y (.getFloat ^ByteBuffer buffer (+ offset 24)) y (double (.getFloat ^ByteBuffer buffer (+ offset 24)))
type (case type type (case (int type)
1 :line-to 1 :line-to
2 :move-to 2 :move-to
3 :curve-to 3 :curve-to