Fixes build with Xcode 5.1

Cocoanetics · Mar 12, 2014 · 9851c8a · 9851c8a
1 parent 12bda3c
commit 9851c8a
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 16 deletions.
diff --git a/Core/Source/DTHTMLAttributedStringBuilder.m b/Core/Source/DTHTMLAttributedStringBuilder.m
@@ -361,7 +361,7 @@ - (void)_registerTagStartHandlers
 
 	void (^blockquoteBlock)(void) = ^
 	{
-		_currentTag.paragraphStyle.headIndent += 25.0 * _textScale;
+		_currentTag.paragraphStyle.headIndent += (CGFloat)25.0 * _textScale;
 		_currentTag.paragraphStyle.firstLineHeadIndent = _currentTag.paragraphStyle.headIndent;
 		_currentTag.paragraphStyle.paragraphSpacing = _defaultFontDescriptor.pointSize;
 	};

diff --git a/Core/Source/DTHTMLWriter.m b/Core/Source/DTHTMLWriter.m
@@ -300,15 +300,15 @@ - (void)_buildOutputAsHTMLFragment:(BOOL)fragment
 		{
 			if (_textScale!=1.0f)
 			{
-				paragraphStyle.minimumLineHeight = roundf(paragraphStyle.minimumLineHeight / _textScale);
-				paragraphStyle.maximumLineHeight = roundf(paragraphStyle.maximumLineHeight / _textScale);
+				paragraphStyle.minimumLineHeight = round(paragraphStyle.minimumLineHeight / _textScale);
+				paragraphStyle.maximumLineHeight = round(paragraphStyle.maximumLineHeight / _textScale);
 
-				paragraphStyle.paragraphSpacing = roundf(paragraphStyle.paragraphSpacing/ _textScale);
-				paragraphStyle.paragraphSpacingBefore = roundf(paragraphStyle.paragraphSpacingBefore / _textScale);
+				paragraphStyle.paragraphSpacing = round(paragraphStyle.paragraphSpacing/ _textScale);
+				paragraphStyle.paragraphSpacingBefore = round(paragraphStyle.paragraphSpacingBefore / _textScale);
 
-				paragraphStyle.firstLineHeadIndent = roundf(paragraphStyle.firstLineHeadIndent / _textScale);
-				paragraphStyle.headIndent = roundf(paragraphStyle.headIndent / _textScale);
-				paragraphStyle.tailIndent = roundf(paragraphStyle.tailIndent / _textScale);
+				paragraphStyle.firstLineHeadIndent = round(paragraphStyle.firstLineHeadIndent / _textScale);
+				paragraphStyle.headIndent = round(paragraphStyle.headIndent / _textScale);
+				paragraphStyle.tailIndent = round(paragraphStyle.tailIndent / _textScale);
 			}
 
 			paraStyleString = [paragraphStyle cssStyleRepresentation];

diff --git a/Core/Source/NSAttributedString+SmallCaps.m b/Core/Source/NSAttributedString+SmallCaps.m
@@ -21,7 +21,7 @@ + (NSAttributedString *)synthesizedSmallCapsAttributedStringWithText:(NSString *
 	}
 
 	DTCoreTextFontDescriptor *smallerFontDesc = [fontDescriptor copy];
-	smallerFontDesc.pointSize *= 0.7;
+	smallerFontDesc.pointSize *= (CGFloat)0.7;
 
 	CTFontRef smallerFont = [smallerFontDesc newMatchingFont];
 

diff --git a/DTCoreText.xcodeproj/project.pbxproj b/DTCoreText.xcodeproj/project.pbxproj
@@ -2260,7 +2260,8 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastTestingUpgradeCheck = 0510;
+				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = Drobnik.com;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DTCoreText" */;

diff --git a/DTCoreText.xcodeproj/xcshareddata/xcschemes/DemoApp.xcscheme b/DTCoreText.xcodeproj/xcshareddata/xcschemes/DemoApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DTCoreText.xcodeproj/xcshareddata/xcschemes/Documentation.xcscheme b/DTCoreText.xcodeproj/xcshareddata/xcschemes/Documentation.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DTCoreText.xcodeproj/xcshareddata/xcschemes/Mac Framework.xcscheme b/DTCoreText.xcodeproj/xcshareddata/xcschemes/Mac Framework.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DTCoreText.xcodeproj/xcshareddata/xcschemes/MacUnitTest.xcscheme b/DTCoreText.xcodeproj/xcshareddata/xcschemes/MacUnitTest.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DTCoreText.xcodeproj/xcshareddata/xcschemes/Static Library.xcscheme b/DTCoreText.xcodeproj/xcshareddata/xcschemes/Static Library.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DTCoreText.xcodeproj/xcshareddata/xcschemes/UnitTest.xcscheme b/DTCoreText.xcodeproj/xcshareddata/xcschemes/UnitTest.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"