Merge pull request #22325 from komakai:fix-quicklook

2 years ago · ffccfa2ee9
parent 3cd36ebc7b 500e24d6cd
commit ffccfa2ee9
2 changed files with 2 additions and 2 deletions
--- a/modules/imgcodecs/misc/objc/ios/Mat+QuickLook.mm
+++ b/modules/imgcodecs/misc/objc/ios/Mat+QuickLook.mm
@ -62,7 +62,7 @@ typedef UIFont* (*FontGetter)();
 }

 - (id)debugQuickLookObject {
-    if ([self dims] == 2 && [self rows] <= 10 && [self cols] <= 10) {
+    if ([self dims] == 2 && [self rows] <= 10 && [self cols] <= 10 && [self channels] == 1) {
        FontGetter fontGetters[] = { getCMU, getBodoni72, getAnySerif, getSystemFont };
        UIFont* font = nil;
        for (int fontGetterIndex = 0; font==nil && fontGetterIndex < (sizeof(fontGetters)) / (sizeof(fontGetters[0])); fontGetterIndex++) {
--- a/modules/imgcodecs/misc/objc/macosx/Mat+QuickLook.mm
+++ b/modules/imgcodecs/misc/objc/macosx/Mat+QuickLook.mm
@ -58,7 +58,7 @@ typedef NSFont* (*FontGetter)();

 - (id)debugQuickLookObject {
    // for smallish Mat objects display as a matrix
-    if ([self dims] == 2 && [self rows] <= 10 && [self cols] <= 10) {
+    if ([self dims] == 2 && [self rows] <= 10 && [self cols] <= 10 && [self channels] == 1) {
        FontGetter fontGetters[] = { getCMU, getBodoni72, getAnySerif, getSystemFont };
        NSFont* font = nil;
        for (int fontGetterIndex = 0; font==nil && fontGetterIndex < (sizeof(fontGetters)) / (sizeof(fontGetters[0])); fontGetterIndex++) {