From 2ad90471cb8e790372451259bdf0ab479354dcbf Mon Sep 17 00:00:00 2001
From: "dino.gustin" <dino.gustin@microblink.com>
Date: Thu, 30 Jun 2016 19:19:44 +0200
Subject: [PATCH] updated sample apps

---
 .../BlinkID-sample-Swift/ViewController.swift |  2 +-
 .../BlinkOCR-sample/ViewController.m          |  2 +-
 .../Detector-sample/ViewController.m          |  2 +-
 .../DirectAPI-sample/CameraViewController.m   | 11 ++-----
 .../DirectAPI-sample/RootViewController.m     |  2 +-
 .../Templating-Sample/ViewController.m        | 31 +++++++++++++------
 .../pdf417-sample-Swift/ViewController.swift  |  2 +-
 .../pdf417-sample/ViewController.m            |  2 +-
 8 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/Samples/BlinkID-sample-Swift/BlinkID-sample-Swift/ViewController.swift b/Samples/BlinkID-sample-Swift/BlinkID-sample-Swift/ViewController.swift
index e4d09311b..823851bef 100644
--- a/Samples/BlinkID-sample-Swift/BlinkID-sample-Swift/ViewController.swift
+++ b/Samples/BlinkID-sample-Swift/BlinkID-sample-Swift/ViewController.swift
@@ -39,7 +39,7 @@ class ViewController: UIViewController, PPScanningDelegate {
         /** 2. Setup the license key */
 
         // Visit www.microblink.com to get the license key for your app
-        settings.licenseSettings.licenseKey = "N7E2CVWA-53NU6P42-4R5PPORH-EG4IDJLM-2DYMTRYX-YYID4OQ4-QQGZRDLH-PL22BO5S"
+        settings.licenseSettings.licenseKey = "DQJ6ICMF-YSQFSXVG-YMCULUIW-RGFDKJGE-UL4FWYU7-RI2SJRFC-7BNWEHZK-QERKXNQU"
 
 
         /**
diff --git a/Samples/BlinkOCR-sample/BlinkOCR-sample/ViewController.m b/Samples/BlinkOCR-sample/BlinkOCR-sample/ViewController.m
index c211e3b47..423a498f5 100644
--- a/Samples/BlinkOCR-sample/BlinkOCR-sample/ViewController.m
+++ b/Samples/BlinkOCR-sample/BlinkOCR-sample/ViewController.m
@@ -56,7 +56,7 @@ - (PPCameraCoordinator *)coordinatorWithError:(NSError**)error {
     /** 2. Setup the license key */
 
     // Visit www.microblink.com to get the license key for your app
-    settings.licenseSettings.licenseKey = @"E5GAM3PR-QUAAZNCG-4OZNNF5A-6M3ZZNAG-EO4V2VWM-ZOWXP23P-AJB2Q76G-CJYXH7NE";
+    settings.licenseSettings.licenseKey = @"IYKDZ5KK-Z43DS2MO-R6PU43YC-IOUP7NYN-B3YM4B2Y-FMLRZ6TY-CIGQ44BR-7T4PV7RO";
 
 
     /** 
diff --git a/Samples/Detector-sample/Detector-sample/ViewController.m b/Samples/Detector-sample/Detector-sample/ViewController.m
index 554f85bed..880d98e4b 100644
--- a/Samples/Detector-sample/Detector-sample/ViewController.m
+++ b/Samples/Detector-sample/Detector-sample/ViewController.m
@@ -63,7 +63,7 @@ - (PPCameraCoordinator *)coordinatorWithError:(NSError**)error {
     /** 2. Setup the license key */
 
     // Visit www.microblink.com to get the license key for your app
-    settings.licenseSettings.licenseKey = @"G5R3PKW5-7KUCFX6B-HHG4VJE4-76CSSGVD-6FJ6JFSP-5U4AH3JY-APWTQA7N-HABZVSIJ"; // Valid temporarily
+    settings.licenseSettings.licenseKey = @"EXWAJZZY-A4G7YT5N-FDEXLOKC-6LSZHCGZ-WX7YKKI2-UPYVHZEW-J7WTRA63-WTKN5A6Y"; // Valid temporarily
 
 
     /** 3. Set up what is being scanned. See detailed guides for specific use cases. */
diff --git a/Samples/DirectAPI-sample/DirectAPI-sample/CameraViewController.m b/Samples/DirectAPI-sample/DirectAPI-sample/CameraViewController.m
index 52bc7befb..d993f5e12 100644
--- a/Samples/DirectAPI-sample/DirectAPI-sample/CameraViewController.m
+++ b/Samples/DirectAPI-sample/DirectAPI-sample/CameraViewController.m
@@ -41,7 +41,7 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIVi
 }
 
 - (IBAction)closeCamera:(id)sender {
-    [((AVCaptureVideoDataOutput *)_captureSession.outputs[0]) setVideoSettings:[NSDictionary dictionaryWithObject:[NSNumber numberWithInt:kCVPixelFormatType_32BGRA] forKey:(id)kCVPixelBufferPixelFormatTypeKey]];
+    [self dismissViewControllerAnimated:YES completion:nil];
 }
 
 - (void)viewDidAppear:(BOOL)animate {
@@ -188,13 +188,8 @@ - (AVCaptureDevice *)cameraWithPosition:(AVCaptureDevicePosition) position {
 }
 
 - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer fromConnection:(AVCaptureConnection *)connection {
-    OSType pixelFormat = CVPixelBufferGetPixelFormatType(CMSampleBufferGetImageBuffer(sampleBuffer));
     
-    if(pixelFormat == kCVPixelFormatType_420YpCbCr8BiPlanarFullRange) {
-        NSLog(@"YUV");
-    } else {
-                NSLog(@"BGRA");
-    }
+    [self.coordinator processImage:[PPImage imageWithCmSampleBuffer:sampleBuffer]];
     
 }
 
@@ -211,7 +206,7 @@ - (void)createCoordinator {
     /** 2. Setup the license key */
     
     // Visit www.microblink.com to get the license key for your app
-    settings.licenseSettings.licenseKey = @"UJ4FY6F5-BWLRGC6Y-3DKUK6NN-YVJURO7R-4WPK5D6C-FP5ITGVQ-6SW4LU2D-PAG6EA5V";
+    settings.licenseSettings.licenseKey = @"7J7EBQVU-I5OSBF2E-QT7LBDCU-4RSDE72H-L4TSFPDR-XRY3Y4N4-OG6HCPAR-STLYN6KU";
     
     
     /**
diff --git a/Samples/DirectAPI-sample/DirectAPI-sample/RootViewController.m b/Samples/DirectAPI-sample/DirectAPI-sample/RootViewController.m
index e3df04799..c258b85c1 100644
--- a/Samples/DirectAPI-sample/DirectAPI-sample/RootViewController.m
+++ b/Samples/DirectAPI-sample/DirectAPI-sample/RootViewController.m
@@ -75,7 +75,7 @@ - (void)createCoordinator {
     /** 2. Setup the license key */
     
     // Visit www.microblink.com to get the license key for your app
-    settings.licenseSettings.licenseKey = @"UJ4FY6F5-BWLRGC6Y-3DKUK6NN-YVJURO7R-4WPK5D6C-FP5ITGVQ-6SW4LU2D-PAG6EA5V";
+    settings.licenseSettings.licenseKey = @"7J7EBQVU-I5OSBF2E-QT7LBDCU-4RSDE72H-L4TSFPDR-XRY3Y4N4-OG6HCPAR-STLYN6KU";
     
     
     /**
diff --git a/Samples/Templating-Sample/Templating-Sample/ViewController.m b/Samples/Templating-Sample/Templating-Sample/ViewController.m
index 2fb9af774..5d5e361d4 100644
--- a/Samples/Templating-Sample/Templating-Sample/ViewController.m
+++ b/Samples/Templating-Sample/Templating-Sample/ViewController.m
@@ -68,7 +68,7 @@ - (PPCameraCoordinator *)coordinatorWithError:(NSError**)error {
     /** 2. Setup the license key */
     
     // Visit www.microblink.com to get the license key for your app
-    settings.licenseSettings.licenseKey = @"PXDINEKM-NYNWDIZO-MOG7DWJD-2MVL5I3O-DE3YGZK4-Z5SVZT3F-LTHWLXBO-NMHHINUI"; // Valid temporarily
+    settings.licenseSettings.licenseKey = @"VOEZDAU5-OY4L6N6D-IML6XBV6-UNXBSN4D-MVOM6ZK4-Z5SVZT3F-LTHWLXBO-NMHHINJ6"; // Valid temporarily
     
 
 
@@ -106,14 +106,16 @@ - (PPCameraCoordinator *)coordinatorWithError:(NSError**)error {
             /**
              * tweak OCR engine options - allow only recognition of uppercase letters used in Croatia
              */
-            nameParser.options.charWhitelist = [self uppercaseCharsWhitelist];
-
+            PPOcrEngineOptions *options = [[PPOcrEngineOptions alloc] init];
+            options.charWhitelist = [self uppercaseCharsWhitelist];
+            [nameParser setOptions:options];
+            
             /**
              * Add parser to recognizer settings
              */
             [ocrSettings addOcrParser:nameParser name:ID_FIRST_NAME group:ID_FIRST_NAME];
-
-            /** 
+            
+            /**
              * Locations of first name string on borth old and new ID cards
              */
             CGRect oldIdNameLocation = CGRectMake(0.282, 0.333, 0.306, 0.167);
@@ -131,7 +133,10 @@ - (PPCameraCoordinator *)coordinatorWithError:(NSError**)error {
         {
             int dewarpHeight = 150;
             PPRegexOcrParserFactory *nameParser = [[PPRegexOcrParserFactory alloc] initWithRegex:@"([A-ZŠĐŽČĆ]+ ?)+"];
-            nameParser.options.charWhitelist = [self uppercaseCharsWhitelist];
+            
+            PPOcrEngineOptions *options = [[PPOcrEngineOptions alloc] init];
+            options.charWhitelist = [self uppercaseCharsWhitelist];
+            [nameParser setOptions:options];
             
             [ocrSettings addOcrParser:nameParser name:ID_LAST_NAME group:ID_LAST_NAME];
             
@@ -155,13 +160,17 @@ - (PPCameraCoordinator *)coordinatorWithError:(NSError**)error {
             [charWhitelist addObject:[PPOcrCharKey keyWithCode:'F' font:PP_OCR_FONT_ANY]];
             [charWhitelist addObject:[PPOcrCharKey keyWithCode:'/' font:PP_OCR_FONT_ANY]];
             [charWhitelist addObject:[PPOcrCharKey keyWithCode:0xC5 font:PP_OCR_FONT_ANY]];
-            sexParser.options.charWhitelist = charWhitelist;
+            PPOcrEngineOptions *options = [[PPOcrEngineOptions alloc] init];
+            options.charWhitelist = charWhitelist;
+            [sexParser setOptions:options];
             
             [ocrSettings addOcrParser:sexParser name:ID_SEX group:ID_SEX_CITIZENSHIP_DOB];
             
             /** Setup citizenship parser */
             PPRegexOcrParserFactory *citizenshipParser = [[PPRegexOcrParserFactory alloc] initWithRegex:@"[A-Z]{3}"];
-            citizenshipParser.options.charWhitelist = [self uppercaseCharsWhitelist];
+            options = [[PPOcrEngineOptions alloc] init];
+            options.charWhitelist = [self uppercaseCharsWhitelist];
+            [citizenshipParser setOptions:options];
             
             [ocrSettings addOcrParser:citizenshipParser name:ID_CITIZENSHIP group:ID_SEX_CITIZENSHIP_DOB];
             
@@ -195,8 +204,10 @@ - (PPCameraCoordinator *)coordinatorWithError:(NSError**)error {
             for (int c = '0'; c <= '9'; c++) {
                 [charWhitelist addObject:[PPOcrCharKey keyWithCode:c font:PP_OCR_FONT_ANY]];
             }
-            documentNumberParser.options.charWhitelist = charWhitelist;
-            documentNumberParser.options.minimalLineHeight = 35;
+            PPOcrEngineOptions *options = [[PPOcrEngineOptions alloc] init];
+            options.charWhitelist = charWhitelist;
+            options.minimalLineHeight = 35;
+            [documentNumberParser setOptions:options];
             
             [ocrSettings addOcrParser:documentNumberParser name:ID_DOCUMENT_NUMBER group:ID_DOCUMENT_NUMBER_NEW];
             [ocrSettings addOcrParser:documentNumberParser name:ID_DOCUMENT_NUMBER group:ID_DOCUMENT_NUMBER_OLD];
diff --git a/Samples/pdf417-sample-Swift/pdf417-sample-Swift/ViewController.swift b/Samples/pdf417-sample-Swift/pdf417-sample-Swift/ViewController.swift
index f36351002..82f4cb133 100644
--- a/Samples/pdf417-sample-Swift/pdf417-sample-Swift/ViewController.swift
+++ b/Samples/pdf417-sample-Swift/pdf417-sample-Swift/ViewController.swift
@@ -42,7 +42,7 @@ class ViewController: UIViewController, PPScanningDelegate {
         /** 2. Setup the license key */
 
         // Visit www.microblink.com to get the license key for your app
-        settings.licenseSettings.licenseKey = "JK3VEQ6N-NJGUTY2C-3GRZ53K4-A66MQJO2-SHETBEOJ-GCI4SMER-ZEYJCSPC-E7GBIII7"
+        settings.licenseSettings.licenseKey = "FNTJASXT-CWXGYGXU-JJQWKISK-NQNLJ2OQ-6ZOVNPGI-EXNJDSJQ-SHETAEK5-LYJRSZUT"
 
 
         /**
diff --git a/Samples/pdf417-sample/pdf417-sample/ViewController.m b/Samples/pdf417-sample/pdf417-sample/ViewController.m
index 5c9761c22..e7d943462 100644
--- a/Samples/pdf417-sample/pdf417-sample/ViewController.m
+++ b/Samples/pdf417-sample/pdf417-sample/ViewController.m
@@ -55,7 +55,7 @@ - (PPCameraCoordinator *)coordinatorWithError:(NSError**)error {
     /** 2. Setup the license key */
 
     // Visit www.microblink.com to get the license key for your app
-    settings.licenseSettings.licenseKey = @"TZXZM4BO-GWEDAAYD-INKHNUUW-H3WZJE6C-HTQIZMGR-BBCGAQHU-Q62SSGXH-D7365VBI";
+    settings.licenseSettings.licenseKey = @"755A7BPT-B635RWMZ-JF5HBDIK-RIX2OBFQ-2EEEIYCA-6SD3KKM2-66MUT54Y-6JMVP4RH";
 
 
     /**