Skip to content
This repository has been archived by the owner on Jan 12, 2019. It is now read-only.

some compiling issues. #55

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "dmz"]
path = dmz
url = git@github.com:card-io/card.io-dmz.git
url = https://github.com/OneSecure/card.io-dmz.git
2,177 changes: 2,177 additions & 0 deletions CardIO.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Classes/CardIOAnimation.mm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#if USE_CAMERA || SIMULATE_CAMERA

#import <QuartzCore/QuartzCore.h>

#import "CardIOAnimation.h"

void SuppressCAAnimation(BareBlock block) {
Expand Down
2 changes: 1 addition & 1 deletion Classes/CardIOCardOverlay.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#if USE_CAMERA || SIMULATE_CAMERA

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>

@class CardIOReadCardInfo;

Expand Down
2 changes: 2 additions & 0 deletions Classes/CardIOCardScanner.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#if USE_CAMERA || SIMULATE_CAMERA

#import <Foundation/Foundation.h>

#import "scan.h"

@class CardIOIplImage;
Expand Down
2 changes: 1 addition & 1 deletion Classes/CardIOConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the file "LICENSE.md" for the full license governing this code.
//

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import "CardIOAnalytics.h"
#import "CardIODetectionMode.h"

Expand Down
2 changes: 1 addition & 1 deletion Classes/CardIOConfigurableTextFieldDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the file "LICENSE.md" for the full license governing this code.
//

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>


@interface CardIOConfigurableTextFieldDelegate : NSObject<UITextFieldDelegate> {
Expand Down
2 changes: 1 addition & 1 deletion Classes/CardIOContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// This object is a container for information about a particular card.io instantiation. Most of this information
// is either set by the developer or initialized on first use.

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import "CardIODetectionMode.h"

@class CardIOAnalytics;
Expand Down
3 changes: 3 additions & 0 deletions Classes/CardIOGPUFilter.m
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

#import "CardIOGPUFilter.h"

#include "opencv2/core/types_c.h"


@implementation CardIOGPUFilter

#pragma mark Utility classmethods
Expand Down
7 changes: 7 additions & 0 deletions Classes/CardIOGPURenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
// See the file "LICENSE.md" for the full license governing this code.
//

#import <UIKit/UIKit.h>
#import <CoreGraphics/CoreGraphics.h>
#import <OpenGLES/EAGL.h>
#import <OpenGLES/gltypes.h>

typedef struct _IplImage IplImage;

@interface CardIOGPURenderer : NSObject {
// Handles
GLuint _programHandle;
Expand Down
4 changes: 3 additions & 1 deletion Classes/CardIOIplImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
// See the file "LICENSE.md" for the full license governing this code.
//

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <CoreVideo/CoreVideo.h>

#include "opencv2/core/core_c.h"

#define Y_PLANE 0
#define CBCR_PLANE 1

Expand Down
3 changes: 3 additions & 0 deletions Classes/CardIOMacros.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

// CardIOLog is a replacement for NSLog that logs iff CARDIO_DEBUG is set.

#import <UIKit/UIKit.h>


#if CARDIO_DEBUG
#define CardIOLog(format, args...) NSLog(format, ## args)
#else
Expand Down
2 changes: 1 addition & 1 deletion Classes/CardIORowBasedTableViewSection.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the file "LICENSE.md" for the full license governing this code.
//

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>

@interface CardIORowBasedTableViewSection : NSObject <
UITableViewDataSource,
Expand Down
2 changes: 1 addition & 1 deletion Classes/CardIOSectionBasedTableViewDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the file "LICENSE.md" for the full license governing this code.
//

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>

@interface CardIOSectionBasedTableViewDelegate : NSObject <
UITableViewDelegate,
Expand Down
2 changes: 1 addition & 1 deletion Classes/CardIOShutterView.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the file "LICENSE.md" for the full license governing this code.
//

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>


@interface CardIOShutterView : UIView
Expand Down
2 changes: 1 addition & 1 deletion Classes/CardIOTableViewCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the file "LICENSE.md" for the full license governing this code.
//

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>

// This should really be a category on UITableViewCell, but
// categories don't play nicely with static libraries (requires
Expand Down
2 changes: 1 addition & 1 deletion Classes/CardIOVideoFrame.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#if USE_CAMERA || SIMULATE_CAMERA

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <CoreMedia/CoreMedia.h>
#import "dmz.h"
#import "CardIODetectionMode.h"
Expand Down
2 changes: 2 additions & 0 deletions Classes/CardIOVideoStreamDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// See the file "LICENSE.md" for the full license governing this code.
//

#import <UIKit/UIKit.h>

@class CardIOVideoFrame;
@class CardIOVideoStream;

Expand Down
2 changes: 1 addition & 1 deletion dmz
Submodule dmz updated from 8ae4ba to 53ba4c
160 changes: 0 additions & 160 deletions opencv_device/doc/build_framework_2012_09_17.py

This file was deleted.

Loading