feat: decode UTF-16 and UTF-32 Cube LUTs without rewriting their bytes
这个提交包含在:
1 父节点
6d48b653a5
当前提交
8951725be2
7 个文件已更改
+1212
-11
没有与搜索条件相匹配的文件
@@ -412,7 +412,7 @@ static NSImage *DYWheelImage(void) {
|
||||
self.layer.backgroundColor=[DYThemePalette()[@"background"] CGColor];
|
||||
self.appearance=[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
|
||||
_brand=[DYLabel(@"◒ 大鱼调色",16) retain]; _brand.font=[NSFont boldSystemFontOfSize:16];_brand.textColor=DYInk();
|
||||
_subtitle=[DYLabel([[NSBundle bundleForClass:self.class]objectForInfoDictionaryKey:@"CFBundleShortVersionString"]?:@"1.1.4",9) retain]; _subtitle.textColor=DYThemeColor(@"secondary");
|
||||
_subtitle=[DYLabel([[NSBundle bundleForClass:self.class]objectForInfoDictionaryKey:@"CFBundleShortVersionString"]?:@"1.1.5",9) retain]; _subtitle.textColor=DYThemeColor(@"secondary");
|
||||
_resetAll=[DYButton(@"↺",self,@selector(resetAll:)) retain];_resetAll.bordered=NO; _resetAll.toolTip=@"恢复全部调色参数与 LUT";_resetAll.accessibilityLabel=@"全部还原";
|
||||
_save=[DYButton(@"保存预设",self,@selector(savePreset:)) retain];
|
||||
_load=[DYButton(@"载入预设",self,@selector(loadPreset:)) retain];
|
||||
|
||||
+68
-6
@@ -81,6 +81,71 @@ static NSError *DYLUTFileError(NSError *error,NSURL *url) {
|
||||
info[NSFilePathErrorKey]=url.path;if(error)info[NSUnderlyingErrorKey]=error;
|
||||
return [NSError errorWithDomain:error.domain?:DYLUTLibraryErrorDomain code:error?error.code:1 userInfo:info];
|
||||
}
|
||||
static bool DYLUTUnicodeSpace(uint32_t c) {
|
||||
return c==0x20||(c>=9&&c<=13)||c==0x85||c==0xa0||c==0x1680||
|
||||
(c>=0x2000&&c<=0x200a)||c==0x2028||c==0x2029||c==0x202f||c==0x205f||c==0x3000;
|
||||
}
|
||||
static void DYLUTAppendScalar(std::string& text,uint32_t c) {
|
||||
if(DYLUTUnicodeSpace(c)) {
|
||||
text+=char(c==13?'\r':c==10||c==0x85||c==0x2028||c==0x2029?'\n':' ');return;
|
||||
}
|
||||
if(c<0x80)text+=char(c);
|
||||
else if(c<0x800){text+=char(0xc0|(c>>6));text+=char(0x80|(c&63));}
|
||||
else if(c<0x10000){text+=char(0xe0|(c>>12));text+=char(0x80|((c>>6)&63));text+=char(0x80|(c&63));}
|
||||
else {text+=char(0xf0|(c>>18));text+=char(0x80|((c>>12)&63));text+=char(0x80|((c>>6)&63));text+=char(0x80|(c&63));}
|
||||
}
|
||||
// Normalize only the working copy. Imports retain their original bytes. Narrow
|
||||
// files remain byte-transparent so legacy TITLE/comment encodings still work.
|
||||
static BOOL DYLUTText(NSData *bytes,std::string& text,NSProgress *progress,NSError **error) {
|
||||
const uint8_t *p=(const uint8_t *)bytes.bytes;size_t length=bytes.length,offset=0,width=1;bool little=true;
|
||||
if(!length)return DYLUTFail(error,@"LUT 文件为空");
|
||||
auto unit=[&](size_t at,size_t w,bool le){uint32_t c=0;for(size_t k=0;k<w;k++)c|=uint32_t(p[at+k])<<(8*(le?k:w-1-k));return c;};
|
||||
if(length>=4&&unit(0,4,true)==0x0000feff){width=4;offset=4;}
|
||||
else if(length>=4&&unit(0,4,false)==0x0000feff){width=4;offset=4;little=false;}
|
||||
else if(length>=2&&unit(0,2,true)==0xfeff){width=2;offset=2;}
|
||||
else if(length>=2&&unit(0,2,false)==0xfeff){width=2;offset=2;little=false;}
|
||||
else if(length>=3&&!memcmp(p,"\xef\xbb\xbf",3))offset=3;
|
||||
else {
|
||||
// Without a BOM, infer byte order only from a recognizable Cube prefix.
|
||||
// Never remove arbitrary NUL bytes or guess an encoding from the title.
|
||||
auto prefix=[&](size_t w,bool le){bool whitespace=false;
|
||||
for(size_t at=0;at+w<=length&&at<128;at+=w){uint32_t c=unit(at,w,le);
|
||||
if(DYLUTUnicodeSpace(c)||c==0xfeff){whitespace=true;continue;}
|
||||
return c=='#'||(c>='A'&&c<='Z')||(c>='a'&&c<='z')||(c>='0'&&c<='9')||c=='+'||c=='-'||c=='.';
|
||||
}return whitespace;
|
||||
};
|
||||
for(size_t w:{size_t(4),size_t(2)}) {
|
||||
if(prefix(w,true)){width=w;break;}
|
||||
if(prefix(w,false)){width=w;little=false;break;}
|
||||
}
|
||||
}
|
||||
if(width==1){text.assign((const char *)p+offset,length-offset);return !DYLUTCancelled(progress,error);}
|
||||
NSString *encoding=[NSString stringWithFormat:@"UTF-%lu%@",(unsigned long)(width*8),little?@"LE":@"BE"];
|
||||
auto invalid=[&](NSString *detail){return DYLUTFail(error,[NSString stringWithFormat:@"%@ 编码损坏:%@",encoding,detail]);};
|
||||
if((length-offset)%width)return invalid(@"文件结尾不完整");
|
||||
text.clear();text.reserve((length-offset)/width);
|
||||
size_t nextCancellationCheck=offset;
|
||||
for(size_t at=offset;at<length;at+=width){
|
||||
if(at>=nextCancellationCheck){if(DYLUTCancelled(progress,error))return NO;nextCancellationCheck=at+16384;}
|
||||
uint32_t c=unit(at,width,little);
|
||||
if(width==2&&c>=0xd800&&c<=0xdbff){
|
||||
if(at+4>length)return invalid(@"缺少配对字符");uint32_t next=unit(at+2,2,little);
|
||||
if(next<0xdc00||next>0xdfff)return invalid(@"字符配对无效");c=0x10000+((c-0xd800)<<10)+(next-0xdc00);at+=2;
|
||||
}else if(c>=0xd800&&c<=0xdfff)return invalid(@"孤立的配对字符");
|
||||
if(c>0x10ffff||c==0)return invalid(@"含无效字符");
|
||||
DYLUTAppendScalar(text,c);
|
||||
}
|
||||
return !DYLUTCancelled(progress,error);
|
||||
}
|
||||
static std::string_view DYLUTTrim(std::string_view v) {
|
||||
while(!v.empty()) {
|
||||
unsigned char c=v.front();size_t count=0;
|
||||
if(c==' '||(c>=9&&c<=13))count=1;
|
||||
else if(v.size()>=2&&v.substr(0,2)=="\xc2\xa0")count=2;
|
||||
else if(v.size()>=3&&(v.substr(0,3)=="\xe1\x9a\x80"||v.substr(0,3)=="\xe2\x80\xaf"||v.substr(0,3)=="\xe2\x81\x9f"||v.substr(0,3)=="\xe3\x80\x80"||(v.substr(0,2)=="\xe2\x80"&&(unsigned char)v[2]>=0x80&&(unsigned char)v[2]<=0x8a)))count=3;
|
||||
if(!count)break;v.remove_prefix(count);
|
||||
}return v;
|
||||
}
|
||||
static BOOL DYLUTParse(NSString *path,std::vector<float>& data,NSUInteger& size,NSProgress *progress,NSError **error) {
|
||||
data.clear();size=0;
|
||||
NSDictionary *attributes=[[NSFileManager defaultManager]attributesOfItemAtPath:path error:error];
|
||||
@@ -99,20 +164,17 @@ static BOOL DYLUTParse(NSString *path,std::vector<float>& data,NSUInteger& size,
|
||||
for(float v:data)if(!std::isfinite(v))return DYLUTFail(error,@"输入 LUT 含无效数字");
|
||||
size=n;return YES;
|
||||
}
|
||||
// Cube commands and numbers use ASCII. Descriptive TITLE/comments can
|
||||
// legitimately use legacy encodings; they never affect the numeric table.
|
||||
if(!bytes.length)return DYLUTFail(error,@"LUT 文件为空");
|
||||
std::string storage((const char *)bytes.bytes,bytes.length);
|
||||
std::string storage;if(!DYLUTText(bytes,storage,progress,error))return NO;
|
||||
static locale_t numericLocale;static dispatch_once_t localeOnce;dispatch_once(&localeOnce,^{numericLocale=newlocale(LC_NUMERIC_MASK,"C",NULL);});
|
||||
float domainMin[3]={0,0,0},domainMax[3]={1,1,1};BOOL foundSize=NO;
|
||||
std::string_view remaining(storage);NSUInteger rows=0;
|
||||
if(remaining.size()>=3&&remaining.substr(0,3)=="\xef\xbb\xbf")remaining.remove_prefix(3);
|
||||
auto trim=[](std::string_view v){while(!v.empty()&&(v.front()==' '||v.front()=='\t'||v.front()=='\r'))v.remove_prefix(1);return v;};
|
||||
auto trim=DYLUTTrim;
|
||||
auto number=[&](std::string_view& v,float& value){v=trim(v);if(v.empty())return false;char *end=nullptr;value=strtof_l(v.data(),&end,numericLocale);if(end==v.data()||end>v.data()+v.size())return false;v.remove_prefix(end-v.data());return true;};
|
||||
while(!remaining.empty()) {
|
||||
if((rows++&1023)==0&&DYLUTCancelled(progress,error))return NO;
|
||||
size_t end=remaining.find_first_of("\r\n");std::string_view line=remaining.substr(0,end);
|
||||
if(end==std::string_view::npos)remaining={};else remaining.remove_prefix(end+1);
|
||||
if(end==std::string_view::npos)remaining={};else {size_t count=end+1;if(remaining[end]=='\r'&&count<remaining.size()&&remaining[count]=='\n')count++;remaining.remove_prefix(count);}
|
||||
line=line.substr(0,line.find('#'));line=trim(line);if(line.empty())continue;
|
||||
float r=0,g=0,b=0;
|
||||
auto starts=[&](std::string_view prefix){return line.substr(0,prefix.size())==prefix;};
|
||||
|
||||
+2
-2
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.1.4</string>
|
||||
<string>1.1.5</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>15</string>
|
||||
<string>16</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户