Mat conversions for macOS/AppKit by mtfrctl · Pull Request #18547 · opencv/opencv

mtfrctl · 2020-10-09T03:29:01Z

This PR solves #18546.
It consists

Extract CoreGraphics conversion logics from ios_conversions.mm to apple_conversions.h, apple_conversions.mm (MatToCGImage(), CGImageToMat())
Simplify ios_conversions.mm
Add macosx_conversions.mm for macOS/AppKit (MatToNSImage(), NSImageToMat())
Add Mat+Conversions.h and Mat+Conversions.mm for macOS/AppKit

Usage example in Swift:
※ Don't forget to set the -all_load flag to "Other Linker Flags" in "Build Settings" when using! #17532

// CGImage to Mat
let sourceMat = Mat(cgImage: cgImage, alphaExist: true)

// NSImage to Mat
let sourceMat = Mat(nsImage: nsImage, alphaExist: true)

// Something to process
let grayMat = Mat()
Imgproc.cvtColor(src: sourceMat, dst: grayMat, code: .COLOR_RGBA2GRAY)

// Mat to CGImage
let cgImage = grayMat.toCGImage().takeRetainedValue() // or .takeUnetainedValue()

// Mat to NSImage
let nsImage = grayMat.toNSImage()

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

I agree to contribute to the project under Apache 2 License.
To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
The PR is proposed to proper branch
There is reference to original bug report and related work

force_builders=Custom Mac
build_image:Custom Mac=osx_framework

buildworker:iOS=macosx-1

…le_conversions.h, apple_conversions. Add macosx_conversions.mm

alalek

Thank you for contribution!

Please take a look on comments below.

alalek · 2020-10-09T07:46:00Z

modules/imgcodecs/include/opencv2/imgcodecs/macosx.h

+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library


Please use short license header: https://github.com/opencv/opencv/wiki/Coding_Style_Guide#file-structure

// This file is part of OpenCV project. // It is subject to the license terms in the LICENSE file found in the top-level directory // of this distribution and at http://opencv.org/license.html.

🙆‍♂️
42a685c

Thank you for updates!
Please make similar update of license headers of new files in this PR.
Please remove empty first line in this file.

modules/imgcodecs/include/opencv2/imgcodecs/macosx.h

alalek · 2020-10-09T07:51:42Z

modules/imgcodecs/src/apple_conversions.h

+#import <AVFoundation/AVFoundation.h>
+#import <ImageIO/ImageIO.h>
+#include "opencv2/core.hpp"
+#include "precomp.hpp"


precomp.hpp

Please don't use this from header files. Move into .mm files instead

Thank you. I moved it.
edfe785

modules/imgcodecs/include/opencv2/imgcodecs/macosx.h

alalek · 2020-10-09T07:53:47Z

modules/imgcodecs/src/apple_conversions.mm

+
+    CGColorSpaceRef colorSpace;
+
+    if (image.elemSize() == 1) {


.elemSize() => .channels()

+ CV_CheckDepth(image.depth(), CV_8U, ""); check on the first line.

OK, I see this code is just moved.

modules/imgcodecs/include/opencv2/imgcodecs/macosx.h

komakai · 2020-10-10T04:03:06Z

@mtfrctl thanks for this - this is a great feature.
I checked the code and everything looks fine.
I have tried it quickly - after I remembered to set -all_load in the Other Linker Flags of my project everything worked well.
👍

mtfrctl · 2020-10-10T04:33:56Z

@komakai Thank you! Regarding the flag, people who come to check here will also check these @komakai and @treastrain conversations (#17532 #18023), but it would be nice in the future so that it can be used immediately without being aware of these things ⭐

mtfrctl · 2020-10-11T08:04:11Z

@alalek By the way, I would like to add the following method to modules/core/misc/objc/common/Mat.mm (and .h) for more flexibility, is it okay to include it in this PR, or is it better to separate it into another PR?

- (unsigned char*)dataPtr {
    return _nativePtr->data;
}

alalek · 2020-10-11T08:15:33Z

If there is no strong dependency between patches, then separate PR is better.

mtfrctl · 2020-10-11T10:26:02Z

@alalek I created a PR separately here #18566. I'm sorry to bother you, but I'd be happy if you could check it. 🙏

alalek

@mtfrctl Thank you for contribution 👍

@komakai Thank you for review!

komakai · 2020-10-15T11:44:59Z

@mtfrctl keep the contributions coming!

Mat conversions for macOS/AppKit * Extract CoreGraphics conversion logics from ios_conversions.mm to apple_conversions.h, apple_conversions. Add macosx_conversions.mm * Add macosx.h * Add Mat+Conversions.h and Mat+Conversions.mm * Delete duplicated declaration from apple_conversion.mm * Use short license header * Add compile guard * Delete unused imports * Move precomp.hpp import from header to implementation * Add macosx.h to skip headers * Fix compile guard condition * Use short license header * Remove commented out unused code

mtfrctl added 3 commits October 9, 2020 12:06

Extract CoreGraphics conversion logics from ios_conversions.mm to app…

f4d509c

…le_conversions.h, apple_conversions. Add macosx_conversions.mm

Add macosx.h

35e088b

Add Mat+Conversions.h and Mat+Conversions.mm

53d6340

mtfrctl mentioned this pull request Oct 9, 2020

Mat conversions for macOS/AppKit #18546

Open

mtfrctl changed the title ~~Mat conversions for macOS(AppKit)~~ Mat conversions for macOS/AppKit Oct 9, 2020

Delete duplicated declaration from apple_conversion.mm

5ce5a56

alalek reviewed Oct 9, 2020

View reviewed changes

modules/imgcodecs/include/opencv2/imgcodecs/macosx.h Show resolved Hide resolved

mtfrctl added 5 commits October 9, 2020 18:33

Use short license header

42a685c

Add compile guard

57b9631

Delete unused imports

7e72d2f

Move precomp.hpp import from header to implementation

edfe785

Add macosx.h to skip headers

8b1cc75

mtfrctl requested a review from alalek October 9, 2020 11:50

mtfrctl mentioned this pull request Oct 9, 2020

Objc binding #17165

Merged

5 tasks

mtfrctl added 2 commits October 10, 2020 12:50

Fix compile guard condition

7b668e4

Use short license header

ae0ba08

Remove commented out unused code

c4177c1

alalek approved these changes Oct 14, 2020

View reviewed changes

alalek merged commit 7de1891 into opencv:master Oct 14, 2020

mtfrctl deleted the objc-conversions-macosx branch October 15, 2020 06:13

This was referenced Nov 18, 2020

Add apple_conversions to framework builds Rightpoint/opencv#5

Closed

Expose CGImage <-> Mat conversion for iOS platforms #18855

Merged

alalek mentioned this pull request Nov 27, 2020

Merge 4.x #18951

Merged

Uh oh!

Conversation

mtfrctl commented Oct 9, 2020 • edited by alalek Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Readiness Checklist

Uh oh!

alalek left a comment

Choose a reason for hiding this comment

Uh oh!

alalek Oct 9, 2020

Choose a reason for hiding this comment

Uh oh!

mtfrctl Oct 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alalek Oct 9, 2020

Choose a reason for hiding this comment

Uh oh!

mtfrctl Oct 10, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

alalek Oct 9, 2020

Choose a reason for hiding this comment

Uh oh!

mtfrctl Oct 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

alalek Oct 9, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

komakai commented Oct 10, 2020

Uh oh!

mtfrctl commented Oct 10, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mtfrctl commented Oct 11, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alalek commented Oct 11, 2020

Uh oh!

mtfrctl commented Oct 11, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alalek left a comment

Choose a reason for hiding this comment

Uh oh!

komakai commented Oct 15, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mtfrctl commented Oct 9, 2020 •

edited by alalek

Loading

mtfrctl Oct 9, 2020 •

edited

Loading

mtfrctl Oct 9, 2020 •

edited

Loading

mtfrctl commented Oct 10, 2020 •

edited

Loading

mtfrctl commented Oct 11, 2020 •

edited

Loading

mtfrctl commented Oct 11, 2020 •

edited

Loading