保存仿制图章修复与前轮发布诊断,待正式验收

这个提交包含在:
mac 于 2026-11-14 22:54:31 +08:00 提交
1 父节点 5a10408557
当前提交 ca9936ee3c
25 个文件已更改
+1354 -58

没有与搜索条件相匹配的文件

+50 -1
查看文件
@@ -98,10 +98,24 @@ BOOL DYValidToolMask(NSDictionary *mask){
}
id samplingScale=mask[@"stampSamplingScale"];
if(samplingScale&&(!source||!validStampValues(samplingScale,2,0,1./256,256)))return NO;
id mode=mask[@"stampTrackMode"],reference=mask[@"stampReference"];
if(mode&&(!source||![@[@"linked",@"independent"]containsObject:mode]))return NO;
if(reference){
if(!source||![reference isKindOfClass:NSArray.class]||[reference count]!=4)return NO;
for(NSUInteger i=0;i<4;i++)if(!finiteNumber(reference[i])||
(i<2?fabs([reference[i]doubleValue])>2048:[reference[i]doubleValue]<.001||[reference[i]doubleValue]>2048))return NO;
}
if(mask[@"status"]&&(![mask[@"status"]isKindOfClass:NSString.class]||[mask[@"status"]length]>2000))return NO;
if(mask[@"trackingStopped"]&&![@[@YES,@NO]containsObject:mask[@"trackingStopped"]])return NO;
for(NSString *field in @[@"trackingLastTime",@"trackingStopTime"]){
id value=mask[field];if(value&&(![value isKindOfClass:NSArray.class]||[value count]!=3))return NO;
if(value){for(id n in value)if(!finiteNumber(n))return NO;if(!CMTIME_IS_NUMERIC(DYTrackingRecordedTime(mask,field)))return NO;}
}
const float *n=(const float*)nodes.bytes;for(NSUInteger i=0;i<nodes.length/4;i++)if(!std::isfinite(n[i])||fabs(n[i])>1000)return NO;
NSArray *keys=mask[@"keys"];if(![keys isKindOfClass:NSArray.class]||keys.count>DYToolKeyLimit)return NO;CMTime last=kCMTimeInvalid;
for(NSDictionary *k in keys){if(![k isKindOfClass:NSDictionary.class]||!finiteNumber(k[@"value"])||!finiteNumber(k[@"scale"])||!finiteNumber(k[@"epoch"])||!finiteNumber(k[@"manual"])||!finiteNumber(k[@"confidence"])||[k[@"confidence"]doubleValue]<0||[k[@"confidence"]doubleValue]>1)return NO;CMTime t=keyTime(k);DYMaskParameters q;if(!CMTIME_IS_NUMERIC(t)||!readParameters(k[@"parameters"],&q)||q.kind!=p.kind||(CMTIME_IS_NUMERIC(last)&&(last.epoch!=t.epoch||CMTimeCompare(last,t)>=0)))return NO;
if(k[@"stampMotion"]&&(!source||!validStampValues(k[@"stampMotion"],6,2,1./16,16)))return NO;
if(k[@"stampManualSource"]&&(!source||!k[@"stampMotion"]||![k[@"manual"]boolValue]||![@[@YES,@NO]containsObject:k[@"stampManualSource"]]))return NO;
last=t;
}return YES;
}
@@ -236,6 +250,36 @@ static DYStampMotion stampMotionInSpan(DYMaskKeySpan span){
blend(a.targetScaleX,b.targetScaleX),blend(a.targetScaleY,b.targetScaleY),a.active||b.active};
}
DYStampMotion DYStampMotionAtTime(NSDictionary *stamp,CMTime time){return stampMotionInSpan(maskKeySpan(stamp,time));}
BOOL DYStampUsesLinkedTracking(NSDictionary *stamp){return stamp[@"stampSource"]&&[stamp[@"stampTrackMode"]isEqual:@"linked"];}
CMTime DYTrackingRecordedTime(NSDictionary *mask,NSString *key){
NSArray *v=mask[key];if(![v isKindOfClass:NSArray.class]||v.count!=3)return kCMTimeInvalid;
for(id n in v)if(!finiteNumber(n))return kCMTimeInvalid;
double scale=[v[1]doubleValue];if(scale<1||scale>INT32_MAX||scale!=std::floor(scale))return kCMTimeInvalid;
return CMTimeMakeWithEpoch([v[0]longLongValue],(int32_t)scale,[v[2]longLongValue]);
}
DYMaskParameters DYStampReferenceAtTime(NSDictionary *stamp,CMTime time){
DYMaskParameters p=DYMaskAtTime(stamp,time);NSArray *ref=stamp[@"stampReference"];
if(ref.count==4){p.centerX+=[ref[0]floatValue]*p.width;p.centerY+=[ref[1]floatValue]*p.height;p.width*=[ref[2]floatValue];p.height*=[ref[3]floatValue];p.kind=DYMaskRectangle;}
p.feather=0;p.angle=0;return p;
}
BOOL DYSetStampReference(NSMutableDictionary *stamp,NSRect rect,CMTime time){
if(!stamp[@"stampSource"]||!CMTIME_IS_NUMERIC(time)||!std::isfinite(NSMidX(rect))||!std::isfinite(NSMidY(rect))||
!std::isfinite(NSWidth(rect))||!std::isfinite(NSHeight(rect))||NSWidth(rect)<.001||NSHeight(rect)<.001||
NSMinX(rect)<0||NSMinY(rect)<0||NSMaxX(rect)>1||NSMaxY(rect)>1)return NO;
DYMaskParameters p=DYMaskAtTime(stamp,time);
NSArray *ref=@[@((NSMidX(rect)-p.centerX)/p.width),@((NSMidY(rect)-p.centerY)/p.height),@(NSWidth(rect)/p.width),@(NSHeight(rect)/p.height)];
NSMutableDictionary *candidate=DYMutablePlist(stamp);candidate[@"stampReference"]=ref;
if(!DYValidToolMask(candidate))return NO;stamp[@"stampReference"]=ref;[stamp removeObjectForKey:@"status"];return YES;
}
BOOL DYAddStampManualKey(NSMutableDictionary *stamp,CMTime time){
if(!stamp[@"stampSource"]||!CMTIME_IS_NUMERIC(time))return NO;
DYMaskParameters p=DYMaskAtTime(stamp,time);DYStampMotion motion=DYStampMotionAtTime(stamp,time);motion.active=true;
NSMutableDictionary *candidate=DYMutablePlist(stamp);
NSMutableArray *keys=candidate[@"keys"];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){return CMTimeCompare(keyTime(key),time)!=0;}]];
if(!DYMergeTracking(candidate,@[DYStampKey(time,p,YES,1,motion)]))return NO;
[candidate removeObjectsForKeys:@[@"status",@"trackingStopped",@"trackingLastTime",@"trackingStopTime"]];
[stamp setDictionary:candidate];return YES;
}
NSArray *DYStampSourceAtTime(NSDictionary *stamp,CMTime time){
NSArray *source=stamp[@"stampSource"];
DYStampMotion motion=DYStampMotionAtTime(stamp,time);
@@ -278,6 +322,7 @@ NSDictionary *DYStampKey(CMTime time,DYMaskParameters p,BOOL manual,float confid
NSMutableDictionary *paired=[[key mutableCopy]autorelease];
paired[@"stampMotion"]=@[@(motion.sourceOffsetX),@(motion.sourceOffsetY),@(motion.sourceScaleX),
@(motion.sourceScaleY),@(motion.targetScaleX),@(motion.targetScaleY)];
if(manual)paired[@"stampManualSource"]=@YES;
return paired;
}
// Analysis supplies a contiguous pass in either time direction. A symmetric
@@ -369,7 +414,11 @@ BOOL DYMergeTracking(NSMutableDictionary *m,NSArray *samples,CMTime frameDuratio
if(key[@"stampMotion"]){
NSUInteger slot=index.unsignedIntegerValue;
NSMutableDictionary *authored=[[all[slot] mutableCopy]autorelease];
authored[@"stampMotion"]=key[@"stampMotion"];
if([authored[@"stampManualSource"]boolValue]&&![key[@"manual"]boolValue]){
NSMutableArray *motion=[[key[@"stampMotion"]mutableCopy]autorelease];
motion[0]=authored[@"stampMotion"][0];motion[1]=authored[@"stampMotion"][1];
authored[@"stampMotion"]=motion;
}else authored[@"stampMotion"]=key[@"stampMotion"];
all[slot]=authored;
}
}