From 8ca33a78fd224d13fffb1092c704adfce6cda12b Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 8 Nov 2026 21:10:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E9=BD=90=E4=B8=80=E7=BA=A7=E8=B0=83?= =?UTF-8?q?=E8=89=B2=E9=A2=84=E8=A7=88=E5=85=A5=E5=8F=A3=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=AA=8C=E6=94=B6=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/verify_browser_customization.mm | 3 ++- 大鱼调色/Plugin/DYPrimaryRender.inc.h | 4 ++-- 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 开发交接.md | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/verify_browser_customization.mm b/tools/verify_browser_customization.mm index 56929e3..958bd60 100644 --- a/tools/verify_browser_customization.mm +++ b/tools/verify_browser_customization.mm @@ -28,10 +28,11 @@ int main(int argc,const char **argv){@autoreleasepool{ [browser thumbnailClicked:tile];ack(nil);require([library.recentPaths isEqual:@[middle,alpha,zulu]],@"only successful host application records recent use"); require([[[browser valueForKey:@"visibleEntries"]valueForKey:@"path"]isEqual:@[alpha,zulu,middle]]&&[tile isEqual:[[browser valueForKey:@"tiles"]objectForKey:middle]]&&[[tile valueForKey:@"chosen"]boolValue],@"selecting a LUT keeps the tiles in place and updates selection"); NSSearchField *search=[browser valueForKey:@"search"];search.stringValue=@"Zulu";[browser rebuildGrid];require([[browser valueForKey:@"visibleEntries"]count]==1,@"search respects recent-first ordering");search.stringValue=@"";[browser rebuildGrid];require([[[browser valueForKey:@"visibleEntries"]valueForKey:@"path"]isEqual:@[alpha,zulu,middle]],@"clearing a search still uses the opening order"); - for(NSButton *button in [browser valueForKey:@"folderButtons"])if([button.identifier isEqual:@"@recent"])[browser folderClicked:button]; + for(NSButton *button in [browser valueForKey:@"folderButtons"])if([button.identifier isEqual:@"@recent"]){[browser folderClicked:button];break;} require([[[browser valueForKey:@"visibleEntries"]valueForKey:@"path"]isEqual:@[alpha,zulu]],@"recent folder also uses the opening order");[browser folderClicked:all]; NSView *view=[browser valueForKey:@"root"];[view setFrameSize:NSMakeSize(1200,760)];[browser layoutBrowser];NSInteger wide=[[browser valueForKey:@"columns"]integerValue];[view setFrameSize:NSMakeSize(720,420)];[browser layoutBrowser];require(wide>[[browser valueForKey:@"columns"]integerValue],@"grid reflows when the browser size changes"); NSPopUpButton *layout=[browser valueForKey:@"layoutMenu"];[layout selectItemAtIndex:1];[browser layoutChanged:nil];require([[browser valueForKey:@"columns"]integerValue]==1&&[[browser valueForKey:@"tileHeight"]doubleValue]==70,@"list layout has full-width rows"); + [view setFrameSize:NSMakeSize(1200,760)];[browser layoutBrowser]; NSSplitView *split=[browser valueForKey:@"splitView"];[split setPosition:240 ofDividerAtIndex:0];[browser layoutBrowser];NSScrollView *folders=[browser valueForKey:@"folderScroll"],*grid=[browser valueForKey:@"gridScroll"];require(fabs(folders.frame.size.width-240)<2&&NSMaxX(folders.frame)<=NSMinX(grid.frame),@"sidebar divider changes folder width without overlapping previews"); [browser close];[browser release];browser=[[DYLUTBrowser alloc]initWithLibrary:library preview:nil selectedPath:nil palette:@{} selection:nil];pump(^{return [browser valueForKey:@"libraryTask"]==nil;});require([(NSPopUpButton*)[browser valueForKey:@"layoutMenu"]indexOfSelectedItem]==1&&fabs([[browser valueForKey:@"sidebarWidth"]doubleValue]-240)<2,@"layout and sidebar width survive reopening"); require([[[browser valueForKey:@"visibleEntries"]valueForKey:@"path"]isEqual:@[middle,alpha,zulu]],@"reopening places the successful selection first"); diff --git a/大鱼调色/Plugin/DYPrimaryRender.inc.h b/大鱼调色/Plugin/DYPrimaryRender.inc.h index 25a2fa6..9ecb8d1 100644 --- a/大鱼调色/Plugin/DYPrimaryRender.inc.h +++ b/大鱼调色/Plugin/DYPrimaryRender.inc.h @@ -34,9 +34,9 @@ u.primarySectionEnabled=0;u.cm.configured=-1;u.inputProfile=u.preLUTStrength=0;u.filmPrint.x=0;NSDictionary*finishPaths=DYVisibleBaseToolPaths(paths,finishing);NSArray*activeFinish=DYPrimaryActiveFinishing(u,finishPaths,spider,finishing); BOOL display=outputEnabled&&ot>=1001&&ot<=1003; if(!display&&activeFinish.count)return fail(error,@"当前是 Log/线性码值输出。SDR 修饰工具需要显示输出,请选择 Gamma 输出,或关闭这些工具并保存完整预设。"); - if(!display&&transparent&&!activeFinish.count){current=source;[self managedPreview:current origin:src.imageOrigin entry:entry];}else if(display&&_exporting&&!activeFinish.count){if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;}else if(display){if(!transform({og,ot,22,20,0}))return NO;[self managedPreview:current origin:src.imageOrigin entry:entry]; + if(!display&&transparent&&!activeFinish.count){current=source;[self managedPreview:current source:src entry:entry];}else if(display&&_exporting&&!activeFinish.count){if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;}else if(display){if(!transform({og,ot,22,20,0}))return NO;[self managedPreview:current source:src entry:entry]; if(activeFinish.count){idout=next();if(!out)return fail(error,@"无法分配 SDR 修饰缓冲区。");_managedFinishing=YES;BOOL ok=NO;@try{ok=[self renderSource:tile(current) destination:tile(out) uniforms:u paths:finishPaths spider:spider tools:finishing error:error];}@finally{_managedFinishing=NO;}if(!ok)return NO;current=out;} if(_exporting){if(!transform({22,20,og,ot,0})||!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;}else{CGColorSpaceRef from=CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB),to=DYManagedTileSpace(dst,primaries);DYColorProfile*p=to?[[[DYColorProfile alloc]initWithSource:from target:to error:error]autorelease]:nil;CGColorSpaceRelease(from);if(to)CGColorSpaceRelease(to);if(!p)return fail(error,@"宿主未提供明确的目标颜色空间。");idout=next();if(!out||![self managedProfile:p input:current output:out entry:entry error:error])return NO;current=out;} - }else{if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;[self managedPreview:current origin:src.imageOrigin entry:entry];} + }else{if(!dispatch(@"dyPrimaryCodeOutput",nullptr,0))return NO;[self managedPreview:current source:src entry:entry];} _managedFinishing=YES;@try{return [self copyTile:tile(current) to:dst entry:entry error:error];}@finally{_managedFinishing=NO;} } diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 5141fec..8e3bdc4 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.21.5 CFBundleVersion - 122 + 123 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 37098b2..b4d0f5c 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.21.5 CFBundleVersion - 122 + 123 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/开发交接.md b/开发交接.md index 23df696..5dbea34 100644 --- a/开发交接.md +++ b/开发交接.md @@ -2,11 +2,11 @@ 更新于 2026-11-08(Asia/Shanghai)。这是新对话的接手入口。历史设计和实现细节按需查阅专项交接,复现和交付证据以对应版本的报告为准。 -## 1.21.5(122)LUT 帧比例与浏览顺序 +## 1.21.5(123)LUT 帧比例与浏览顺序 2026-11-08。浏览器的标准与高清预览按宿主帧和像素宽高比取样,最长边分别为 320 与 640。网格、列表与划像使用带尺寸的同帧数据,完整显示画面。自动调色继续使用原 320×180 分析样本。完整浏览器打开时读取最近使用顺序,成功应用时保存历史并更新选中项,重开时按最新历史排序。已加入帧比例、像素行顺序和浏览会话排序回归检查。 -当前为源码检查点。下一步是 Release 构建、签名、公证、正式安装与 FCP 验收,再验包并核验 Release 下载。 +122 已公证,正式安装自检发现一级调色的三个入口还调用旧取帧方法,随即回滚。123 已统一入口,下一步从正式位置重跑自检、FCP 验收、验包与 Release 下载校验。 ## 1.21.4(121)曲线直方图 Rec.709 电平