Skip to content

Commit a60b781

Browse files
authored
Merge pull request #429 from TheLevelUp/pods
Fix for CocoaPods
2 parents a1ade1c + 1777186 commit a60b781

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

ZXingObjC.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'ZXingObjC'
3-
s.version = '3.2.2'
3+
s.version = '3.4.0'
44
s.summary = 'An Objective-C Port of the ZXing barcode framework.'
55
s.homepage = 'https://github.com/TheLevelUp/ZXingObjC'
66
s.author = 'ZXingObjC team'

ZXingObjC.xcodeproj/project.pbxproj

+6
Original file line numberDiff line numberDiff line change
@@ -6735,6 +6735,8 @@
67356735
COPY_PHASE_STRIP = YES;
67366736
ENABLE_BITCODE = NO;
67376737
ENABLE_STRICT_OBJC_MSGSEND = YES;
6738+
EXPANDED_CODE_SIGN_IDENTITY = "-";
6739+
EXPANDED_CODE_SIGN_IDENTITY_NAME = "-";
67386740
FRAMEWORK_VERSION = 3.4.0;
67396741
GCC_C_LANGUAGE_STANDARD = gnu99;
67406742
GCC_NO_COMMON_BLOCKS = YES;
@@ -6867,6 +6869,8 @@
68676869
ENABLE_BITCODE = NO;
68686870
ENABLE_STRICT_OBJC_MSGSEND = YES;
68696871
ENABLE_TESTABILITY = YES;
6872+
EXPANDED_CODE_SIGN_IDENTITY = "-";
6873+
EXPANDED_CODE_SIGN_IDENTITY_NAME = "-";
68706874
FRAMEWORK_VERSION = 3.4.0;
68716875
GCC_C_LANGUAGE_STANDARD = gnu99;
68726876
GCC_DYNAMIC_NO_PIC = NO;
@@ -6918,6 +6922,8 @@
69186922
COPY_PHASE_STRIP = YES;
69196923
ENABLE_BITCODE = NO;
69206924
ENABLE_STRICT_OBJC_MSGSEND = YES;
6925+
EXPANDED_CODE_SIGN_IDENTITY = "-";
6926+
EXPANDED_CODE_SIGN_IDENTITY_NAME = "-";
69216927
FRAMEWORK_VERSION = 3.4.0;
69226928
GCC_C_LANGUAGE_STANDARD = gnu99;
69236929
GCC_NO_COMMON_BLOCKS = YES;

ZXingObjC/datamatrix/ZXDataMatrixWriter.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ - (ZXBitMatrix *)encodeLowLevel:(ZXDataMatrixDefaultPlacement *)placement symbol
140140
/**
141141
* Convert the ZXByteMatrix to ZXBitMatrix.
142142
*
143-
* @param reqHeight The requested height of the image (in pixels) with the Datamatrix code
144-
* @param reqWidth The requested width of the image (in pixels) with the Datamatrix code
145-
* @param input The input matrix.
143+
* @param matrix The input matrix.
144+
* @param width The requested width of the image (in pixels) with the Datamatrix code
145+
* @param height The requested height of the image (in pixels) with the Datamatrix code
146146
* @return The output matrix.
147147
*/
148148
- (ZXBitMatrix *)convertByteMatrixToBitMatrix:(ZXByteMatrix *)matrix width:(int)width height:(int)height {

ZXingObjC/pdf417/ZXPDF417ResultMetadata.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
@property (nonatomic, copy) NSString *sender;
2424
@property (nonatomic, copy) NSString *addressee;
2525
@property (nonatomic, copy) NSString *fileName;
26-
@property (nonatomic, assign) long fileSize;
27-
@property (nonatomic, assign) long timestamp;
26+
@property (nonatomic, assign) long long fileSize;
27+
@property (nonatomic, assign) long long timestamp;
2828
@property (nonatomic, assign) int checksum;
2929
@property (nonatomic, strong) NSArray *optionalData;
3030

ZXingObjC/qrcode/detector/ZXQRCodeFinderPatternFinder.m

-3
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,6 @@ + (BOOL)foundPatternDiagonal:(const int[])stateCount {
218218
*
219219
* @param centerI row where a finder pattern was detected
220220
* @param centerJ center of the section that appears to cross a finder pattern
221-
* @param maxCount maximum reasonable number of modules that should be
222-
* observed in any reading state, based on the results of the horizontal scan
223-
* @param originalStateCountTotal The original state count total.
224221
* @return true if proportions are withing expected limits
225222
*/
226223
- (BOOL)crossCheckDiagonal:(int)centerI centerJ:(int)centerJ {

0 commit comments

Comments
 (0)