From 3e47bf2ba5f3330bda608abfe4de9b967456957e Mon Sep 17 00:00:00 2001 From: Haik Aslanyan Date: Fri, 17 Apr 2020 12:01:47 +0400 Subject: [PATCH 1/6] refactored RCCoderConfiguration --- Sources/Public/RCCoderConfiguration.swift | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Sources/Public/RCCoderConfiguration.swift b/Sources/Public/RCCoderConfiguration.swift index 3117892..81cf197 100644 --- a/Sources/Public/RCCoderConfiguration.swift +++ b/Sources/Public/RCCoderConfiguration.swift @@ -24,13 +24,12 @@ import Foundation public struct RCCoderConfiguration { - public let version: Version + public let version = Version.v1 public let maxMessageCount: Int public let bitesPerSymbol: Int public let characters: [Character] - public init(version: Version = .v1, characters: String) { - self.version = version + public init(characters: String) { var charactersArray = characters.map({$0}) charactersArray.append(version.startingCharacter) charactersArray.append(contentsOf: version.emptyCharacters) From 2d48af6823c8c7f0615d905b8154215db91739a3 Mon Sep 17 00:00:00 2001 From: Haik Aslanyan Date: Sat, 18 Apr 2020 20:29:01 +0400 Subject: [PATCH 2/6] added RCPointMapper --- Sources/Internal/RCPointMapper.swift | 55 ++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 Sources/Internal/RCPointMapper.swift diff --git a/Sources/Internal/RCPointMapper.swift b/Sources/Internal/RCPointMapper.swift new file mode 100644 index 0000000..5cc41a2 --- /dev/null +++ b/Sources/Internal/RCPointMapper.swift @@ -0,0 +1,55 @@ +// MIT License + +// Copyright (c) 2020 Haik Aslanyan + +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +import QuartzCore + +struct RCPointMapper { + + private var transform: CATransform3D + private let denominatorX: CGFloat + private let denominatorY: CGFloat + private let denominatorW: CGFloat + private let size: CGFloat + + init(transform: CATransform3D, size: Int) { + let translateDueToDisposition = CATransform3DMakeTranslation(-CGFloat(size) / 2, -CGFloat(size) / 2, 0) + self.transform = CATransform3DConcat(transform, translateDueToDisposition) + self.size = CGFloat(size) + self.denominatorX = transform.m12 * transform.m21 - transform.m11 * transform.m22 + transform.m14 * transform.m22 * transform.m41 - transform.m12 * transform.m24 * transform.m41 - transform.m14 * transform.m21 * transform.m42 + transform.m11 * transform.m24 * transform.m42 + self.denominatorY = -transform.m12 * transform.m21 + transform.m11 * transform.m22 - transform.m14 * transform.m22 * transform.m41 + transform.m12 * transform.m24 * transform.m41 + transform.m14 * transform.m21 * transform.m42 - transform.m11 * transform.m24 * transform.m42 + self.denominatorW = transform.m12 * transform.m21 - transform.m11 * transform.m22 + transform.m14 * transform.m22 * transform.m41 - transform.m12 * transform.m24 * transform.m41 - transform.m14 * transform.m21 * transform.m42 + transform.m11 * transform.m24 * transform.m42 + } + + func map(points: [CGPoint]) -> [CGPoint] { + return points.map { point in + let modelPoint = CGPoint(x: (point.x * 2.0 - size) / 2.0, y: (point.y * 2.0 - size) / 2.0) + let x = modelPoint.x + let y = modelPoint.y + let xp: CGFloat = (transform.m22 * transform.m41 - transform.m21 * transform.m42 - transform.m22 * x + transform.m24 * transform.m42 * x + transform.m21 * y - transform.m24 * transform.m41 * y) / denominatorX + let yp: CGFloat = (-transform.m11 * transform.m42 + transform.m12 * (transform.m41 - x) + transform.m14 * transform.m42 * x + transform.m11 * y - transform.m14 * transform.m41 * y) / denominatorY + let wp: CGFloat = (transform.m12 * transform.m21 - transform.m11 * transform.m22 + transform.m14 * transform.m22 * x - transform.m12 * transform.m24 * x - transform.m14 * transform.m21 * y + transform.m11 * transform.m24 * y) / denominatorW + let actualPoint = CGPoint(x: xp / wp, y: yp / wp) + let isOutOfBounds = !(0...size).contains(actualPoint.x) || !(0...size).contains(actualPoint.y) + return isOutOfBounds ? .zero : actualPoint + } + } +} From 3d2fb37f2c42d0c6f58fbc5e9ce08c4a42c96159 Mon Sep 17 00:00:00 2001 From: Haik Aslanyan Date: Sat, 18 Apr 2020 20:31:04 +0400 Subject: [PATCH 3/6] refactored RCImageDecoder --- Sources/Internal/RCImageDecoder.swift | 65 ++++++++------------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/Sources/Internal/RCImageDecoder.swift b/Sources/Internal/RCImageDecoder.swift index a3e4ce3..a8f46cd 100644 --- a/Sources/Internal/RCImageDecoder.swift +++ b/Sources/Internal/RCImageDecoder.swift @@ -54,14 +54,16 @@ extension RCImageDecoder { points.append(point) } } - let image = try fixPerspective(pointer, points: points) - let bits = decode(image) + let transform = calculateTransform(from: points) + let mapper = RCPointMapper(transform: transform, size: size) + let locations = mapper.map(points: calculateBitLocations()) + let bits = locations.map { data[Int($0.x), Int($0.y)] > RCConstants.pixelThreshold ? RCBit.zero : RCBit.one } return bits } func decode(_ image: UIImage) throws -> [RCBit] { let pixelData = UnsafeMutableRawPointer.allocate(byteCount: size * size, alignment: MemoryLayout.alignment) - let context = generateContext(data: pixelData, size: size, bytesPerRow: self.bytesPerRow) + let context = CGContext(data: pixelData, width: size, height: size, bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: CGColorSpaceCreateDeviceGray(), bitmapInfo: CGImageAlphaInfo.none.rawValue) context?.draw(image.cgImage!, in: CGRect(origin: .zero, size: CGSize(width: size, height: size))) let bits = try process(pointer: pixelData.assumingMemoryBound(to: UInt8.self)) pixelData.deallocate() @@ -163,42 +165,21 @@ extension RCImageDecoder { }.first! } - private func fixPerspective(_ data: UnsafeMutablePointer, points: [CGPoint]) throws -> CGImage { - guard let context = generateContext(data: data, size: size, bytesPerRow: bytesPerRow), let cgImage = context.makeImage() else { - throw RCError.decoding - } - let image = UIGraphicsImageRenderer(size: CGSize(width: CGFloat(size), height: CGFloat(size))).image { context in - let baseView = UIView(frame: context.format.bounds) - let imageView = UIImageView(frame: context.format.bounds) - baseView.addSubview(imageView) - imageView.image = UIImage(cgImage: cgImage) - imageView.layer.anchorPoint = .zero - imageView.layer.frame = context.format.bounds - let perspective = RCTransformation(points) - let destination = RCTransformation([CGPoint(x: context.format.bounds.minX, y: context.format.bounds.midY), - CGPoint(x: context.format.bounds.midX, y: context.format.bounds.minY), - CGPoint(x: context.format.bounds.midX, y: context.format.bounds.maxY), - CGPoint(x: context.format.bounds.maxX, y: context.format.bounds.midY)]) - let transform = perspective.perspectiveTransform(to: destination) - imageView.transform3D = transform - baseView.drawHierarchy(in: context.format.bounds, afterScreenUpdates: true) - } - guard let renderImage = image.cgImage else { - throw RCError.decoding - } - return renderImage + private func calculateTransform(from points: [CGPoint]) -> CATransform3D { + let perspective = RCTransformation(points) + let middleRect = CGRect(origin: .zero, size: CGSize(width: CGFloat(size), height: CGFloat(size))) + let destination = RCTransformation([CGPoint(x: middleRect.minX, y: middleRect.midY), + CGPoint(x: middleRect.midX, y: middleRect.minY), + CGPoint(x: middleRect.midX, y: middleRect.maxY), + CGPoint(x: middleRect.maxX, y: middleRect.midY)]) + return perspective.perspectiveTransform(to: destination) } - private func decode(_ image: CGImage) -> [RCBit] { - let pixelData = UnsafeMutableRawPointer.allocate(byteCount: image.width * image.height, alignment: MemoryLayout.alignment) - let context = generateContext(data: pixelData, size: image.width, bytesPerRow: image.width) - context?.draw(image, in: CGRect(origin: .zero, size: CGSize(width: image.width, height: image.height))) - let buffer = UnsafeMutableBufferPointer(start: pixelData.assumingMemoryBound(to: UInt8.self), count: image.width * image.height) - let data = PixelContainer(rows: image.height, items: buffer) - let size = CGFloat(data.columns) - let lineWidth = CGFloat(image.height) * RCConstants.dotSizeScale / 5 //number of lines including spaces - let mainRadius = CGFloat(image.height) / 2 - let startAngle = asin(CGFloat(image.height) * RCConstants.dotSizeScale / mainRadius) + private func calculateBitLocations() -> [CGPoint] { + let size = CGFloat(self.size) + let lineWidth = size * RCConstants.dotSizeScale / 5 //number of lines including spaces + let mainRadius = size / 2 + let startAngle = asin(size * RCConstants.dotSizeScale / mainRadius) var points = [CGPoint]() let center = CGPoint(x: size / 2, y: size / 2) (0...3).forEach { offset in @@ -214,15 +195,7 @@ extension RCImageDecoder { } } } - let bits = points.map { data[Int($0.x), Int($0.y)] > RCConstants.pixelThreshold ? RCBit.zero : RCBit.one } - pixelData.deallocate() - return bits - } -} - -extension RCImageDecoder { - private func generateContext(data: UnsafeMutableRawPointer?, size: Int, bytesPerRow: Int) -> CGContext? { - return CGContext(data: data, width: size, height: size, bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: CGColorSpaceCreateDeviceGray(), bitmapInfo: CGImageAlphaInfo.none.rawValue) + return points } } From 7b1068c0a0e4656a6bccc1d91ff021d423ee821b Mon Sep 17 00:00:00 2001 From: Haik Aslanyan Date: Sat, 18 Apr 2020 20:31:30 +0400 Subject: [PATCH 4/6] removed empty data check --- Sources/Internal/RCBitCoder.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/Internal/RCBitCoder.swift b/Sources/Internal/RCBitCoder.swift index 1687fd6..c4b0b7e 100644 --- a/Sources/Internal/RCBitCoder.swift +++ b/Sources/Internal/RCBitCoder.swift @@ -70,7 +70,6 @@ extension RCBitCoder { func decode(_ bits: [RCBit]) throws -> String { - guard bits.contains(.one) else { return "" } //starting character to bits var startingIndexCharacter = String(repeating: "0", count: configuration.bitesPerSymbol) startingIndexCharacter += String(configuration.characters.firstIndex(of: configuration.version.startingCharacter)!, radix: 2) From 5c5f9ed4a745368d7f32a2379c4d09b6bc3889ec Mon Sep 17 00:00:00 2001 From: Haik Aslanyan Date: Sat, 18 Apr 2020 20:35:10 +0400 Subject: [PATCH 5/6] updated example project --- Example/Example/Base.lproj/Main.storyboard | 21 +++++++++----- Example/Example/ViewController.swift | 32 ++++++++++++++++++++-- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard index b28ce36..f4a2b79 100644 --- a/Example/Example/Base.lproj/Main.storyboard +++ b/Example/Example/Base.lproj/Main.storyboard @@ -10,7 +10,7 @@ - + @@ -54,7 +54,7 @@