diff --git a/Xcode/PDFImage.xcodeproj/project.pbxproj b/Xcode/PDFImage.xcodeproj/project.pbxproj index 7b0ed2a..9a8002e 100644 --- a/Xcode/PDFImage.xcodeproj/project.pbxproj +++ b/Xcode/PDFImage.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - C32452D818769D4000FBCF88 /* PDFImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C32452D718769D4000FBCF88 /* PDFImage.framework */; }; C32452DC18769F2E00FBCF88 /* PDFAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C32452DB18769F2E00FBCF88 /* PDFAppDelegate.m */; }; C32452ED1876A29900FBCF88 /* PDFNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = C32452EA1876A29900FBCF88 /* PDFNavigationController.m */; }; C32452EE1876A29900FBCF88 /* PDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C32452EC1876A29900FBCF88 /* PDFViewController.m */; }; @@ -27,67 +26,84 @@ C32453101876A63100FBCF88 /* 10.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453051876A63100FBCF88 /* 10.pdf */; }; C32453121876A63600FBCF88 /* 11.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453111876A63600FBCF88 /* 11.pdf */; }; C32453151876A9E200FBCF88 /* PDFAnimationDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C32453141876A9E200FBCF88 /* PDFAnimationDemoViewController.m */; }; - C32453161876CCE400FBCF88 /* 11.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453111876A63600FBCF88 /* 11.pdf */; }; - C32453171876CDA000FBCF88 /* 0.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32452FB1876A63100FBCF88 /* 0.pdf */; }; - C32453181876CF8F00FBCF88 /* 1.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32452FC1876A63100FBCF88 /* 1.pdf */; }; - C32453191876CF8F00FBCF88 /* 2.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32452FD1876A63100FBCF88 /* 2.pdf */; }; - C324531A1876CF8F00FBCF88 /* 3.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32452FE1876A63100FBCF88 /* 3.pdf */; }; - C324531B1876CF8F00FBCF88 /* 4.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32452FF1876A63100FBCF88 /* 4.pdf */; }; - C324531C1876CF8F00FBCF88 /* 5.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453001876A63100FBCF88 /* 5.pdf */; }; - C324531D1876CF8F00FBCF88 /* 6.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453011876A63100FBCF88 /* 6.pdf */; }; - C324531E1876CF8F00FBCF88 /* 7.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453021876A63100FBCF88 /* 7.pdf */; }; - C324531F1876CF8F00FBCF88 /* 8.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453031876A63100FBCF88 /* 8.pdf */; }; - C32453201876CF8F00FBCF88 /* 9.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453041876A63100FBCF88 /* 9.pdf */; }; - C32453211876CF8F00FBCF88 /* 10.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453051876A63100FBCF88 /* 10.pdf */; }; - C32453221876D4FF00FBCF88 /* PDFImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C32452D718769D4000FBCF88 /* PDFImage.framework */; }; + C340C0E919C07FB000431A7D /* PDFImageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C340C0E819C07FB000431A7D /* PDFImageTests.m */; }; + C340C10319C0805800431A7D /* PDFBarButtonItem.h in Headers */ = {isa = PBXBuildFile; fileRef = C340C0F919C0805800431A7D /* PDFBarButtonItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C340C10419C0805800431A7D /* PDFBarButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = C340C0FA19C0805800431A7D /* PDFBarButtonItem.m */; }; + C340C10519C0805800431A7D /* PDFImage.h in Headers */ = {isa = PBXBuildFile; fileRef = C340C0FB19C0805800431A7D /* PDFImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C340C10619C0805800431A7D /* PDFImage.m in Sources */ = {isa = PBXBuildFile; fileRef = C340C0FC19C0805800431A7D /* PDFImage.m */; }; + C340C10719C0805800431A7D /* PDFImageOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = C340C0FD19C0805800431A7D /* PDFImageOptions.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C340C10819C0805800431A7D /* PDFImageOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = C340C0FE19C0805800431A7D /* PDFImageOptions.m */; }; + C340C10919C0805800431A7D /* PDFImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = C340C0FF19C0805800431A7D /* PDFImageView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C340C10A19C0805800431A7D /* PDFImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = C340C10019C0805800431A7D /* PDFImageView.m */; }; + C340C10B19C0805800431A7D /* PDFImageViewLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = C340C10119C0805800431A7D /* PDFImageViewLayer.h */; }; + C340C10C19C0805800431A7D /* PDFImageViewLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = C340C10219C0805800431A7D /* PDFImageViewLayer.m */; }; + C340C10D19C082AC00431A7D /* 0.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32452FB1876A63100FBCF88 /* 0.pdf */; }; + C340C10E19C082B300431A7D /* 1.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32452FC1876A63100FBCF88 /* 1.pdf */; }; + C340C10F19C082B300431A7D /* 2.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32452FD1876A63100FBCF88 /* 2.pdf */; }; + C340C11019C082B300431A7D /* 3.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32452FE1876A63100FBCF88 /* 3.pdf */; }; + C340C11119C082B300431A7D /* 4.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32452FF1876A63100FBCF88 /* 4.pdf */; }; + C340C11219C082B300431A7D /* 5.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453001876A63100FBCF88 /* 5.pdf */; }; + C340C11319C082B300431A7D /* 6.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453011876A63100FBCF88 /* 6.pdf */; }; + C340C11419C082B300431A7D /* 7.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453021876A63100FBCF88 /* 7.pdf */; }; + C340C11519C082B300431A7D /* 8.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453031876A63100FBCF88 /* 8.pdf */; }; + C340C11619C082B300431A7D /* 9.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453041876A63100FBCF88 /* 9.pdf */; }; + C340C11719C082B300431A7D /* 10.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453051876A63100FBCF88 /* 10.pdf */; }; + C340C11819C082B300431A7D /* 11.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C32453111876A63600FBCF88 /* 11.pdf */; }; + C340C11919C082C000431A7D /* extension1.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3261876FE3A007A9620 /* extension1.pdf */; }; + C340C11A19C082C200431A7D /* extension2.PDF in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3271876FE3A007A9620 /* extension2.PDF */; }; + C340C11B19C082C300431A7D /* extension3.PdF in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3281876FE3A007A9620 /* extension3.PdF */; }; + C340C11C19C082C600431A7D /* tint.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB330187700CD007A9620 /* tint.pdf */; }; + C340C11D19C082C900431A7D /* locale.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3191876F7ED007A9620 /* locale.pdf */; }; + C340C15119C0896900431A7D /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C340C15019C0896900431A7D /* LaunchScreen.xib */; }; + C340C18419C0940C00431A7D /* PDFImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C340C0D819C07FB000431A7D /* PDFImage.framework */; }; C343B02E1893BB1B0048FE48 /* PDFBarButtonDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C343B02D1893BB1B0048FE48 /* PDFBarButtonDemoViewController.m */; }; - C343B0321893F7230048FE48 /* PDFBarButtonItem.h in Headers */ = {isa = PBXBuildFile; fileRef = C343B0301893F7230048FE48 /* PDFBarButtonItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C343B0331893F7230048FE48 /* PDFBarButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = C343B0311893F7230048FE48 /* PDFBarButtonItem.m */; }; - C3995280187694E100221C8A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C399527F187694E100221C8A /* Foundation.framework */; }; - C3995286187694E100221C8A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C3995284187694E100221C8A /* InfoPlist.strings */; }; - C39952A2187695CD00221C8A /* PDFImageViewLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = C399529A187695CD00221C8A /* PDFImageViewLayer.m */; }; - C39952A3187695CD00221C8A /* PDFImage.m in Sources */ = {isa = PBXBuildFile; fileRef = C399529B187695CD00221C8A /* PDFImage.m */; }; - C39952A4187695CD00221C8A /* PDFImageOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = C399529C187695CD00221C8A /* PDFImageOptions.m */; }; - C39952A5187695CD00221C8A /* PDFImageOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = C399529D187695CD00221C8A /* PDFImageOptions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C39952A6187695CD00221C8A /* PDFImageViewLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = C399529E187695CD00221C8A /* PDFImageViewLayer.h */; }; - C39952A7187695CD00221C8A /* PDFImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = C399529F187695CD00221C8A /* PDFImageView.m */; }; - C39952A8187695CD00221C8A /* PDFImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = C39952A0187695CD00221C8A /* PDFImageView.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C39952A9187695CD00221C8A /* PDFImage.h in Headers */ = {isa = PBXBuildFile; fileRef = C39952A1187695CD00221C8A /* PDFImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; C3AED87C18769B430035F18E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C399527F187694E100221C8A /* Foundation.framework */; }; C3AED87E18769B430035F18E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3AED87D18769B430035F18E /* CoreGraphics.framework */; }; C3AED88018769B430035F18E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3AED87F18769B430035F18E /* UIKit.framework */; }; C3AED88618769B430035F18E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C3AED88418769B430035F18E /* InfoPlist.strings */; }; C3AED88818769B430035F18E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AED88718769B430035F18E /* main.m */; }; C3AED88E18769B430035F18E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3AED88D18769B430035F18E /* Images.xcassets */; }; - C3AED89518769B430035F18E /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3AED89418769B430035F18E /* XCTest.framework */; }; - C3AED89618769B430035F18E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C399527F187694E100221C8A /* Foundation.framework */; }; - C3AED89718769B430035F18E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3AED87F18769B430035F18E /* UIKit.framework */; }; - C3AED89F18769B430035F18E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C3AED89D18769B430035F18E /* InfoPlist.strings */; }; - C3AED8A118769B430035F18E /* PDFImageDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AED8A018769B430035F18E /* PDFImageDemoTests.m */; }; C3CBB31B1876F7ED007A9620 /* locale.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3191876F7ED007A9620 /* locale.pdf */; }; C3CBB31F1876F822007A9620 /* PDFLocalizedDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3CBB31E1876F822007A9620 /* PDFLocalizedDemoViewController.m */; }; C3CBB3291876FE3A007A9620 /* extension1.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3261876FE3A007A9620 /* extension1.pdf */; }; C3CBB32A1876FE3A007A9620 /* extension2.PDF in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3271876FE3A007A9620 /* extension2.PDF */; }; C3CBB32B1876FE3A007A9620 /* extension3.PdF in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3281876FE3A007A9620 /* extension3.PdF */; }; - C3CBB32C1876FE4A007A9620 /* locale.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3191876F7ED007A9620 /* locale.pdf */; }; - C3CBB32D1876FE4F007A9620 /* extension1.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3261876FE3A007A9620 /* extension1.pdf */; }; - C3CBB32E1876FE4F007A9620 /* extension2.PDF in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3271876FE3A007A9620 /* extension2.PDF */; }; - C3CBB32F1876FE4F007A9620 /* extension3.PdF in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB3281876FE3A007A9620 /* extension3.PdF */; }; C3CBB331187700CD007A9620 /* tint.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB330187700CD007A9620 /* tint.pdf */; }; - C3CBB332187700CD007A9620 /* tint.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C3CBB330187700CD007A9620 /* tint.pdf */; }; C3CBB3391877011B007A9620 /* PDFTintColorDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3CBB3381877011B007A9620 /* PDFTintColorDemoViewController.m */; }; - C3CBB33A1877011B007A9620 /* PDFTintColorDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3CBB3381877011B007A9620 /* PDFTintColorDemoViewController.m */; }; + C3CF6EC419C0968A007B9E7A /* PDFImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C340C0D819C07FB000431A7D /* PDFImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + C3CF6F0519C099C0007B9E7A /* PDFImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C340C0D819C07FB000431A7D /* PDFImage.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - C32452D518769BDA00FBCF88 /* PBXContainerItemProxy */ = { + C340C0E319C07FB000431A7D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C3995270187694E100221C8A /* Project object */; proxyType = 1; - remoteGlobalIDString = C399527B187694E100221C8A; + remoteGlobalIDString = C3AED87A18769B430035F18E; + remoteInfo = PDFImageDemo; + }; + C340C0EA19C07FB000431A7D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C3995270187694E100221C8A /* Project object */; + proxyType = 1; + remoteGlobalIDString = C340C0D719C07FB000431A7D; remoteInfo = PDFImage; }; - C3AED89818769B430035F18E /* PBXContainerItemProxy */ = { + C340C0EE19C07FB000431A7D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C3995270187694E100221C8A /* Project object */; + proxyType = 1; + remoteGlobalIDString = C340C0D719C07FB000431A7D; + remoteInfo = PDFImage; + }; + C3CF6F0019C09978007B9E7A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C3995270187694E100221C8A /* Project object */; + proxyType = 1; + remoteGlobalIDString = C3AED87A18769B430035F18E; + remoteInfo = PDFImageDemo; + }; + C3CF6F0319C099A9007B9E7A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C3995270187694E100221C8A /* Project object */; proxyType = 1; @@ -96,8 +112,21 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + C340C0F519C07FB000431A7D /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 12; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + C3CF6EC419C0968A007B9E7A /* PDFImage.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - C32452D718769D4000FBCF88 /* PDFImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PDFImage.framework; path = "../../Library/Developer/Xcode/DerivedData/PDFImage-dsswrlcyowqtxbasgqxvmkeoojqz/Build/Products/Debug-iphoneos/PDFImage.framework"; sourceTree = ""; }; C32452DA18769F2E00FBCF88 /* PDFAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFAppDelegate.h; sourceTree = ""; }; C32452DB18769F2E00FBCF88 /* PDFAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFAppDelegate.m; sourceTree = ""; }; C32452E91876A29900FBCF88 /* PDFNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFNavigationController.h; sourceTree = ""; }; @@ -124,37 +153,34 @@ C32453111876A63600FBCF88 /* 11.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 11.pdf; sourceTree = ""; }; C32453131876A9E200FBCF88 /* PDFAnimationDemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFAnimationDemoViewController.h; sourceTree = ""; }; C32453141876A9E200FBCF88 /* PDFAnimationDemoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFAnimationDemoViewController.m; sourceTree = ""; }; + C340C0D819C07FB000431A7D /* PDFImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PDFImage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C340C0DB19C07FB000431A7D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C340C0E219C07FB000431A7D /* PDFImageTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PDFImageTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + C340C0E719C07FB000431A7D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C340C0E819C07FB000431A7D /* PDFImageTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PDFImageTests.m; sourceTree = ""; }; + C340C0F719C0802E00431A7D /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + C340C0F919C0805800431A7D /* PDFBarButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFBarButtonItem.h; sourceTree = ""; }; + C340C0FA19C0805800431A7D /* PDFBarButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFBarButtonItem.m; sourceTree = ""; }; + C340C0FB19C0805800431A7D /* PDFImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFImage.h; sourceTree = ""; }; + C340C0FC19C0805800431A7D /* PDFImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFImage.m; sourceTree = ""; }; + C340C0FD19C0805800431A7D /* PDFImageOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFImageOptions.h; sourceTree = ""; }; + C340C0FE19C0805800431A7D /* PDFImageOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFImageOptions.m; sourceTree = ""; }; + C340C0FF19C0805800431A7D /* PDFImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFImageView.h; sourceTree = ""; }; + C340C10019C0805800431A7D /* PDFImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFImageView.m; sourceTree = ""; }; + C340C10119C0805800431A7D /* PDFImageViewLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFImageViewLayer.h; sourceTree = ""; }; + C340C10219C0805800431A7D /* PDFImageViewLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFImageViewLayer.m; sourceTree = ""; }; + C340C15019C0896900431A7D /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = ""; }; C343B02C1893BB1B0048FE48 /* PDFBarButtonDemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFBarButtonDemoViewController.h; sourceTree = ""; }; C343B02D1893BB1B0048FE48 /* PDFBarButtonDemoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFBarButtonDemoViewController.m; sourceTree = ""; }; - C343B0301893F7230048FE48 /* PDFBarButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFBarButtonItem.h; sourceTree = ""; }; - C343B0311893F7230048FE48 /* PDFBarButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFBarButtonItem.m; sourceTree = ""; }; - C399527C187694E100221C8A /* PDFImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework.static; includeInIndex = 0; path = PDFImage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C399527F187694E100221C8A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - C3995283187694E100221C8A /* PDFImage-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PDFImage-Info.plist"; sourceTree = ""; }; - C3995285187694E100221C8A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - C3995287187694E100221C8A /* PDFImage-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PDFImage-Prefix.pch"; sourceTree = ""; }; - C399529A187695CD00221C8A /* PDFImageViewLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFImageViewLayer.m; sourceTree = ""; }; - C399529B187695CD00221C8A /* PDFImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFImage.m; sourceTree = ""; }; - C399529C187695CD00221C8A /* PDFImageOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFImageOptions.m; sourceTree = ""; }; - C399529D187695CD00221C8A /* PDFImageOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFImageOptions.h; sourceTree = ""; }; - C399529E187695CD00221C8A /* PDFImageViewLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFImageViewLayer.h; sourceTree = ""; }; - C399529F187695CD00221C8A /* PDFImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PDFImageView.m; sourceTree = ""; }; - C39952A0187695CD00221C8A /* PDFImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFImageView.h; sourceTree = ""; }; - C39952A1187695CD00221C8A /* PDFImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFImage.h; sourceTree = ""; }; - C39952AA187695FB00221C8A /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; C3AED87B18769B430035F18E /* PDFImageDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PDFImageDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; C3AED87D18769B430035F18E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; C3AED87F18769B430035F18E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; C3AED88318769B430035F18E /* PDFImageDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PDFImageDemo-Info.plist"; sourceTree = ""; }; C3AED88518769B430035F18E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; C3AED88718769B430035F18E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - C3AED88918769B430035F18E /* PDFImageDemo-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PDFImageDemo-Prefix.pch"; sourceTree = ""; }; C3AED88D18769B430035F18E /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - C3AED89318769B430035F18E /* PDFImageDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PDFImageDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; C3AED89418769B430035F18E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; - C3AED89C18769B430035F18E /* PDFImageDemoTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PDFImageDemoTests-Info.plist"; sourceTree = ""; }; - C3AED89E18769B430035F18E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - C3AED8A018769B430035F18E /* PDFImageDemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PDFImageDemoTests.m; sourceTree = ""; }; C3CBB31A1876F7ED007A9620 /* es */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = es; path = es.lproj/locale.pdf; sourceTree = ""; }; C3CBB31C1876F802007A9620 /* en */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = en; path = en.lproj/locale.pdf; sourceTree = ""; }; C3CBB31D1876F822007A9620 /* PDFLocalizedDemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFLocalizedDemoViewController.h; sourceTree = ""; }; @@ -168,33 +194,29 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - C3995276187694E100221C8A /* Frameworks */ = { + C340C0D419C07FB000431A7D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C3995280187694E100221C8A /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - C3AED87818769B430035F18E /* Frameworks */ = { + C340C0DF19C07FB000431A7D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C3AED87E18769B430035F18E /* CoreGraphics.framework in Frameworks */, - C3AED88018769B430035F18E /* UIKit.framework in Frameworks */, - C3AED87C18769B430035F18E /* Foundation.framework in Frameworks */, - C32452D818769D4000FBCF88 /* PDFImage.framework in Frameworks */, + C3CF6F0519C099C0007B9E7A /* PDFImage.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - C3AED89018769B430035F18E /* Frameworks */ = { + C3AED87818769B430035F18E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C3AED89518769B430035F18E /* XCTest.framework in Frameworks */, - C3AED89718769B430035F18E /* UIKit.framework in Frameworks */, - C3AED89618769B430035F18E /* Foundation.framework in Frameworks */, - C32453221876D4FF00FBCF88 /* PDFImage.framework in Frameworks */, + C3AED87E18769B430035F18E /* CoreGraphics.framework in Frameworks */, + C3AED88018769B430035F18E /* UIKit.framework in Frameworks */, + C3AED87C18769B430035F18E /* Foundation.framework in Frameworks */, + C340C18419C0940C00431A7D /* PDFImage.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -292,12 +314,56 @@ path = PDFs; sourceTree = ""; }; + C340C0D919C07FB000431A7D /* PDFImage */ = { + isa = PBXGroup; + children = ( + C340C0FB19C0805800431A7D /* PDFImage.h */, + C340C0FC19C0805800431A7D /* PDFImage.m */, + C340C0FF19C0805800431A7D /* PDFImageView.h */, + C340C10019C0805800431A7D /* PDFImageView.m */, + C340C0FD19C0805800431A7D /* PDFImageOptions.h */, + C340C0FE19C0805800431A7D /* PDFImageOptions.m */, + C340C0F919C0805800431A7D /* PDFBarButtonItem.h */, + C340C0FA19C0805800431A7D /* PDFBarButtonItem.m */, + C340C10119C0805800431A7D /* PDFImageViewLayer.h */, + C340C10219C0805800431A7D /* PDFImageViewLayer.m */, + C340C0DA19C07FB000431A7D /* Supporting Files */, + ); + path = PDFImage; + sourceTree = ""; + }; + C340C0DA19C07FB000431A7D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + C340C0DB19C07FB000431A7D /* Info.plist */, + C340C0F719C0802E00431A7D /* Release.xcconfig */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + C340C0E519C07FB000431A7D /* PDFImageTests */ = { + isa = PBXGroup; + children = ( + C340C0E819C07FB000431A7D /* PDFImageTests.m */, + C340C0E619C07FB000431A7D /* Supporting Files */, + ); + path = PDFImageTests; + sourceTree = ""; + }; + C340C0E619C07FB000431A7D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + C340C0E719C07FB000431A7D /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; C399526F187694E100221C8A = { isa = PBXGroup; children = ( C3AED88118769B430035F18E /* PDFImageDemo */, - C3AED89A18769B430035F18E /* PDFImageDemoTests */, - C3995281187694E100221C8A /* PDFImage */, + C340C0D919C07FB000431A7D /* PDFImage */, + C340C0E519C07FB000431A7D /* PDFImageTests */, C399527E187694E100221C8A /* Frameworks */, C399527D187694E100221C8A /* Products */, ); @@ -306,9 +372,9 @@ C399527D187694E100221C8A /* Products */ = { isa = PBXGroup; children = ( - C399527C187694E100221C8A /* PDFImage.framework */, C3AED87B18769B430035F18E /* PDFImageDemo.app */, - C3AED89318769B430035F18E /* PDFImageDemoTests.xctest */, + C340C0D819C07FB000431A7D /* PDFImage.framework */, + C340C0E219C07FB000431A7D /* PDFImageTests.xctest */, ); name = Products; sourceTree = ""; @@ -316,7 +382,6 @@ C399527E187694E100221C8A /* Frameworks */ = { isa = PBXGroup; children = ( - C32452D718769D4000FBCF88 /* PDFImage.framework */, C399527F187694E100221C8A /* Foundation.framework */, C3AED87D18769B430035F18E /* CoreGraphics.framework */, C3AED87F18769B430035F18E /* UIKit.framework */, @@ -325,35 +390,6 @@ name = Frameworks; sourceTree = ""; }; - C3995281187694E100221C8A /* PDFImage */ = { - isa = PBXGroup; - children = ( - C39952A1187695CD00221C8A /* PDFImage.h */, - C399529B187695CD00221C8A /* PDFImage.m */, - C39952A0187695CD00221C8A /* PDFImageView.h */, - C399529F187695CD00221C8A /* PDFImageView.m */, - C399529D187695CD00221C8A /* PDFImageOptions.h */, - C399529C187695CD00221C8A /* PDFImageOptions.m */, - C343B0301893F7230048FE48 /* PDFBarButtonItem.h */, - C343B0311893F7230048FE48 /* PDFBarButtonItem.m */, - C399529E187695CD00221C8A /* PDFImageViewLayer.h */, - C399529A187695CD00221C8A /* PDFImageViewLayer.m */, - C3995282187694E100221C8A /* Supporting Files */, - ); - path = PDFImage; - sourceTree = ""; - }; - C3995282187694E100221C8A /* Supporting Files */ = { - isa = PBXGroup; - children = ( - C3995283187694E100221C8A /* PDFImage-Info.plist */, - C3995284187694E100221C8A /* InfoPlist.strings */, - C3995287187694E100221C8A /* PDFImage-Prefix.pch */, - C39952AA187695FB00221C8A /* Release.xcconfig */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; C3AED88118769B430035F18E /* PDFImageDemo */ = { isa = PBXGroup; children = ( @@ -371,25 +407,7 @@ C3AED88318769B430035F18E /* PDFImageDemo-Info.plist */, C3AED88418769B430035F18E /* InfoPlist.strings */, C3AED88718769B430035F18E /* main.m */, - C3AED88918769B430035F18E /* PDFImageDemo-Prefix.pch */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - C3AED89A18769B430035F18E /* PDFImageDemoTests */ = { - isa = PBXGroup; - children = ( - C3AED8A018769B430035F18E /* PDFImageDemoTests.m */, - C3AED89B18769B430035F18E /* Supporting Files */, - ); - path = PDFImageDemoTests; - sourceTree = ""; - }; - C3AED89B18769B430035F18E /* Supporting Files */ = { - isa = PBXGroup; - children = ( - C3AED89C18769B430035F18E /* PDFImageDemoTests-Info.plist */, - C3AED89D18769B430035F18E /* InfoPlist.strings */, + C340C15019C0896900431A7D /* LaunchScreen.xib */, ); name = "Supporting Files"; sourceTree = ""; @@ -397,32 +415,29 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - C3995277187694E100221C8A /* Headers */ = { + C340C0D519C07FB000431A7D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - C39952A6187695CD00221C8A /* PDFImageViewLayer.h in Headers */, - C343B0321893F7230048FE48 /* PDFBarButtonItem.h in Headers */, - C39952A9187695CD00221C8A /* PDFImage.h in Headers */, - C39952A8187695CD00221C8A /* PDFImageView.h in Headers */, - C39952A5187695CD00221C8A /* PDFImageOptions.h in Headers */, + C340C10919C0805800431A7D /* PDFImageView.h in Headers */, + C340C10719C0805800431A7D /* PDFImageOptions.h in Headers */, + C340C10B19C0805800431A7D /* PDFImageViewLayer.h in Headers */, + C340C10319C0805800431A7D /* PDFBarButtonItem.h in Headers */, + C340C10519C0805800431A7D /* PDFImage.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - C399527B187694E100221C8A /* PDFImage */ = { + C340C0D719C07FB000431A7D /* PDFImage */ = { isa = PBXNativeTarget; - buildConfigurationList = C399528A187694E100221C8A /* Build configuration list for PBXNativeTarget "PDFImage" */; + buildConfigurationList = C340C0F419C07FB000431A7D /* Build configuration list for PBXNativeTarget "PDFImage" */; buildPhases = ( - C3995274187694E100221C8A /* ShellScript */, - C3995275187694E100221C8A /* Sources */, - C3995276187694E100221C8A /* Frameworks */, - C3995277187694E100221C8A /* Headers */, - C3995278187694E100221C8A /* Resources */, - C3995279187694E100221C8A /* ShellScript */, - C399527A187694E100221C8A /* ShellScript */, + C340C0D319C07FB000431A7D /* Sources */, + C340C0D419C07FB000431A7D /* Frameworks */, + C340C0D519C07FB000431A7D /* Headers */, + C340C0D619C07FB000431A7D /* Resources */, ); buildRules = ( ); @@ -430,8 +445,28 @@ ); name = PDFImage; productName = PDFImage; - productReference = C399527C187694E100221C8A /* PDFImage.framework */; - productType = "com.apple.product-type.framework.static"; + productReference = C340C0D819C07FB000431A7D /* PDFImage.framework */; + productType = "com.apple.product-type.framework"; + }; + C340C0E119C07FB000431A7D /* PDFImageTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = C340C0F619C07FB000431A7D /* Build configuration list for PBXNativeTarget "PDFImageTests" */; + buildPhases = ( + C340C0DE19C07FB000431A7D /* Sources */, + C340C0DF19C07FB000431A7D /* Frameworks */, + C340C0E019C07FB000431A7D /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + C340C0E419C07FB000431A7D /* PBXTargetDependency */, + C3CF6F0119C09978007B9E7A /* PBXTargetDependency */, + C3CF6F0419C099A9007B9E7A /* PBXTargetDependency */, + ); + name = PDFImageTests; + productName = PDFImageTests; + productReference = C340C0E219C07FB000431A7D /* PDFImageTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; }; C3AED87A18769B430035F18E /* PDFImageDemo */ = { isa = PBXNativeTarget; @@ -440,35 +475,19 @@ C3AED87718769B430035F18E /* Sources */, C3AED87818769B430035F18E /* Frameworks */, C3AED87918769B430035F18E /* Resources */, + C340C0F519C07FB000431A7D /* Embed Frameworks */, ); buildRules = ( ); dependencies = ( - C32452D618769BDA00FBCF88 /* PBXTargetDependency */, + C340C0EB19C07FB000431A7D /* PBXTargetDependency */, + C340C0EF19C07FB000431A7D /* PBXTargetDependency */, ); name = PDFImageDemo; productName = PDFImageDemo; productReference = C3AED87B18769B430035F18E /* PDFImageDemo.app */; productType = "com.apple.product-type.application"; }; - C3AED89218769B430035F18E /* PDFImageDemoTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = C3AED8A718769B430035F18E /* Build configuration list for PBXNativeTarget "PDFImageDemoTests" */; - buildPhases = ( - C3AED88F18769B430035F18E /* Sources */, - C3AED89018769B430035F18E /* Frameworks */, - C3AED89118769B430035F18E /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - C3AED89918769B430035F18E /* PBXTargetDependency */, - ); - name = PDFImageDemoTests; - productName = PDFImageDemoTests; - productReference = C3AED89318769B430035F18E /* PDFImageDemoTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -479,7 +498,11 @@ LastUpgradeCheck = 0510; ORGANIZATIONNAME = "Tom Parry"; TargetAttributes = { - C3AED89218769B430035F18E = { + C340C0D719C07FB000431A7D = { + CreatedOnToolsVersion = 6.0; + }; + C340C0E119C07FB000431A7D = { + CreatedOnToolsVersion = 6.0; TestTargetID = C3AED87A18769B430035F18E; }; }; @@ -498,18 +521,41 @@ projectRoot = ""; targets = ( C3AED87A18769B430035F18E /* PDFImageDemo */, - C3AED89218769B430035F18E /* PDFImageDemoTests */, - C399527B187694E100221C8A /* PDFImage */, + C340C0D719C07FB000431A7D /* PDFImage */, + C340C0E119C07FB000431A7D /* PDFImageTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - C3995278187694E100221C8A /* Resources */ = { + C340C0D619C07FB000431A7D /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - C3995286187694E100221C8A /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C340C0E019C07FB000431A7D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C340C11719C082B300431A7D /* 10.pdf in Resources */, + C340C11619C082B300431A7D /* 9.pdf in Resources */, + C340C11219C082B300431A7D /* 5.pdf in Resources */, + C340C11119C082B300431A7D /* 4.pdf in Resources */, + C340C11819C082B300431A7D /* 11.pdf in Resources */, + C340C11019C082B300431A7D /* 3.pdf in Resources */, + C340C10F19C082B300431A7D /* 2.pdf in Resources */, + C340C11419C082B300431A7D /* 7.pdf in Resources */, + C340C11319C082B300431A7D /* 6.pdf in Resources */, + C340C11519C082B300431A7D /* 8.pdf in Resources */, + C340C11B19C082C300431A7D /* extension3.PdF in Resources */, + C340C10E19C082B300431A7D /* 1.pdf in Resources */, + C340C11A19C082C200431A7D /* extension2.PDF in Resources */, + C340C11D19C082C900431A7D /* locale.pdf in Resources */, + C340C11919C082C000431A7D /* extension1.pdf in Resources */, + C340C10D19C082AC00431A7D /* 0.pdf in Resources */, + C340C11C19C082C600431A7D /* tint.pdf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -517,6 +563,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + C340C15119C0896900431A7D /* LaunchScreen.xib in Resources */, C32453101876A63100FBCF88 /* 10.pdf in Resources */, C324530E1876A63100FBCF88 /* 8.pdf in Resources */, C32453091876A63100FBCF88 /* 3.pdf in Resources */, @@ -539,85 +586,26 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C3AED89118769B430035F18E /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C32453211876CF8F00FBCF88 /* 10.pdf in Resources */, - C324531F1876CF8F00FBCF88 /* 8.pdf in Resources */, - C324531A1876CF8F00FBCF88 /* 3.pdf in Resources */, - C32453171876CDA000FBCF88 /* 0.pdf in Resources */, - C324531C1876CF8F00FBCF88 /* 5.pdf in Resources */, - C3CBB32E1876FE4F007A9620 /* extension2.PDF in Resources */, - C3CBB32D1876FE4F007A9620 /* extension1.pdf in Resources */, - C324531D1876CF8F00FBCF88 /* 6.pdf in Resources */, - C324531E1876CF8F00FBCF88 /* 7.pdf in Resources */, - C3CBB32F1876FE4F007A9620 /* extension3.PdF in Resources */, - C32453201876CF8F00FBCF88 /* 9.pdf in Resources */, - C3CBB32C1876FE4A007A9620 /* locale.pdf in Resources */, - C32453161876CCE400FBCF88 /* 11.pdf in Resources */, - C32453181876CF8F00FBCF88 /* 1.pdf in Resources */, - C3AED89F18769B430035F18E /* InfoPlist.strings in Resources */, - C324531B1876CF8F00FBCF88 /* 4.pdf in Resources */, - C32453191876CF8F00FBCF88 /* 2.pdf in Resources */, - C3CBB332187700CD007A9620 /* tint.pdf in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - C3995274187694E100221C8A /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "set -e\n\nset +u\nif [[ $UFW_MASTER_SCRIPT_RUNNING ]]\nthen\n # Nothing for the slave script to do\n exit 0\nfi\nset -u\n\nif [[ \"$SDK_NAME\" =~ ([A-Za-z]+) ]]\nthen\n UFW_SDK_PLATFORM=${BASH_REMATCH[1]}\nelse\n echo \"Could not find platform name from SDK_NAME: $SDK_NAME\"\n exit 1\nfi\n\nif [[ \"$SDK_NAME\" =~ ([0-9]+.*$) ]]\nthen\n\tUFW_SDK_VERSION=${BASH_REMATCH[1]}\nelse\n echo \"Could not find sdk version from SDK_NAME: $SDK_NAME\"\n exit 1\nfi\n\nif [[ \"$UFW_SDK_PLATFORM\" = \"iphoneos\" ]]\nthen\n UFW_OTHER_PLATFORM=iphonesimulator\nelse\n UFW_OTHER_PLATFORM=iphoneos\nfi\n\nif [[ \"$BUILT_PRODUCTS_DIR\" =~ (.*)$UFW_SDK_PLATFORM$ ]]\nthen\n UFW_OTHER_BUILT_PRODUCTS_DIR=\"${BASH_REMATCH[1]}${UFW_OTHER_PLATFORM}\"\nelse\n echo \"Could not find $UFW_SDK_PLATFORM in $BUILT_PRODUCTS_DIR\"\n exit 1\nfi\n\nONLY_ACTIVE_PLATFORM=${ONLY_ACTIVE_PLATFORM:-$ONLY_ACTIVE_ARCH}\n\n# Short-circuit if all binaries are up to date\n\nif [[ -f \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" ]] && \\\n [[ -f \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/${EXECUTABLE_PATH}\" ]] && \\\n [[ ! \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" -nt \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/${EXECUTABLE_PATH}\" ]] && \\\n ([[ \"${ONLY_ACTIVE_PLATFORM}\" == \"YES\" ]] || \\\n ([[ -f \"${UFW_OTHER_BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" ]] && \\\n [[ -f \"${UFW_OTHER_BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/${EXECUTABLE_PATH}\" ]] && \\\n [[ ! \"${UFW_OTHER_BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" -nt \"${UFW_OTHER_BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/${EXECUTABLE_PATH}\" ]]\n )\n )\nthen\n exit 0\nfi\n\n\n# Clean other platform if needed\n\nif [[ ! -f \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" ]] && [[ \"${ONLY_ACTIVE_PLATFORM}\" != \"YES\" ]]\nthen\n\techo \"Platform \\\"$UFW_SDK_PLATFORM\\\" was cleaned recently. Cleaning \\\"$UFW_OTHER_PLATFORM\\\" as well\"\n\techo xcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" -configuration \"${CONFIGURATION}\" -sdk ${UFW_OTHER_PLATFORM}${UFW_SDK_VERSION} BUILD_DIR=\"${BUILD_DIR}\" CONFIGURATION_TEMP_DIR=\"${PROJECT_TEMP_DIR}/${CONFIGURATION}-${UFW_OTHER_PLATFORM}\" clean\n\txcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" -configuration \"${CONFIGURATION}\" -sdk ${UFW_OTHER_PLATFORM}${UFW_SDK_VERSION} BUILD_DIR=\"${BUILD_DIR}\" CONFIGURATION_TEMP_DIR=\"${PROJECT_TEMP_DIR}/${CONFIGURATION}-${UFW_OTHER_PLATFORM}\" clean\nfi\n\n\n# Make sure we are building from fresh binaries\n\nrm -rf \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\"\nrm -rf \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework\"\n\nif [[ \"${ONLY_ACTIVE_PLATFORM}\" != \"YES\" ]]\nthen\n rm -rf \"${UFW_OTHER_BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\"\n rm -rf \"${UFW_OTHER_BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework\"\nfi\n"; - }; - C3995279187694E100221C8A /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "HEADERS_ROOT=$SRCROOT/$PRODUCT_NAME\nFRAMEWORK_HEADERS_DIR=\"$BUILT_PRODUCTS_DIR/$WRAPPER_NAME/Versions/$FRAMEWORK_VERSION/Headers\"\n\n## only header files expected at this point\nPUBLIC_HEADERS=$(find $FRAMEWORK_HEADERS_DIR/. -not -type d 2> /dev/null | sed -e \"s@.*/@@g\")\n\nFIND_OPTS=\"\"\nfor PUBLIC_HEADER in $PUBLIC_HEADERS; do\n if [ -n \"$FIND_OPTS\" ]; then\n FIND_OPTS=\"$FIND_OPTS -o\"\n fi\n FIND_OPTS=\"$FIND_OPTS -name '$PUBLIC_HEADER'\"\ndone\n\nif [ -n \"$FIND_OPTS\" ]; then\n for ORIG_HEADER in $(eval \"find $HEADERS_ROOT/. $FIND_OPTS\" 2> /dev/null | sed -e \"s@^$HEADERS_ROOT/./@@g\"); do\n PUBLIC_HEADER=$(basename $ORIG_HEADER)\n RELATIVE_PATH=$(dirname $ORIG_HEADER)\n if [ -e $FRAMEWORK_HEADERS_DIR/$PUBLIC_HEADER ]; then\n mkdir -p \"$FRAMEWORK_HEADERS_DIR/$RELATIVE_PATH\"\n mv \"$FRAMEWORK_HEADERS_DIR/$PUBLIC_HEADER\" \"$FRAMEWORK_HEADERS_DIR/$RELATIVE_PATH/$PUBLIC_HEADER\"\n fi\n done\nfi\n"; - }; - C399527A187694E100221C8A /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; +/* Begin PBXSourcesBuildPhase section */ + C340C0D319C07FB000431A7D /* Sources */ = { + isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - ); - inputPaths = ( - ); - outputPaths = ( + C340C10819C0805800431A7D /* PDFImageOptions.m in Sources */, + C340C10A19C0805800431A7D /* PDFImageView.m in Sources */, + C340C10C19C0805800431A7D /* PDFImageViewLayer.m in Sources */, + C340C10619C0805800431A7D /* PDFImage.m in Sources */, + C340C10419C0805800431A7D /* PDFBarButtonItem.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "set -e\n\nset +u\nif [[ $UFW_MASTER_SCRIPT_RUNNING ]]\nthen\n # Nothing for the slave script to do\n exit 0\nfi\nset -u\nexport UFW_MASTER_SCRIPT_RUNNING=1\n\n\n# Functions\n\n## List files in the specified directory, storing to the specified array.\n#\n# @param $1 The path to list\n# @param $2 The name of the array to fill\n#\n##\nlist_files ()\n{\n filelist=$(ls \"$1\")\n while read line\n do\n eval \"$2[\\${#$2[*]}]=\\\"\\$line\\\"\"\n done <<< \"$filelist\"\n}\n\n\n# Sanity check\n\nif [[ ! -f \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" ]]\nthen\n echo \"Framework target \\\"${TARGET_NAME}\\\" had no source files to build from. Make sure your source files have the correct target membership\"\n exit 1\nfi\n\n\n# Gather information\n\nif [[ \"$SDK_NAME\" =~ ([A-Za-z]+) ]]\nthen\n UFW_SDK_PLATFORM=${BASH_REMATCH[1]}\nelse\n echo \"Could not find platform name from SDK_NAME: $SDK_NAME\"\n exit 1\nfi\n\nif [[ \"$SDK_NAME\" =~ ([0-9]+.*$) ]]\nthen\n UFW_SDK_VERSION=${BASH_REMATCH[1]}\nelse\n echo \"Could not find sdk version from SDK_NAME: $SDK_NAME\"\n exit 1\nfi\n\nif [[ \"$UFW_SDK_PLATFORM\" = \"iphoneos\" ]]\nthen\n UFW_OTHER_PLATFORM=iphonesimulator\nelse\n UFW_OTHER_PLATFORM=iphoneos\nfi\n\nif [[ \"$BUILT_PRODUCTS_DIR\" =~ (.*)$UFW_SDK_PLATFORM$ ]]\nthen\n UFW_OTHER_BUILT_PRODUCTS_DIR=\"${BASH_REMATCH[1]}${UFW_OTHER_PLATFORM}\"\nelse\n echo \"Could not find $UFW_SDK_PLATFORM in $BUILT_PRODUCTS_DIR\"\n exit 1\nfi\n\nONLY_ACTIVE_PLATFORM=${ONLY_ACTIVE_PLATFORM:-$ONLY_ACTIVE_ARCH}\n\n# Short-circuit if all binaries are up to date.\n# We already checked the other platform in the prerun script.\n\nif [[ -f \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" ]] && [[ -f \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/${EXECUTABLE_PATH}\" ]] && [[ ! \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" -nt \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/${EXECUTABLE_PATH}\" ]]\nthen\n exit 0\nfi\n\nif [ \"${ONLY_ACTIVE_PLATFORM}\" == \"YES\" ]\nthen\n echo \"ONLY_ACTIVE_PLATFORM=${ONLY_ACTIVE_PLATFORM}: Skipping other platform build\"\nelse\n # Make sure the other platform gets built\n \n echo \"Build other platform\"\n \n echo xcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" -configuration \"${CONFIGURATION}\" -sdk ${UFW_OTHER_PLATFORM}${UFW_SDK_VERSION} BUILD_DIR=\"${BUILD_DIR}\" CONFIGURATION_TEMP_DIR=\"${PROJECT_TEMP_DIR}/${CONFIGURATION}-${UFW_OTHER_PLATFORM}\" $ACTION\n xcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" -configuration \"${CONFIGURATION}\" -sdk ${UFW_OTHER_PLATFORM}${UFW_SDK_VERSION} BUILD_DIR=\"${BUILD_DIR}\" CONFIGURATION_TEMP_DIR=\"${PROJECT_TEMP_DIR}/${CONFIGURATION}-${UFW_OTHER_PLATFORM}\" $ACTION\n \n \n # Build the fat static library binary\n \n echo \"Create universal static library\"\n \necho \"Xcode version: $XCODE_VERSION_MAJOR\"\n\nif [[ \"$XCODE_VERSION_MAJOR\" == \"0500\" ]]\nthen\n echo \"$DT_TOOLCHAIN_DIR/usr/bin/libtool\" -static \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" \"${UFW_OTHER_BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" -o \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}.temp\"\n \"$DT_TOOLCHAIN_DIR/usr/bin/libtool\" -static \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" \"${UFW_OTHER_BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" -o \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}.temp\"\nelse\n echo \"$PLATFORM_DEVELOPER_BIN_DIR/libtool\" -static \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" \"${UFW_OTHER_BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" -o \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}.temp\"\n \"$PLATFORM_DEVELOPER_BIN_DIR/libtool\" -static \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" \"${UFW_OTHER_BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\" -o \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}.temp\"\nfi \n echo mv \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}.temp\" \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\"\n mv \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}.temp\" \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\"\nfi\n\n# Build embedded framework structure\n\necho \"Build Embedded Framework\"\n\necho rm -rf \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework\"\nrm -rf \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework\"\necho mkdir -p \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/Resources\"\nmkdir -p \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/Resources\"\necho cp -a \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/\"\ncp -a \"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/\"\n\ndeclare -a UFW_FILE_LIST\nlist_files \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\" UFW_FILE_LIST\nfor filename in \"${UFW_FILE_LIST[@]}\"\ndo\n if [[ \"${filename}\" != \"Info.plist\" ]] && [[ ! \"${filename}\" =~ .*\\.lproj$ ]]\n then\n echo ln -sfh \"../${WRAPPER_NAME}/Resources/${filename}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/Resources/${filename}\"\n ln -sfh \"../${WRAPPER_NAME}/Resources/${filename}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.embeddedframework/Resources/${filename}\"\n fi\ndone\n\n\nif [ \"${ONLY_ACTIVE_PLATFORM}\" != \"YES\" ]\nthen\n # Replace other platform's framework with a copy of this one (so that both have the same universal binary)\n \n echo \"Copy from $UFW_SDK_PLATFORM to $UFW_OTHER_PLATFORM\"\n \n echo rm -rf \"${BUILD_DIR}/${CONFIGURATION}-${UFW_OTHER_PLATFORM}\"\n rm -rf \"${BUILD_DIR}/${CONFIGURATION}-${UFW_OTHER_PLATFORM}\"\n echo cp -a \"${BUILD_DIR}/${CONFIGURATION}-${UFW_SDK_PLATFORM}\" \"${BUILD_DIR}/${CONFIGURATION}-${UFW_OTHER_PLATFORM}\"\n cp -a \"${BUILD_DIR}/${CONFIGURATION}-${UFW_SDK_PLATFORM}\" \"${BUILD_DIR}/${CONFIGURATION}-${UFW_OTHER_PLATFORM}\"\nfi\n"; }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - C3995275187694E100221C8A /* Sources */ = { + C340C0DE19C07FB000431A7D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C39952A4187695CD00221C8A /* PDFImageOptions.m in Sources */, - C39952A7187695CD00221C8A /* PDFImageView.m in Sources */, - C343B0331893F7230048FE48 /* PDFBarButtonItem.m in Sources */, - C39952A3187695CD00221C8A /* PDFImage.m in Sources */, - C39952A2187695CD00221C8A /* PDFImageViewLayer.m in Sources */, + C340C0E919C07FB000431A7D /* PDFImageTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -639,39 +627,37 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - C3AED88F18769B430035F18E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C3CBB33A1877011B007A9620 /* PDFTintColorDemoViewController.m in Sources */, - C3AED8A118769B430035F18E /* PDFImageDemoTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - C32452D618769BDA00FBCF88 /* PBXTargetDependency */ = { + C340C0E419C07FB000431A7D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = C3AED87A18769B430035F18E /* PDFImageDemo */; + targetProxy = C340C0E319C07FB000431A7D /* PBXContainerItemProxy */; + }; + C340C0EB19C07FB000431A7D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C399527B187694E100221C8A /* PDFImage */; - targetProxy = C32452D518769BDA00FBCF88 /* PBXContainerItemProxy */; + target = C340C0D719C07FB000431A7D /* PDFImage */; + targetProxy = C340C0EA19C07FB000431A7D /* PBXContainerItemProxy */; }; - C3AED89918769B430035F18E /* PBXTargetDependency */ = { + C340C0EF19C07FB000431A7D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = C340C0D719C07FB000431A7D /* PDFImage */; + targetProxy = C340C0EE19C07FB000431A7D /* PBXContainerItemProxy */; + }; + C3CF6F0119C09978007B9E7A /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = C3AED87A18769B430035F18E /* PDFImageDemo */; - targetProxy = C3AED89818769B430035F18E /* PBXContainerItemProxy */; + targetProxy = C3CF6F0019C09978007B9E7A /* PBXContainerItemProxy */; + }; + C3CF6F0419C099A9007B9E7A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = C3AED87A18769B430035F18E /* PDFImageDemo */; + targetProxy = C3CF6F0319C099A9007B9E7A /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - C3995284187694E100221C8A /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - C3995285187694E100221C8A /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; C3AED88418769B430035F18E /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -680,14 +666,6 @@ name = InfoPlist.strings; sourceTree = ""; }; - C3AED89D18769B430035F18E /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - C3AED89E18769B430035F18E /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; C3CBB3191876F7ED007A9620 /* locale.pdf */ = { isa = PBXVariantGroup; children = ( @@ -700,6 +678,103 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + C340C0F019C07FB000431A7D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CURRENT_PROJECT_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = PDFImage/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = NO; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + C340C0F119C07FB000431A7D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C340C0F719C0802E00431A7D /* Release.xcconfig */; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CURRENT_PROJECT_VERSION = 1; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = PDFImage/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = NO; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + C340C0F219C07FB000431A7D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = PDFImageTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PDFImageDemo.app/PDFImageDemo"; + }; + name = Debug; + }; + C340C0F319C07FB000431A7D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = PDFImageTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PDFImageDemo.app/PDFImageDemo"; + }; + name = Release; + }; C3995288187694E100221C8A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -732,7 +807,6 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 7.0; - ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; name = Debug; @@ -768,56 +842,24 @@ }; name = Release; }; - C399528B187694E100221C8A /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = C39952AA187695FB00221C8A /* Release.xcconfig */; - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PDFImage/PDFImage-Prefix.pch"; - INFOPLIST_FILE = "PDFImage/PDFImage-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - WRAPPER_EXTENSION = framework; - }; - name = Debug; - }; - C399528C187694E100221C8A /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = C39952AA187695FB00221C8A /* Release.xcconfig */; - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PDFImage/PDFImage-Prefix.pch"; - INFOPLIST_FILE = "PDFImage/PDFImage-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - WRAPPER_EXTENSION = framework; - }; - name = Release; - }; C3AED8A218769B430035F18E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "${BUILT_PRODUCTS_DIR}", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PDFImageDemo/PDFImageDemo-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); INFOPLIST_FILE = "PDFImageDemo/PDFImageDemo-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -828,97 +870,55 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "${BUILT_PRODUCTS_DIR}", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PDFImageDemo/PDFImageDemo-Prefix.pch"; INFOPLIST_FILE = "PDFImageDemo/PDFImageDemo-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; name = Release; }; - C3AED8A418769B430035F18E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PDFImageDemo.app/PDFImageDemo"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - "${BUILT_PRODUCTS_DIR}", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PDFImageDemo/PDFImageDemo-Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "PDFImageDemoTests/PDFImageDemoTests-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; - WRAPPER_EXTENSION = xctest; - }; - name = Debug; - }; - C3AED8A518769B430035F18E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PDFImageDemo.app/PDFImageDemo"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - "${BUILT_PRODUCTS_DIR}", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PDFImageDemo/PDFImageDemo-Prefix.pch"; - INFOPLIST_FILE = "PDFImageDemoTests/PDFImageDemoTests-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; - WRAPPER_EXTENSION = xctest; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - C3995273187694E100221C8A /* Build configuration list for PBXProject "PDFImage" */ = { + C340C0F419C07FB000431A7D /* Build configuration list for PBXNativeTarget "PDFImage" */ = { isa = XCConfigurationList; buildConfigurations = ( - C3995288187694E100221C8A /* Debug */, - C3995289187694E100221C8A /* Release */, + C340C0F019C07FB000431A7D /* Debug */, + C340C0F119C07FB000431A7D /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C399528A187694E100221C8A /* Build configuration list for PBXNativeTarget "PDFImage" */ = { + C340C0F619C07FB000431A7D /* Build configuration list for PBXNativeTarget "PDFImageTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - C399528B187694E100221C8A /* Debug */, - C399528C187694E100221C8A /* Release */, + C340C0F219C07FB000431A7D /* Debug */, + C340C0F319C07FB000431A7D /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C3AED8A618769B430035F18E /* Build configuration list for PBXNativeTarget "PDFImageDemo" */ = { + C3995273187694E100221C8A /* Build configuration list for PBXProject "PDFImage" */ = { isa = XCConfigurationList; buildConfigurations = ( - C3AED8A218769B430035F18E /* Debug */, - C3AED8A318769B430035F18E /* Release */, + C3995288187694E100221C8A /* Debug */, + C3995289187694E100221C8A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C3AED8A718769B430035F18E /* Build configuration list for PBXNativeTarget "PDFImageDemoTests" */ = { + C3AED8A618769B430035F18E /* Build configuration list for PBXNativeTarget "PDFImageDemo" */ = { isa = XCConfigurationList; buildConfigurations = ( - C3AED8A418769B430035F18E /* Debug */, - C3AED8A518769B430035F18E /* Release */, + C3AED8A218769B430035F18E /* Debug */, + C3AED8A318769B430035F18E /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Xcode/PDFImage/PDFImage-Info.plist b/Xcode/PDFImage/Info.plist similarity index 70% rename from Xcode/PDFImage/PDFImage-Info.plist rename to Xcode/PDFImage/Info.plist index 1e1da80..61a6a69 100644 --- a/Xcode/PDFImage/PDFImage-Info.plist +++ b/Xcode/PDFImage/Info.plist @@ -3,25 +3,23 @@ CFBundleDevelopmentRegion - English + en CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - + $(EXECUTABLE_NAME) CFBundleIdentifier - com.tparry.${PRODUCT_NAME:rfc1034identifier} + com.tparry.PDFImage CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + $(PRODUCT_NAME) CFBundlePackageType FMWK CFBundleShortVersionString - 1.0 + 1.2 CFBundleSignature ???? CFBundleVersion - 1 + $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/Xcode/PDFImage/PDFBarButtonItem.h b/Xcode/PDFImage/PDFBarButtonItem.h index 56ea502..507c735 100644 --- a/Xcode/PDFImage/PDFBarButtonItem.h +++ b/Xcode/PDFImage/PDFBarButtonItem.h @@ -25,12 +25,14 @@ // For more information, please refer to // +#import + @class PDFImage; @interface PDFBarButtonItem : UIBarButtonItem // Scales the image down proportionally to fit into a target size of 28x28 // for best results, the PDFImage should be as close to the target size as possible -- (id) initWithImage:(PDFImage*) image style:(UIBarButtonItemStyle) style target:(id) target action:(SEL) action; +- (instancetype) initWithImage:(PDFImage*) image style:(UIBarButtonItemStyle) style target:(id) target action:(SEL) action; @end diff --git a/Xcode/PDFImage/PDFBarButtonItem.m b/Xcode/PDFImage/PDFBarButtonItem.m index 05a036a..6657b3d 100644 --- a/Xcode/PDFImage/PDFBarButtonItem.m +++ b/Xcode/PDFImage/PDFBarButtonItem.m @@ -37,25 +37,26 @@ @interface PDFBarButtonItem () @property (nonatomic, readonly) PDFImage* originalImage; @property (nonatomic, readonly) CGSize targetSize; -- (void) updateBarButtonImage; - @end @implementation PDFBarButtonItem + (void) initialize { - isiOS7OrGreater = ([UIDevice currentDevice].systemVersion.integerValue >= 7); + if(self == [PDFBarButtonItem class]) + { + isiOS7OrGreater = ([UIDevice currentDevice].systemVersion.integerValue >= 7); + } } #pragma mark - -- (id) initWithImage:(PDFImage*) image style:(UIBarButtonItemStyle) style target:(id) target action:(SEL) action +- (instancetype) initWithImage:(PDFImage*) image style:(UIBarButtonItemStyle) style target:(id) target action:(SEL) action { return [self initWithImage:image style:style target:target action:action targetSize:CGSizeMake(28, 28)]; } -- (id) initWithImage:(PDFImage*) image style:(UIBarButtonItemStyle) style target:(id) target action:(SEL) action targetSize:(CGSize) targetSize +- (instancetype) initWithImage:(PDFImage*) image style:(UIBarButtonItemStyle) style target:(id) target action:(SEL) action targetSize:(CGSize) targetSize { self = [super initWithImage:nil style:style target:target action:action]; diff --git a/Xcode/PDFImage/PDFImage-Prefix.pch b/Xcode/PDFImage/PDFImage-Prefix.pch deleted file mode 100644 index ca6113a..0000000 --- a/Xcode/PDFImage/PDFImage-Prefix.pch +++ /dev/null @@ -1,15 +0,0 @@ -// -// Prefix header -// -// The contents of this file are implicitly included at the beginning of every source file. -// - -#ifdef __OBJC__ - #import -#endif - -#import - -#if !DEBUG -#define NSLog(...) {} -#endif diff --git a/Xcode/PDFImage/PDFImage.h b/Xcode/PDFImage/PDFImage.h index 7d488fd..f97aab8 100644 --- a/Xcode/PDFImage/PDFImage.h +++ b/Xcode/PDFImage/PDFImage.h @@ -45,18 +45,18 @@ @property (nonatomic, readonly) CGSize size; // original page size -+ (PDFImage*) imageNamed:(NSString*) name; // from the main bundle, the .pdf extension can be omitted, ++ (instancetype) imageNamed:(NSString*) name; // from the main bundle, the .pdf extension can be omitted, // this and +imageNamed:inBundle: are the only methods that will NSCache PDFImages, as bundles are read-only -+ (PDFImage*) imageNamed:(NSString*) name inBundle:(NSBundle*) bundle; ++ (instancetype) imageNamed:(NSString*) name inBundle:(NSBundle*) bundle; -+ (PDFImage*) imageWithContentsOfFile:(NSString*) path; -+ (PDFImage*) imageWithData:(NSData*) data; ++ (instancetype) imageWithContentsOfFile:(NSString*) path; ++ (instancetype) imageWithData:(NSData*) data; -- (id) initWithContentsOfFile:(NSString*) path; -- (id) initWithData:(NSData*) data; +- (instancetype) initWithContentsOfFile:(NSString*) path; +- (instancetype) initWithData:(NSData*) data; -- (id) initWithDocument:(CGPDFDocumentRef) document; +- (instancetype) initWithDocument:(CGPDFDocumentRef) document; - (UIImage*) imageWithOptions:(PDFImageOptions*) options; // will NSCache the image if the same options are used again - (void) drawInRect:(CGRect) rect; diff --git a/Xcode/PDFImage/PDFImage.m b/Xcode/PDFImage/PDFImage.m index e210185..8432942 100644 --- a/Xcode/PDFImage/PDFImage.m +++ b/Xcode/PDFImage/PDFImage.m @@ -33,25 +33,23 @@ @interface PDFImage () { - CGPDFDocumentRef document; - CGPDFPageRef page; - - NSCache* imageCache; - dispatch_once_t imageCacheOnceToken; + NSCache* _imageCache; + dispatch_once_t _imageCacheOnceToken; } +@property (nonatomic, readonly) CGPDFDocumentRef document; +@property (nonatomic, readonly) CGPDFPageRef page; + @end @implementation PDFImage -@synthesize size; - -+ (PDFImage*) imageNamed:(NSString*) name ++ (instancetype) imageNamed:(NSString*) name { return [self imageNamed:name inBundle:[NSBundle mainBundle]]; } -+ (PDFImage*) imageNamed:(NSString*) name inBundle:(NSBundle*) bundle ++ (instancetype) imageNamed:(NSString*) name inBundle:(NSBundle*) bundle { // Defaults NSString* pathName = name; @@ -83,7 +81,7 @@ + (PDFImage*) imageNamed:(NSString*) name inBundle:(NSBundle*) bundle return [self imageResource:pathName ofType:pathType inBundle:bundle]; } -+ (PDFImage*) imageResource:(NSString*) name ofType:(NSString*) type inBundle:(NSBundle*) bundle ++ (instancetype) imageResource:(NSString*) name ofType:(NSString*) type inBundle:(NSBundle*) bundle { NSString* filepath = [bundle pathForResource:name ofType:type]; NSString* cacheKey = filepath; @@ -97,9 +95,7 @@ + (PDFImage*) imageResource:(NSString*) name ofType:(NSString*) type inBundle:(N if(result == nil) { - // Done in two parts to keep the type strict... - PDFImage* alloced = [self alloc]; - result = [alloced initWithContentsOfFile:filepath]; + result = [(PDFImage*)[self alloc] initWithContentsOfFile:filepath]; if(result != nil) [sharedPDFImageCache setObject:result forKey:cacheKey]; @@ -108,51 +104,49 @@ + (PDFImage*) imageResource:(NSString*) name ofType:(NSString*) type inBundle:(N return result; } -+ (PDFImage*) imageWithContentsOfFile:(NSString*) path ++ (instancetype) imageWithContentsOfFile:(NSString*) path { - PDFImage* alloced = [self alloc]; - return [alloced initWithContentsOfFile:path]; + return [(PDFImage*)[self alloc] initWithContentsOfFile:path]; } -+ (PDFImage*) imageWithData:(NSData*) data ++ (instancetype) imageWithData:(NSData*) data { - PDFImage* alloced = [self alloc]; - return [alloced initWithData:data]; + return [(PDFImage*)[self alloc] initWithData:data]; } -- (id) initWithContentsOfFile:(NSString*) path +- (instancetype) initWithContentsOfFile:(NSString*) path { NSData* data = [[NSData alloc] initWithContentsOfFile:path]; return [self initWithData:data]; } -- (id) initWithData:(NSData*) data +- (instancetype) initWithData:(NSData*) data { CGDataProviderRef provider = CGDataProviderCreateWithCFData((__bridge CFDataRef)data); - CGPDFDocumentRef _document = CGPDFDocumentCreateWithProvider(provider); + CGPDFDocumentRef document = CGPDFDocumentCreateWithProvider(provider); CGDataProviderRelease(provider); - id result = [self initWithDocument:_document]; + id result = [self initWithDocument:document]; - if(_document != nil) - CGPDFDocumentRelease(_document); + if(document != nil) + CGPDFDocumentRelease(document); return result; } -- (id) initWithDocument:(CGPDFDocumentRef) _document +- (instancetype) initWithDocument:(CGPDFDocumentRef) document { - if(_document == nil) + if(document == nil) return nil; self = [super init]; if(self != nil) { - document = CGPDFDocumentRetain(_document); - page = CGPDFDocumentGetPage(document, 1); + _document = CGPDFDocumentRetain(document); + _page = CGPDFDocumentGetPage(_document, 1); - size = CGPDFPageGetBoxRect(page, kCGPDFMediaBox).size; + _size = CGPDFPageGetBoxRect(_page, kCGPDFMediaBox).size; } return self; @@ -164,7 +158,7 @@ - (id) initWithDocument:(CGPDFDocumentRef) _document - (UIImage*) imageWithOptions:(PDFImageOptions*) options { // Where to draw the image - const CGRect rect = [options contentBoundsForContentSize:size]; + const CGRect rect = [options contentBoundsForContentSize:self.size]; const CGFloat scale = options.scale; UIColor* tintColor = [options.tintColor copy]; @@ -172,11 +166,11 @@ - (UIImage*) imageWithOptions:(PDFImageOptions*) options NSString* cacheKey = [NSString stringWithFormat:@"%@-%0.2f-%@-%@", NSStringFromCGRect(rect), scale, tintColor.description, NSStringFromCGSize(containerSize)]; - dispatch_once(&imageCacheOnceToken, ^{ - imageCache = [[NSCache alloc] init]; + dispatch_once(&_imageCacheOnceToken, ^{ + _imageCache = [[NSCache alloc] init]; }); - UIImage* image = [imageCache objectForKey:cacheKey]; + UIImage* image = [_imageCache objectForKey:cacheKey]; if(image == nil) { @@ -203,7 +197,7 @@ - (UIImage*) imageWithOptions:(PDFImageOptions*) options UIGraphicsEndImageContext(); if(image != nil) - [imageCache setObject:image forKey:cacheKey]; + [_imageCache setObject:image forKey:cacheKey]; } return image; @@ -212,6 +206,7 @@ - (UIImage*) imageWithOptions:(PDFImageOptions*) options - (void) drawInRect:(CGRect) rect { const CGSize drawSize = rect.size; + const CGSize size = self.size; const CGSize sizeRatio = CGSizeMake(size.width / drawSize.width, size.height / drawSize.height); CGContextRef ctx = UIGraphicsGetCurrentContext(); @@ -222,7 +217,7 @@ - (void) drawInRect:(CGRect) rect CGContextScaleCTM(ctx, 1 / sizeRatio.width, 1 / -sizeRatio.height); CGContextTranslateCTM(ctx, rect.origin.x * sizeRatio.width, (-drawSize.height - rect.origin.y) * sizeRatio.height); - CGContextDrawPDFPage(ctx, page); + CGContextDrawPDFPage(ctx, self.page); CGContextRestoreGState(ctx); } @@ -232,10 +227,10 @@ - (void) drawInRect:(CGRect) rect - (void) dealloc { - if(document != nil) + if(_document != nil) { - CGPDFDocumentRelease(document); - document = nil; + CGPDFDocumentRelease(_document); + _document = nil; } } diff --git a/Xcode/PDFImage/PDFImageOptions.h b/Xcode/PDFImage/PDFImageOptions.h index 8c1342f..49e91d9 100644 --- a/Xcode/PDFImage/PDFImageOptions.h +++ b/Xcode/PDFImage/PDFImageOptions.h @@ -25,6 +25,8 @@ // For more information, please refer to // +#import + @interface PDFImageOptions : NSObject @property (nonatomic, assign) CGFloat scale; // screen scale, defaults to 0, the current screen scale @@ -33,7 +35,7 @@ @property (nonatomic, assign) UIViewContentMode contentMode; // defaults to UIViewContentModeScaleToFill // Convience method for simply spitting out a sized version -+ (PDFImageOptions*) optionsWithSize:(CGSize) size; ++ (instancetype) optionsWithSize:(CGSize) size; - (CGRect) contentBoundsForContentSize:(CGSize) contentSize; diff --git a/Xcode/PDFImage/PDFImageOptions.m b/Xcode/PDFImage/PDFImageOptions.m index b72696a..a184b31 100644 --- a/Xcode/PDFImage/PDFImageOptions.m +++ b/Xcode/PDFImage/PDFImageOptions.m @@ -29,12 +29,7 @@ @implementation PDFImageOptions -@synthesize scale; -@synthesize tintColor; -@synthesize size; -@synthesize contentMode; - -+ (PDFImageOptions*) optionsWithSize:(CGSize) size ++ (instancetype) optionsWithSize:(CGSize) size { PDFImageOptions* options = [[self alloc] init]; [options setSize:size]; @@ -43,13 +38,13 @@ + (PDFImageOptions*) optionsWithSize:(CGSize) size #pragma mark - -- (id) init +- (instancetype) init { self = [super init]; if(self != nil) { - contentMode = UIViewContentModeScaleToFill; + _contentMode = UIViewContentModeScaleToFill; } return self; @@ -60,7 +55,8 @@ - (id) init - (CGRect) contentBoundsForContentSize:(CGSize) contentSize { - const CGSize containerSize = size; + const CGSize containerSize = self.size; + const UIViewContentMode contentMode = self.contentMode; CGRect rect = CGRectZero; @@ -154,7 +150,7 @@ - (CGRect) contentBoundsForContentSize:(CGSize) contentSize - (CGSize) wholeProportionalFitForContentSize:(CGSize) contentSize { - const CGSize containerSize = size; + const CGSize containerSize = self.size; if(contentSize.width > containerSize.width || contentSize.height > containerSize.height) { diff --git a/Xcode/PDFImage/PDFImageView.h b/Xcode/PDFImage/PDFImageView.h index 67f04c0..d1100bd 100644 --- a/Xcode/PDFImage/PDFImageView.h +++ b/Xcode/PDFImage/PDFImageView.h @@ -25,6 +25,8 @@ // For more information, please refer to // +#import + @class PDFImage; @interface PDFImageView : UIView diff --git a/Xcode/PDFImage/PDFImageView.m b/Xcode/PDFImage/PDFImageView.m index f02d0e1..8b397ca 100644 --- a/Xcode/PDFImage/PDFImageView.m +++ b/Xcode/PDFImage/PDFImageView.m @@ -32,23 +32,17 @@ #import "PDFImageOptions.h" @interface PDFImageView () -{ - BOOL hasInited; - - PDFImageOptions* options; // Bridged options from our properties - UIImageView* imageView; -} -- (void) initPDFImageView; +// Bridged options from our properties +@property (nonatomic, readonly) PDFImageOptions* options; + +@property (nonatomic, readonly) UIImageView* imageView; @end @implementation PDFImageView -@synthesize image; -@dynamic tintColor; - -- (id) initWithFrame:(CGRect)frame +- (instancetype) initWithFrame:(CGRect)frame { self = [super initWithFrame:frame]; @@ -56,38 +50,17 @@ - (id) initWithFrame:(CGRect)frame { [self setBackgroundColor:[UIColor clearColor]]; - [self initPDFImageView]; - } - - return self; -} - -- (id) initWithCoder:(NSCoder *)aDecoder -{ - self = [super initWithCoder:aDecoder]; - - if(self != nil) - { - [self initPDFImageView]; + _options = [[PDFImageOptions alloc] init]; + [_options setContentMode:self.contentMode]; + + _imageView = [[UIImageView alloc] init]; + [_imageView setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; + [self addSubview:_imageView]; } return self; } -- (void) initPDFImageView -{ - if(hasInited) - return; - hasInited = YES; - - options = [[PDFImageOptions alloc] init]; - [options setContentMode:self.contentMode]; - - imageView = [[UIImageView alloc] init]; - [imageView setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - [self addSubview:imageView]; -} - #pragma mark - #pragma mark Super @@ -96,21 +69,21 @@ - (void) layoutSubviews [super layoutSubviews]; CGRect imageViewFrame = self.bounds; - [imageView setFrame:imageViewFrame]; + [self.imageView setFrame:imageViewFrame]; } - (void) drawRect:(CGRect)rect { [super drawRect:rect]; - [imageView setImage:self.currentUIImage]; + [self.imageView setImage:self.currentUIImage]; } - (void) setContentMode:(UIViewContentMode)contentMode { [super setContentMode:contentMode]; - [options setContentMode:contentMode]; + [self.options setContentMode:contentMode]; [self setNeedsDisplay]; } @@ -121,7 +94,7 @@ - (void) willMoveToWindow:(UIWindow *)newWindow // Set the scale to that of the window's screen // The scale would only change if the image view is added to an external UIScreen - [options setScale:newWindow.screen.scale]; + [self.options setScale:newWindow.screen.scale]; } + (Class) layerClass @@ -132,32 +105,32 @@ + (Class) layerClass #pragma mark - #pragma mark Self -- (void) setImage:(PDFImage *)_image +- (void) setImage:(PDFImage *)image { - image = _image; + _image = image; [self setNeedsDisplay]; } - (UIColor*) tintColor { - return options.tintColor; + return self.options.tintColor; } - (void) setTintColor:(UIColor *)tintColor { - [options setTintColor:tintColor]; + [self.options setTintColor:tintColor]; [self setNeedsDisplay]; } - (UIImage*) currentUIImage { - [options setSize:self.frame.size]; + [self.options setSize:self.frame.size]; - if(!CGSizeEqualToSize(options.size, CGSizeZero)) + if(!CGSizeEqualToSize(self.options.size, CGSizeZero)) { - UIImage* currentUIImage = [image imageWithOptions:options]; + UIImage* currentUIImage = [self.image imageWithOptions:self.options]; return currentUIImage; } diff --git a/Xcode/PDFImage/PDFImageViewLayer.h b/Xcode/PDFImage/PDFImageViewLayer.h index 9a04ba7..3cc1bd0 100644 --- a/Xcode/PDFImage/PDFImageViewLayer.h +++ b/Xcode/PDFImage/PDFImageViewLayer.h @@ -25,6 +25,8 @@ // For more information, please refer to // +#import + // A private class used by PDFImageView, // it's sole purpose is to redraw half way through an animation to keep the animation looking smooth @interface PDFImageViewLayer : CALayer diff --git a/Xcode/PDFImage/PDFImageViewLayer.m b/Xcode/PDFImage/PDFImageViewLayer.m index dd62bcc..90f52f6 100644 --- a/Xcode/PDFImage/PDFImageViewLayer.m +++ b/Xcode/PDFImage/PDFImageViewLayer.m @@ -28,11 +28,8 @@ #import "PDFImageViewLayer.h" @interface PDFImageViewLayer () -{ - CAAnimation* lastSizeAnimation; -} -- (void) delayedSetNeedsDisplay; +@property (nonatomic, strong) CAAnimation* lastSizeAnimation; @end @@ -48,13 +45,13 @@ - (void) setFrame:(CGRect)frame const BOOL newFrameIsBigger = (frame.size.width > currentFrame.size.width || frame.size.height > currentFrame.size.height); - lastSizeAnimation = nil; + [self setLastSizeAnimation:nil]; [super setFrame:frame]; // Delay a redraw for smooth transition when animating size const CGFloat redrawOffset = ((newFrameIsBigger) ? 0 : 0.9); - const NSTimeInterval delay = lastSizeAnimation.duration * redrawOffset + lastSizeAnimation.beginTime; + const NSTimeInterval delay = self.lastSizeAnimation.duration * redrawOffset + self.lastSizeAnimation.beginTime; if(delay > 0) [self performSelector:@selector(delayedSetNeedsDisplay) withObject:nil afterDelay:delay]; @@ -62,7 +59,7 @@ - (void) setFrame:(CGRect)frame [self setNeedsDisplay]; // Clear what we found - lastSizeAnimation = nil; + [self setLastSizeAnimation:nil]; } - (void) addAnimation:(CAAnimation *)anim forKey:(NSString *)key @@ -74,8 +71,9 @@ - (void) addAnimation:(CAAnimation *)anim forKey:(NSString *)key CAPropertyAnimation* propertyAnimation = (id)anim; // If we're animating the size, mark the duration (for use in the setFrame: method) - if([propertyAnimation.keyPath isEqualToString:@"bounds"]) - lastSizeAnimation = anim; + if([propertyAnimation.keyPath isEqualToString:@"bounds"] || // iOS <= 7 animation key + [propertyAnimation.keyPath isEqualToString:@"bounds.size"]) // iOS >= 8 animation key + [self setLastSizeAnimation:anim]; } } diff --git a/Xcode/PDFImage/Release.xcconfig b/Xcode/PDFImage/Release.xcconfig index af760d0..8bc89a8 100644 --- a/Xcode/PDFImage/Release.xcconfig +++ b/Xcode/PDFImage/Release.xcconfig @@ -26,7 +26,6 @@ // SEPARATE_STRIP = YES -STRIP_STYLE = all STRIP_INSTALLED_PRODUCT = YES DEBUG_INFORMATION_FORMAT = stabs DEAD_CODE_STRIPPING = YES @@ -37,4 +36,5 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.0 GCC_THUMB_SUPPORT = NO COMPRESS_PNG_FILES = NO DEPLOYMENT_POSTPROCESSING = NO -ARCHS = $(ARCHS_STANDARD_INCLUDING_64_BIT) +ARCHS = $(ARCHS_STANDARD) armv7s +DEFINES_MODULE = NO diff --git a/Xcode/PDFImage/en.lproj/InfoPlist.strings b/Xcode/PDFImage/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/Xcode/PDFImage/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/Xcode/PDFImageDemo/Classes/Controllers/Abstract/PDFNavigationController.h b/Xcode/PDFImageDemo/Classes/Controllers/Abstract/PDFNavigationController.h index 76ecc84..e62bf01 100644 --- a/Xcode/PDFImageDemo/Classes/Controllers/Abstract/PDFNavigationController.h +++ b/Xcode/PDFImageDemo/Classes/Controllers/Abstract/PDFNavigationController.h @@ -25,6 +25,8 @@ // For more information, please refer to // +#import + @interface PDFNavigationController : UINavigationController @end diff --git a/Xcode/PDFImageDemo/Classes/Controllers/Abstract/PDFViewController.h b/Xcode/PDFImageDemo/Classes/Controllers/Abstract/PDFViewController.h index a249948..920b14c 100644 --- a/Xcode/PDFImageDemo/Classes/Controllers/Abstract/PDFViewController.h +++ b/Xcode/PDFImageDemo/Classes/Controllers/Abstract/PDFViewController.h @@ -25,6 +25,8 @@ // For more information, please refer to // +#import + @interface PDFViewController : UIViewController @property (nonatomic, copy) NSString* info; diff --git a/Xcode/PDFImageDemo/Classes/PDFAppDelegate.h b/Xcode/PDFImageDemo/Classes/PDFAppDelegate.h index 1c0dec5..f41876d 100644 --- a/Xcode/PDFImageDemo/Classes/PDFAppDelegate.h +++ b/Xcode/PDFImageDemo/Classes/PDFAppDelegate.h @@ -25,6 +25,8 @@ // For more information, please refer to // +#import + @interface PDFAppDelegate : UIResponder @property (strong, nonatomic) UIWindow *window; diff --git a/Xcode/PDFImageDemo/Classes/Table Cells/PDFImageViewCell.h b/Xcode/PDFImageDemo/Classes/Table Cells/PDFImageViewCell.h index 5b5ef1f..b78ad49 100644 --- a/Xcode/PDFImageDemo/Classes/Table Cells/PDFImageViewCell.h +++ b/Xcode/PDFImageDemo/Classes/Table Cells/PDFImageViewCell.h @@ -25,6 +25,8 @@ // For more information, please refer to // +#import + @class PDFImageView; @interface PDFImageViewCell : UITableViewCell diff --git a/Xcode/PDFImageDemo/Classes/Table Cells/PDFImageViewCell.m b/Xcode/PDFImageDemo/Classes/Table Cells/PDFImageViewCell.m index b7df0c9..98da894 100644 --- a/Xcode/PDFImageDemo/Classes/Table Cells/PDFImageViewCell.m +++ b/Xcode/PDFImageDemo/Classes/Table Cells/PDFImageViewCell.m @@ -35,7 +35,7 @@ @implementation PDFImageViewCell @synthesize pdfImageViews = _pdfImageViews; -- (id) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +- (instancetype) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; diff --git a/Xcode/PDFImageDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/Xcode/PDFImageDemo/Images.xcassets/AppIcon.appiconset/Contents.json index a396706..33ec0bc 100644 --- a/Xcode/PDFImageDemo/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Xcode/PDFImageDemo/Images.xcassets/AppIcon.appiconset/Contents.json @@ -14,6 +14,11 @@ "idiom" : "iphone", "size" : "60x60", "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" } ], "info" : { diff --git a/Xcode/PDFImageDemo/Images.xcassets/LaunchImage.launchimage/Contents.json b/Xcode/PDFImageDemo/Images.xcassets/LaunchImage.launchimage/Contents.json index c79ebd3..0b4b945 100644 --- a/Xcode/PDFImageDemo/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/Xcode/PDFImageDemo/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -3,15 +3,29 @@ { "orientation" : "portrait", "idiom" : "iphone", - "extent" : "full-screen", "minimum-system-version" : "7.0", + "subtype" : "retina4", "scale" : "2x" }, + { + "idiom" : "iphone", + "scale" : "1x", + "orientation" : "portrait" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "orientation" : "portrait" + }, { "orientation" : "portrait", "idiom" : "iphone", "subtype" : "retina4", - "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", "minimum-system-version" : "7.0", "scale" : "2x" } diff --git a/Xcode/PDFImageDemo/LaunchScreen.xib b/Xcode/PDFImageDemo/LaunchScreen.xib new file mode 100644 index 0000000..51b6ebf --- /dev/null +++ b/Xcode/PDFImageDemo/LaunchScreen.xib @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Xcode/PDFImageDemo/PDFImageDemo-Info.plist b/Xcode/PDFImageDemo/PDFImageDemo-Info.plist index e268007..74bbc29 100644 --- a/Xcode/PDFImageDemo/PDFImageDemo-Info.plist +++ b/Xcode/PDFImageDemo/PDFImageDemo-Info.plist @@ -24,6 +24,8 @@ 1.0 LSRequiresIPhoneOS + UILaunchStoryboardName + LaunchScreen UIRequiredDeviceCapabilities armv7 diff --git a/Xcode/PDFImageDemo/PDFImageDemo-Prefix.pch b/Xcode/PDFImageDemo/PDFImageDemo-Prefix.pch deleted file mode 100644 index ccc4f43..0000000 --- a/Xcode/PDFImageDemo/PDFImageDemo-Prefix.pch +++ /dev/null @@ -1,16 +0,0 @@ -// -// Prefix header -// -// The contents of this file are implicitly included at the beginning of every source file. -// - -#import - -#ifndef __IPHONE_3_0 -#warning "This project uses features only available in iOS SDK 3.0 and later." -#endif - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/Xcode/PDFImageDemo/PDFs/0.pdf b/Xcode/PDFImageDemo/PDFs/0.pdf index fa8f776..9f3d3b7 100644 Binary files a/Xcode/PDFImageDemo/PDFs/0.pdf and b/Xcode/PDFImageDemo/PDFs/0.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/1.pdf b/Xcode/PDFImageDemo/PDFs/1.pdf index 16f43ef..465e834 100644 Binary files a/Xcode/PDFImageDemo/PDFs/1.pdf and b/Xcode/PDFImageDemo/PDFs/1.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/10.pdf b/Xcode/PDFImageDemo/PDFs/10.pdf index 6358b40..d8328cf 100644 Binary files a/Xcode/PDFImageDemo/PDFs/10.pdf and b/Xcode/PDFImageDemo/PDFs/10.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/11.pdf b/Xcode/PDFImageDemo/PDFs/11.pdf index 4ca9085..632362b 100644 Binary files a/Xcode/PDFImageDemo/PDFs/11.pdf and b/Xcode/PDFImageDemo/PDFs/11.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/2.pdf b/Xcode/PDFImageDemo/PDFs/2.pdf index b7b5834..12690ce 100644 Binary files a/Xcode/PDFImageDemo/PDFs/2.pdf and b/Xcode/PDFImageDemo/PDFs/2.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/5.pdf b/Xcode/PDFImageDemo/PDFs/5.pdf index 1f26efa..a262112 100644 Binary files a/Xcode/PDFImageDemo/PDFs/5.pdf and b/Xcode/PDFImageDemo/PDFs/5.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/6.pdf b/Xcode/PDFImageDemo/PDFs/6.pdf index 247544f..9f0d2b3 100644 Binary files a/Xcode/PDFImageDemo/PDFs/6.pdf and b/Xcode/PDFImageDemo/PDFs/6.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/7.pdf b/Xcode/PDFImageDemo/PDFs/7.pdf index 4429fa9..263bf97 100644 Binary files a/Xcode/PDFImageDemo/PDFs/7.pdf and b/Xcode/PDFImageDemo/PDFs/7.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/8.pdf b/Xcode/PDFImageDemo/PDFs/8.pdf index 4deb04d..5bdc575 100644 Binary files a/Xcode/PDFImageDemo/PDFs/8.pdf and b/Xcode/PDFImageDemo/PDFs/8.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/9.pdf b/Xcode/PDFImageDemo/PDFs/9.pdf index b3de71e..a9308cc 100644 Binary files a/Xcode/PDFImageDemo/PDFs/9.pdf and b/Xcode/PDFImageDemo/PDFs/9.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/en.lproj/locale.pdf b/Xcode/PDFImageDemo/PDFs/en.lproj/locale.pdf index 4191444..d7a5d35 100644 Binary files a/Xcode/PDFImageDemo/PDFs/en.lproj/locale.pdf and b/Xcode/PDFImageDemo/PDFs/en.lproj/locale.pdf differ diff --git a/Xcode/PDFImageDemo/PDFs/tint.pdf b/Xcode/PDFImageDemo/PDFs/tint.pdf index 49502e1..77993bf 100644 Binary files a/Xcode/PDFImageDemo/PDFs/tint.pdf and b/Xcode/PDFImageDemo/PDFs/tint.pdf differ diff --git a/Xcode/PDFImageDemoTests/en.lproj/InfoPlist.strings b/Xcode/PDFImageDemoTests/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/Xcode/PDFImageDemoTests/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/Xcode/PDFImageDemoTests/PDFImageDemoTests-Info.plist b/Xcode/PDFImageTests/Info.plist similarity index 78% rename from Xcode/PDFImageDemoTests/PDFImageDemoTests-Info.plist rename to Xcode/PDFImageTests/Info.plist index 7ba71ec..6fdd2a8 100644 --- a/Xcode/PDFImageDemoTests/PDFImageDemoTests-Info.plist +++ b/Xcode/PDFImageTests/Info.plist @@ -5,11 +5,13 @@ CFBundleDevelopmentRegion en CFBundleExecutable - ${EXECUTABLE_NAME} + $(EXECUTABLE_NAME) CFBundleIdentifier - com.tparry.${PRODUCT_NAME:rfc1034identifier} + com.tparry.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 + CFBundleName + $(PRODUCT_NAME) CFBundlePackageType BNDL CFBundleShortVersionString diff --git a/Xcode/PDFImageDemoTests/PDFImageDemoTests.m b/Xcode/PDFImageTests/PDFImageTests.m similarity index 88% rename from Xcode/PDFImageDemoTests/PDFImageDemoTests.m rename to Xcode/PDFImageTests/PDFImageTests.m index 1600474..a6b4d3e 100644 --- a/Xcode/PDFImageDemoTests/PDFImageDemoTests.m +++ b/Xcode/PDFImageTests/PDFImageTests.m @@ -29,35 +29,40 @@ #import -@interface PDFImageDemoTests : XCTestCase -{ - NSBundle* bundle; - UIWindow* keyWindow; -} +@interface PDFImageTests : XCTestCase -- (void) pause:(NSTimeInterval) seconds; +@property (nonatomic, readonly) NSBundle* bundle; +@property (nonatomic, readonly) UIWindow* keyWindow; @end -@implementation PDFImageDemoTests +@implementation PDFImageTests -- (void)setUp +- (instancetype) initWithInvocation:(NSInvocation *)invocation { - [super setUp]; + self = [super initWithInvocation:invocation]; + + if(self != nil) + { + _bundle = [NSBundle bundleForClass:[self class]]; + _keyWindow = [UIApplication sharedApplication].keyWindow; + } - bundle = [NSBundle bundleForClass:[self class]]; - keyWindow = [UIApplication sharedApplication].keyWindow; + return self; } +#pragma mark - +#pragma mark Tests + - (void) testPDFImage { - PDFImage* image = [PDFImage imageNamed:@"0" inBundle:bundle]; + PDFImage* image = [PDFImage imageNamed:@"0" inBundle:self.bundle]; XCTAssertNotNil(image, @"Failed loading pdf image"); XCTAssertEqual(image.size.width, 15.0f, @"Size not as expected"); XCTAssertEqual(image.size.height, 15.0f, @"Size not as expected"); - PDFImage* missing = [PDFImage imageNamed:@"non-existant" inBundle:bundle]; + PDFImage* missing = [PDFImage imageNamed:@"non-existant" inBundle:self.bundle]; XCTAssertNil(missing, @"Should not load missing files"); @@ -70,9 +75,9 @@ - (void) testPDFImage - (void) testPDFImageCache { - PDFImage* same1 = [PDFImage imageNamed:@"5" inBundle:bundle]; - PDFImage* same2 = [PDFImage imageNamed:@"5" inBundle:bundle]; - PDFImage* diff1 = [PDFImage imageNamed:@"6" inBundle:bundle]; + PDFImage* same1 = [PDFImage imageNamed:@"5" inBundle:self.bundle]; + PDFImage* same2 = [PDFImage imageNamed:@"5" inBundle:self.bundle]; + PDFImage* diff1 = [PDFImage imageNamed:@"6" inBundle:self.bundle]; XCTAssertEqual(same1, same2, @"Bundle caching should result in equal pointers"); XCTAssertNotEqual(same1, diff1, @"Different files should result in different pointers"); @@ -80,7 +85,7 @@ - (void) testPDFImageCache - (void) testPDFImageResultCache { - PDFImage* image = [PDFImage imageNamed:@"5" inBundle:bundle]; + PDFImage* image = [PDFImage imageNamed:@"5" inBundle:self.bundle]; PDFImageOptions* options = [PDFImageOptions optionsWithSize:CGSizeMake(40, 40)]; @@ -177,7 +182,7 @@ - (void) testPDFImageWholeProportionalFit - (void) testPDFImageView { - PDFImage* image = [PDFImage imageNamed:@"3" inBundle:bundle]; + PDFImage* image = [PDFImage imageNamed:@"3" inBundle:self.bundle]; PDFImageView* imageView = [[PDFImageView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)]; @@ -185,7 +190,7 @@ - (void) testPDFImageView [imageView setTintColor:[UIColor redColor]]; [imageView setImage:image]; - [keyWindow addSubview:imageView]; + [self.keyWindow addSubview:imageView]; XCTAssertNotNil(imageView.currentUIImage, @"Has PDFImage, current UIImage should not be nil"); XCTAssertTrue(CGSizeEqualToSize(imageView.currentUIImage.size, imageView.frame.size), @"Current UIImage should be same size as PDFImageView"); @@ -205,15 +210,15 @@ - (void) testPDFImageView - (void) testPDFExtensionHandling { - XCTAssertNotNil([PDFImage imageNamed:@"extension1" inBundle:bundle], @"Failed loading pdf image"); - XCTAssertNotNil([PDFImage imageNamed:@"extension1.pdf" inBundle:bundle], @"Failed loading pdf image"); - XCTAssertNotNil([PDFImage imageNamed:@"extension2.PDF" inBundle:bundle], @"Failed loading pdf image"); - XCTAssertNotNil([PDFImage imageNamed:@"extension3.PdF" inBundle:bundle], @"Failed loading pdf image"); + XCTAssertNotNil([PDFImage imageNamed:@"extension1" inBundle:self.bundle], @"Failed loading pdf image"); + XCTAssertNotNil([PDFImage imageNamed:@"extension1.pdf" inBundle:self.bundle], @"Failed loading pdf image"); + XCTAssertNotNil([PDFImage imageNamed:@"extension2.PDF" inBundle:self.bundle], @"Failed loading pdf image"); + XCTAssertNotNil([PDFImage imageNamed:@"extension3.PdF" inBundle:self.bundle], @"Failed loading pdf image"); } - (void) testPDFBarButtonItem { - PDFImage* image = [PDFImage imageNamed:@"3" inBundle:bundle]; + PDFImage* image = [PDFImage imageNamed:@"3" inBundle:self.bundle]; PDFBarButtonItem* item = [[PDFBarButtonItem alloc] initWithImage:image style:UIBarButtonItemStylePlain target:nil action:nil];