Skip to content

Updates to version 11.5.1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Updates to version 11.5.1 #1

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e59739b
added v11.4.8
sMaltsevAcuant Feb 19, 2021
ea11145
added v11.4.9
sMaltsevAcuant Mar 23, 2021
dc00a53
added v11.4.10
Apr 29, 2021
148ffa9
Revert "added v11.4.10"
Apr 30, 2021
f7a5366
added notice about upcoming changes
sMaltsevAcuant Jun 9, 2021
d9a33bc
added v11.5.0
sMaltsevAcuant Jun 11, 2021
ef952bc
added v11.5.1 (pod spec fix only)
sMaltsevAcuant Jun 16, 2021
9fafda6
readme update
sMaltsevAcuant Jun 16, 2021
9bab350
readme fix
sMaltsevAcuant Jun 16, 2021
414074a
Merge remote-tracking branch 'acuant_origin/master'
jedvalmar Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
added v11.5.0
  • Loading branch information
@sMaltsevAcuant
sMaltsevAcuant committed Jun 16, 2021
commit d9a33bc2372a4741eb0cc9bf4dc9b4ccecf93449
42 changes: 21 additions & 21 deletions AcuantCamera/AcuantCamera.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
@@ -3,35 +3,35 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
134F59D721FA0BA600CEDBFC /* AcuantCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = 134F59D521FA0BA600CEDBFC /* AcuantCamera.h */; settings = {ATTRIBUTES = (Public, ); }; };
134F59E621FA0C2B00CEDBFC /* DocumentCameraController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 134F59E421FA0C2B00CEDBFC /* DocumentCameraController.swift */; };
134F59E921FA0C8700CEDBFC /* CameraCaptureDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 134F59E821FA0C8700CEDBFC /* CameraCaptureDelegate.swift */; };
767F07FD255F356800830649 /* AutoCaptureDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 767F07FC255F356800830649 /* AutoCaptureDelegate.swift */; };
76D00240233E7C7F00CE3DA8 /* AcuantCameraOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D0023F233E7C7F00CE3DA8 /* AcuantCameraOptions.swift */; };
76D00240233E7C7F00CE3DA8 /* CameraOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76D0023F233E7C7F00CE3DA8 /* CameraOptions.swift */; };
8327AA1D2420056700B524F9 /* AcuantMrzCaptureSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8327AA192420056700B524F9 /* AcuantMrzCaptureSession.swift */; };
8327AA212420056700B524F9 /* AcuantMrzCameraController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8327AA182420056700B524F9 /* AcuantMrzCameraController.swift */; };
8327AA27242005A900B524F9 /* TesseractOCR.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8327AA26242005A900B524F9 /* TesseractOCR.framework */; };
8327AA422420081100B524F9 /* AcuantMrzParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8327AA3D2420081100B524F9 /* AcuantMrzParser.swift */; };
8327AA432420081100B524F9 /* StringExt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8327AA3F2420081100B524F9 /* StringExt.swift */; };
8327AA442420081100B524F9 /* AcuantOcrDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8327AA402420081100B524F9 /* AcuantOcrDetector.swift */; };
8327AA452420081100B524F9 /* AcuantMrzResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8327AA412420081100B524F9 /* AcuantMrzResult.swift */; };
836DD9A42315EA1400428964 /* CameraDocumentOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836DD9A32315EA1400428964 /* CameraDocumentOverlayView.swift */; };
836DD9A62315EA3000428964 /* AcuantCameraTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836DD9A52315EA3000428964 /* AcuantCameraTextView.swift */; };
836DD9A62315EA3000428964 /* CameraTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836DD9A52315EA3000428964 /* CameraTextView.swift */; };
836DD9A82316096400428964 /* CameraCornerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836DD9A72316096400428964 /* CameraCornerView.swift */; };
836DD9AA23160BA200428964 /* CameraCornerOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836DD9A923160BA200428964 /* CameraCornerOverlayView.swift */; };
836DE49523204DA8005299E5 /* UIImageExtn.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836DE49423204DA8005299E5 /* UIImageExtn.swift */; };
8387E200243284440051AF80 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8387E1FF243284440051AF80 /* Media.xcassets */; };
83BCAA012241961E00181B2A /* FrameAnalysisDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83BCAA002241961E00181B2A /* FrameAnalysisDelegate.swift */; };
AA1728CF2673DE3D00E3E2CB /* AcuantCommon.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1728CD2673DE3D00E3E2CB /* AcuantCommon.xcframework */; };
AA1728D12673DE3D00E3E2CB /* AcuantImagePreparation.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1728CE2673DE3D00E3E2CB /* AcuantImagePreparation.xcframework */; };
AA1728D52673E21800E3E2CB /* TesseractOCR.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1728D42673E21800E3E2CB /* TesseractOCR.framework */; };
C25D3BA9220B29BF003F3027 /* DocumentCaptureSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = C25D3BA8220B29BF003F3027 /* DocumentCaptureSession.swift */; };
C25D3BAB220B29EE003F3027 /* DocumentCaptureDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C25D3BAA220B29EE003F3027 /* DocumentCaptureDelegate.swift */; };
C2743A26222DE2E700302CE7 /* CaptureConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2743A25222DE2E700302CE7 /* CaptureConstants.swift */; };
C2B8F11F22F1D61A009811A8 /* UIScreenExtn.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2B8F11E22F1D61A009811A8 /* UIScreenExtn.swift */; };
C2DC4932224BBCD20003C0CA /* AcuantCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2C291F0221DC860005B4918 /* AcuantCommon.framework */; };
C2DC4933224BBCD20003C0CA /* AcuantImagePreparation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2BB6D6D221E0F65005AFC35 /* AcuantImagePreparation.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
@@ -41,37 +41,37 @@
134F59E421FA0C2B00CEDBFC /* DocumentCameraController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentCameraController.swift; sourceTree = "<group>"; };
134F59E821FA0C8700CEDBFC /* CameraCaptureDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraCaptureDelegate.swift; sourceTree = "<group>"; };
767F07FC255F356800830649 /* AutoCaptureDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoCaptureDelegate.swift; sourceTree = "<group>"; };
76D0023F233E7C7F00CE3DA8 /* AcuantCameraOptions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcuantCameraOptions.swift; sourceTree = "<group>"; };
76D0023F233E7C7F00CE3DA8 /* CameraOptions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraOptions.swift; sourceTree = "<group>"; };
8327AA182420056700B524F9 /* AcuantMrzCameraController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AcuantMrzCameraController.swift; sourceTree = "<group>"; };
8327AA192420056700B524F9 /* AcuantMrzCaptureSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AcuantMrzCaptureSession.swift; sourceTree = "<group>"; };
8327AA26242005A900B524F9 /* TesseractOCR.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TesseractOCR.framework; path = ../SampleApp/Carthage/Build/iOS/TesseractOCR.framework; sourceTree = "<group>"; };
8327AA3D2420081100B524F9 /* AcuantMrzParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AcuantMrzParser.swift; sourceTree = "<group>"; };
8327AA3F2420081100B524F9 /* StringExt.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringExt.swift; sourceTree = "<group>"; };
8327AA402420081100B524F9 /* AcuantOcrDetector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AcuantOcrDetector.swift; sourceTree = "<group>"; };
8327AA412420081100B524F9 /* AcuantMrzResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AcuantMrzResult.swift; sourceTree = "<group>"; };
836DD9A32315EA1400428964 /* CameraDocumentOverlayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraDocumentOverlayView.swift; sourceTree = "<group>"; };
836DD9A52315EA3000428964 /* AcuantCameraTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcuantCameraTextView.swift; sourceTree = "<group>"; };
836DD9A52315EA3000428964 /* CameraTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraTextView.swift; sourceTree = "<group>"; };
836DD9A72316096400428964 /* CameraCornerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraCornerView.swift; sourceTree = "<group>"; };
836DD9A923160BA200428964 /* CameraCornerOverlayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraCornerOverlayView.swift; sourceTree = "<group>"; };
836DE49423204DA8005299E5 /* UIImageExtn.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIImageExtn.swift; sourceTree = "<group>"; };
8387E1FF243284440051AF80 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
83BCAA002241961E00181B2A /* FrameAnalysisDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameAnalysisDelegate.swift; sourceTree = "<group>"; };
AA1728CD2673DE3D00E3E2CB /* AcuantCommon.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = AcuantCommon.xcframework; path = ../EmbeddedFrameworks/AcuantCommon.xcframework; sourceTree = "<group>"; };
AA1728CE2673DE3D00E3E2CB /* AcuantImagePreparation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = AcuantImagePreparation.xcframework; path = ../EmbeddedFrameworks/AcuantImagePreparation.xcframework; sourceTree = "<group>"; };
AA1728D42673E21800E3E2CB /* TesseractOCR.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TesseractOCR.framework; path = ../EmbeddedFrameworks/TesseractOCR.framework; sourceTree = "<group>"; };
C25D3BA8220B29BF003F3027 /* DocumentCaptureSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentCaptureSession.swift; sourceTree = "<group>"; };
C25D3BAA220B29EE003F3027 /* DocumentCaptureDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentCaptureDelegate.swift; sourceTree = "<group>"; };
C2743A25222DE2E700302CE7 /* CaptureConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaptureConstants.swift; sourceTree = "<group>"; };
C2B8F11E22F1D61A009811A8 /* UIScreenExtn.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIScreenExtn.swift; sourceTree = "<group>"; };
C2BB6D6D221E0F65005AFC35 /* AcuantImagePreparation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AcuantImagePreparation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C2C291F0221DC860005B4918 /* AcuantCommon.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AcuantCommon.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
134F59CF21FA0BA600CEDBFC /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C2DC4932224BBCD20003C0CA /* AcuantCommon.framework in Frameworks */,
8327AA27242005A900B524F9 /* TesseractOCR.framework in Frameworks */,
C2DC4933224BBCD20003C0CA /* AcuantImagePreparation.framework in Frameworks */,
AA1728CF2673DE3D00E3E2CB /* AcuantCommon.xcframework in Frameworks */,
AA1728D52673E21800E3E2CB /* TesseractOCR.framework in Frameworks */,
AA1728D12673DE3D00E3E2CB /* AcuantImagePreparation.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -111,9 +111,9 @@
134F59EA21FA0E0D00CEDBFC /* Frameworks */ = {
isa = PBXGroup;
children = (
C2BB6D6D221E0F65005AFC35 /* AcuantImagePreparation.framework */,
C2C291F0221DC860005B4918 /* AcuantCommon.framework */,
8327AA26242005A900B524F9 /* TesseractOCR.framework */,
AA1728D42673E21800E3E2CB /* TesseractOCR.framework */,
AA1728CD2673DE3D00E3E2CB /* AcuantCommon.xcframework */,
AA1728CE2673DE3D00E3E2CB /* AcuantImagePreparation.xcframework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -191,7 +191,7 @@
children = (
8327AA472420086F00B524F9 /* Document */,
8327AA462420084100B524F9 /* Mrz */,
76D0023F233E7C7F00CE3DA8 /* AcuantCameraOptions.swift */,
76D0023F233E7C7F00CE3DA8 /* CameraOptions.swift */,
);
path = Camera;
sourceTree = "<group>";
@@ -200,7 +200,7 @@
isa = PBXGroup;
children = (
836DD9A32315EA1400428964 /* CameraDocumentOverlayView.swift */,
836DD9A52315EA3000428964 /* AcuantCameraTextView.swift */,
836DD9A52315EA3000428964 /* CameraTextView.swift */,
836DD9A72316096400428964 /* CameraCornerView.swift */,
836DD9A923160BA200428964 /* CameraCornerOverlayView.swift */,
);
@@ -295,10 +295,10 @@
767F07FD255F356800830649 /* AutoCaptureDelegate.swift in Sources */,
134F59E621FA0C2B00CEDBFC /* DocumentCameraController.swift in Sources */,
8327AA1D2420056700B524F9 /* AcuantMrzCaptureSession.swift in Sources */,
836DD9A62315EA3000428964 /* AcuantCameraTextView.swift in Sources */,
836DD9A62315EA3000428964 /* CameraTextView.swift in Sources */,
836DD9A42315EA1400428964 /* CameraDocumentOverlayView.swift in Sources */,
8327AA432420081100B524F9 /* StringExt.swift in Sources */,
76D00240233E7C7F00CE3DA8 /* AcuantCameraOptions.swift in Sources */,
76D00240233E7C7F00CE3DA8 /* CameraOptions.swift in Sources */,
C25D3BA9220B29BF003F3027 /* DocumentCaptureSession.swift in Sources */,
836DE49523204DA8005299E5 /* UIImageExtn.swift in Sources */,
8327AA442420081100B524F9 /* AcuantOcrDetector.swift in Sources */,
2 changes: 1 addition & 1 deletion ...ntCamera/Camera/AcuantCameraOptions.swift → ...a/AcuantCamera/Camera/CameraOptions.swift
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
import Foundation
import UIKit

@objcMembers public class AcuantCameraOptions : NSObject{
@objcMembers public class CameraOptions : NSObject{

public let timeInMsPerDigit: Int
public let digitsToShow: Int
10 changes: 5 additions & 5 deletions AcuantCamera/AcuantCamera/Camera/Document/DocumentCameraController.swift
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ import AcuantCommon
var captureSession: DocumentCaptureSession!
var lastDeviceOrientation : UIDeviceOrientation!
var videoPreviewLayer: AVCaptureVideoPreviewLayer!
var messageLayer :AcuantCameraTextView! = nil
var messageLayer :CameraTextView! = nil
var cornerLayer : CameraCornerOverlayView! = nil
var shapeLayer : CameraDocumentOverlayView! = nil
var captured : Bool = false
@@ -33,7 +33,7 @@ import AcuantCommon

private let context = CIContext()
private var currentPoints : [CGPoint]? = nil
private var options : AcuantCameraOptions? = nil
private var options : CameraOptions? = nil
weak private var cameraCaptureDelegate : CameraCaptureDelegate? = nil

private var currentState = FrameResult.NO_DOCUMENT
@@ -49,7 +49,7 @@ import AcuantCommon
private var nextState = FrameResult.NO_DOCUMENT
private var isNavigationHidden = false

public class func getCameraController(delegate:CameraCaptureDelegate, cameraOptions: AcuantCameraOptions)->DocumentCameraController{
public class func getCameraController(delegate:CameraCaptureDelegate, cameraOptions: CameraOptions)->DocumentCameraController{
let c = DocumentCameraController()
c.cameraCaptureDelegate = delegate
c.options = cameraOptions
@@ -136,7 +136,7 @@ import AcuantCommon
self.videoPreviewLayer.connection?.videoOrientation = .portrait

if(self.messageLayer == nil) {
self.messageLayer = AcuantCameraTextView(autoCapture: autoCapture)
self.messageLayer = CameraTextView(autoCapture: autoCapture)
}
self.messageLayer.setFrame(frame: self.view!.frame);
if(self.cornerLayer == nil) {
@@ -158,7 +158,7 @@ import AcuantCommon
}

public func documentCaptured(image: UIImage, barcodeString: String?) {
let result = AcuantImagePreparation.createCameraImage(image: rotateImage(image: image), data: AcuantCameraMetaData().setCaptureType(captureType: autoCapture ? "AUTO" : "TAP"))
let result = ImagePreparation.createCameraImage(image: rotateImage(image: image), data: CameraMetaData().setCaptureType(captureType: autoCapture ? "AUTO" : "TAP"))
//result.image = rotateImage(image: image)
//result.captureType = autoCapture ? "AUTO" : "TAP"
self.navigationController?.popViewController(animated: true)
Loading