mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-10-24 00:58:53 +00:00
Merge branch 'main' into refactor-remove-nativehost-target
This commit is contained in:
commit
483fff9305
27 files changed
+4175
-33
No files matched your search
@@ -212,7 +212,7 @@ function CGColorEqualToColor(lhs, rhs)
|
||||
if (lhs.pattern != rhs.pattern)
|
||||
return false;
|
||||
|
||||
if (CGColorSpaceEqualToColorSpace(lhs.colorspace, rhs.colorspace))
|
||||
if (lhs.colorspace !== rhs.colorspace)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
||||
@@ -1191,7 +1191,9 @@ var scale_rotate = function(a, b, c, d)
|
||||
var sign = (a * d < 0.0 || b * c > 0.0) ? -1.0 : 1.0,
|
||||
a2 = (ATAN2(b, d) + ATAN2(-sign * c, sign * a)) / 2.0,
|
||||
cos = COS(a2),
|
||||
sin = SIN(a2);
|
||||
sin = SIN(a2),
|
||||
abs_cos,
|
||||
abs_sin;
|
||||
|
||||
if (cos === 0)
|
||||
{
|
||||
@@ -1218,7 +1220,9 @@ var rotate_scale = function(a, b, c, d)
|
||||
var sign = (a * d < 0.0 || b * c > 0.0) ? -1.0 : 1.0,
|
||||
a1 = (ATAN2(sign * b, sign * a) + ATAN2(-c, d)) / 2.0,
|
||||
cos = COS(a1),
|
||||
sin = SIN(a1);
|
||||
sin = SIN(a1),
|
||||
abs_cos,
|
||||
abs_sin;
|
||||
|
||||
if (cos === 0)
|
||||
{
|
||||
|
||||
@@ -37,7 +37,7 @@ function CGContextSetTextMatrix(/* CGContext */ aContext, /* CGAffineTransform *
|
||||
|
||||
function CGContextGetTextPosition(/* CGContext */ aContext)
|
||||
{
|
||||
return aContext._textPosition || _CGPointMakeZero();
|
||||
return aContext._textPosition || CGPointMakeZero();
|
||||
}
|
||||
|
||||
function CGContextSetTextPosition(/* CGContext */ aContext, /* float */ x, /* float */ y)
|
||||
|
||||
Reference in new issue
Block a user