Skip to content

Commit 6f84dcf

Browse files
committed
Fix incorrect call in mmm_imageFromPDFNamed:tintColor:
1 parent 30ac40f commit 6f84dcf

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

MMMCommonUI.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Pod::Spec.new do |s|
77

88
s.name = "MMMCommonUI"
9-
s.version = "3.12.1"
9+
s.version = "3.12.2"
1010
s.summary = "Small UI-related pieces reused in many components from MMMTemple"
1111
s.description = "#{s.summary}."
1212
s.homepage = "https://github.com/mediamonks/#{s.name}"

Sources/MMMCommonUI/UIViewController+MMMNavigationStack.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ private class MMMNavigationStackHelper: NSObject, MMMNavigationStackItemDelegate
215215
// The record is already removed as part of the pop request, nothing to do here.
216216
return
217217
} else {
218-
MMMLogError(self, "Trying to remove a record for a \(MMMTypeName(viewController)) while popping a different instance (\(MMMTypeName(recordPoppingNow.viewController)))")
218+
MMMLogError(self, "Trying to remove a record for a \(MMMTypeName(viewController)) while popping a different instance (\(MMMTypeName(recordPoppingNow.viewController as Any)))")
219219
assertionFailure()
220220
// It would be a weird case, but let it continue in production.
221221
}

Sources/MMMCommonUIObjC/MMMCommonUIMisc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ extern NSAttributedStringKey const MMMCaseTransformAttributeName NS_SWIFT_NAME(c
266266
* specified view. It's always greater than or equal to zero.
267267
* It can be used to manually adjust the insets of a scroll view which is covered by the status bar.
268268
*/
269-
extern CGFloat MMMHeightOfAreaCoveredByStatusBar(UIView *view, CGRect rect);
269+
extern CGFloat MMMHeightOfAreaCoveredByStatusBar(UIView *view, CGRect rect) DEPRECATED_ATTRIBUTE;
270270

271271
//
272272
//
@@ -349,7 +349,7 @@ extern CGFloat MMMPhaseForDashedPattern(CGFloat lineLength, CGFloat dashLength,
349349
extern void MMMAddDashedCircle(CGPoint center, CGFloat radius, CGFloat dashLength, CGFloat skipLength);
350350

351351
/** YES, if running under Fastlane's Snapshot tool. */
352-
static inline BOOL MMMIsRunningUnderFastlane() {
352+
static inline BOOL MMMIsRunningUnderFastlane(void) {
353353

354354
#if DEBUG
355355

Sources/MMMCommonUIObjC/MMMCommonUIMisc.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void MMMDrawBorder(CGRect r, UIRectEdge edge, UIColor *color, CGFloat width) {
7373
CGContextStrokePath(c);
7474
}
7575

76-
CGFloat MMMPixelScale() {
76+
CGFloat MMMPixelScale(void) {
7777
static CGFloat scale = 1;
7878
static dispatch_once_t onceToken;
7979
dispatch_once(&onceToken, ^{
@@ -338,7 +338,7 @@ CGFloat MMMHeightOfAreaCoveredByStatusBar(UIView *view, CGRect rect) {
338338
// This is to work around the problem with UI rotations: it is possible that the status bar is still portrait
339339
// while the view is already landscape, and it can also be hidden (zero height);
340340
// in this case the height calculated as below will be large and will cause layout issues.
341-
// Returning 0 now assumming that the view using this function will eventually recalculate the status bar height
341+
// Returning 0 now assuming that the view using this function will eventually recalculate the status bar height
342342
// in response to UIApplicationDidChangeStatusBarFrameNotification.
343343
if (CGRectGetHeight(statusBarRect) <= 0 || CGRectGetHeight(statusBarRect) > CGRectGetWidth(statusBarRect))
344344
return 0;
@@ -465,7 +465,7 @@ + (UIImage *)mmm_imageFromPDFNamed:(NSString *)name rasterizedForHeight:(CGFloat
465465
}
466466

467467
+ (UIImage *)mmm_imageFromPDFNamed:(NSString *)name tintColor:(UIColor *)tintColor {
468-
return [self mmm_cacheKeyForNamed:name height:0 tintColor:tintColor];
468+
return [self mmm_imageFromPDFNamed:name rasterizedForHeight:0 tintColor:tintColor];
469469
}
470470

471471
+ (UIImage *)mmm_imageFromPDFNamed:(NSString *)name rasterizedForHeight:(CGFloat)height {

0 commit comments

Comments
 (0)