Skip to content

Commit fdee8dd

Browse files
committed
Small tweaks
1 parent 12ff5c2 commit fdee8dd

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

coloraide/spaces/helmgen.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@
5050
def xyz_d65_to_helmgen(xyz: Vector) -> Vector:
5151
"""Convert XYZ to Helmgen."""
5252

53-
lms = alg.matmul(M1, xyz, dims=alg.D2_D1)
53+
lms = alg.matmul_x3(M1, xyz, dims=alg.D2_D1)
5454
c = [alg.nth_root(v, 3) for v in lms]
55-
return alg.matmul(M2, c, dims=alg.D2_D1)
55+
return alg.matmul_x3(M2, c, dims=alg.D2_D1)
5656

5757

5858
def helmgen_to_xyz(lab: Vector) -> Vector:
5959
"""Convert Helmgen to XYZ."""
6060

61-
c = alg.matmul(M2_INV, lab, dims=alg.D2_D1)
61+
c = alg.matmul_x3(M2_INV, lab, dims=alg.D2_D1)
6262
lms = [alg.spow(v, 3) for v in c]
63-
return alg.matmul(M1_INV, lms, dims=alg.D2_D1)
63+
return alg.matmul_x3(M1_INV, lms, dims=alg.D2_D1)
6464

6565

6666
class Helmgen(Lab):

coloraide/spaces/helmlab.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -394,17 +394,17 @@ def neutral_error(l: float, nc: Matrix) -> Vector:
394394
def xyz_d65_to_helmlab(xyz: Vector) -> Vector:
395395
"""Convert XYZ to Helmlab."""
396396

397-
lms = alg.matmul(M1, xyz, dims=alg.D2_D1)
398-
c = [alg.spow(v, GAMMA[e]) for e, v in enumerate(lms)]
399-
return alg.matmul(M2, c, dims=alg.D2_D1)
397+
lms = alg.matmul_x3(M1, xyz, dims=alg.D2_D1)
398+
cx = [alg.spow(a, b) for a, b in zip(lms, GAMMA)]
399+
return alg.matmul_x3(M2, cx, dims=alg.D2_D1)
400400

401401

402402
def helmlab_to_xyz(lab: Vector) -> Vector:
403403
"""Convert Helmlab to XYZ."""
404404

405-
c = alg.matmul(M2_INV, lab, dims=alg.D2_D1)
406-
lms = [alg.spow(v, 1 / GAMMA[e]) for e, v in enumerate(c)]
407-
return alg.matmul(M1_INV, lms, dims=alg.D2_D1)
405+
cx = alg.matmul_x3(M2_INV, lab, dims=alg.D2_D1)
406+
lms = [alg.spow(a, 1 / b) for a, b in zip(cx, GAMMA)]
407+
return alg.matmul_x3(M1_INV, lms, dims=alg.D2_D1)
408408

409409

410410
def hue_delta(h: float) -> float:

0 commit comments

Comments
 (0)