Ported 8475bf6 from ZXing

Original commit message: "Remove system-dependent line separator logic in BitMatrix"
12207480 · Mar 24, 2015 · 3598649 · 3598649
1 parent 0b9a3c7
commit 3598649
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/ZXingObjC/common/ZXBitMatrix.h b/ZXingObjC/common/ZXBitMatrix.h
@@ -144,7 +144,10 @@
 
 - (NSString *)descriptionWithSetString:(NSString *)setString unsetString:(NSString *)unsetString;
 
+/**
+ * @deprecated call descriptionWithSetString:unsetString: only, which uses \n line separator always
+ */
 - (NSString *)descriptionWithSetString:(NSString *)setString unsetString:(NSString *)unsetString
-                         lineSeparator:(NSString *)lineSeparator;
+                         lineSeparator:(NSString *)lineSeparator DEPRECATED_ATTRIBUTE;
 
 @end
diff --git a/ZXingObjC/common/ZXBitMatrix.m b/ZXingObjC/common/ZXBitMatrix.m
@@ -352,7 +352,10 @@ - (NSString *)description {
 }
 
 - (NSString *)descriptionWithSetString:(NSString *)setString unsetString:(NSString *)unsetString {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   return [self descriptionWithSetString:setString unsetString:unsetString lineSeparator:@"\n"];
+#pragma GCC diagnostic pop
 }
 
 - (NSString *)descriptionWithSetString:(NSString *)setString unsetString:(NSString *)unsetString

diff --git a/ZXingObjCTests/common/ZXBitMatrixTestCase.m b/ZXingObjCTests/common/ZXBitMatrixTestCase.m
@@ -169,7 +169,7 @@ - (void)testParse {
 
   XCTAssertEqualObjects(emptyMatrix24, [ZXBitMatrix parse:@"  \n  \n  \n  \n" setString:@"x" unsetString:@" "]);
 
-  XCTAssertEqualObjects(centerMatrix, [ZXBitMatrix parse:[centerMatrix descriptionWithSetString:@"x" unsetString:@"." lineSeparator:@"\n"] setString:@"x" unsetString:@"."]);
+  XCTAssertEqualObjects(centerMatrix, [ZXBitMatrix parse:[centerMatrix descriptionWithSetString:@"x" unsetString:@"."] setString:@"x" unsetString:@"."]);
 }
 
 - (void)testUnset {