Skip to content
Browse files

Version 2.5.4

  • Loading branch information...
1 parent 3bd2396 commit a201ec724fb6750322e71c1841128110e3d63d4c @vfr vfr committed
Showing with 952 additions and 405 deletions.
  1. +18 −7 Classes/ReaderAppDelegate.h
  2. +18 −7 Classes/ReaderAppDelegate.m
  3. +18 −7 Classes/ReaderBookDelegate.h
  4. +20 −16 Classes/ReaderBookDelegate.m
  5. +18 −7 Classes/ReaderDemoController.h
  6. +21 −17 Classes/ReaderDemoController.m
  7. +18 −12 LICENSE
  8. +20 −14 README
  9. +1 −1 Reader-Info.plist
  10. +32 −0 Reader-Prefix.pch
  11. +8 −8 Reader.xcodeproj/project.pbxproj
  12. +0 −20 Reader_Prefix.pch
  13. BIN Resources/Reader.pdf
  14. BIN Resources/de.lproj/Localizable.strings
  15. BIN Resources/en.lproj/Localizable.strings
  16. +18 −7 Sources/CGPDFDocument.h
  17. +18 −7 Sources/CGPDFDocument.m
  18. +18 −7 Sources/ReaderConstants.h
  19. +19 −8 Sources/ReaderConstants.m
  20. +18 −7 Sources/ReaderContentPage.h
  21. +50 −19 Sources/ReaderContentPage.m
  22. +18 −7 Sources/ReaderContentTile.h
  23. +18 −7 Sources/ReaderContentTile.m
  24. +18 −7 Sources/ReaderContentView.h
  25. +18 −7 Sources/ReaderContentView.m
  26. +20 −7 Sources/ReaderDocument.h
  27. +40 −9 Sources/ReaderDocument.m
  28. +18 −7 Sources/ReaderMainPagebar.h
  29. +18 −7 Sources/ReaderMainPagebar.m
  30. +18 −7 Sources/ReaderMainToolbar.h
  31. +18 −7 Sources/ReaderMainToolbar.m
  32. +18 −7 Sources/ReaderThumbCache.h
  33. +18 −7 Sources/ReaderThumbCache.m
  34. +18 −7 Sources/ReaderThumbFetch.h
  35. +18 −7 Sources/ReaderThumbFetch.m
  36. +18 −7 Sources/ReaderThumbQueue.h
  37. +18 −7 Sources/ReaderThumbQueue.m
  38. +18 −7 Sources/ReaderThumbRender.h
  39. +18 −7 Sources/ReaderThumbRender.m
  40. +18 −7 Sources/ReaderThumbRequest.h
  41. +18 −7 Sources/ReaderThumbRequest.m
  42. +18 −7 Sources/ReaderThumbView.h
  43. +18 −7 Sources/ReaderThumbView.m
  44. +18 −7 Sources/ReaderThumbsView.h
  45. +18 −7 Sources/ReaderThumbsView.m
  46. +18 −7 Sources/ReaderViewController.h
  47. +19 −8 Sources/ReaderViewController.m
  48. +18 −7 Sources/ThumbsMainToolbar.h
  49. +18 −7 Sources/ThumbsMainToolbar.m
  50. +18 −7 Sources/ThumbsViewController.h
  51. +18 −7 Sources/ThumbsViewController.m
  52. +18 −7 Sources/UIXToolbarView.h
  53. +18 −7 Sources/UIXToolbarView.m
  54. +18 −7 main.m
View
25 Classes/ReaderAppDelegate.h
@@ -1,15 +1,26 @@
//
// ReaderAppDelegate.h
-// Reader v2.0.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Classes/ReaderAppDelegate.m
@@ -1,15 +1,26 @@
//
// ReaderAppDelegate.m
-// Reader v2.0.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderAppDelegate.h"
View
25 Classes/ReaderBookDelegate.h
@@ -1,15 +1,26 @@
//
// ReaderBookDelegate.h
-// Reader v2.3.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
36 Classes/ReaderBookDelegate.m
@@ -1,15 +1,26 @@
//
// ReaderBookDelegate.m
-// Reader v2.3.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderBookDelegate.h"
@@ -47,16 +58,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
NSArray *pdfs = [[NSBundle mainBundle] pathsForResourcesOfType:@"pdf" inDirectory:nil];
- NSString *documentName = [[pdfs lastObject] lastPathComponent]; assert(documentName != nil);
-
- ReaderDocument *document = [ReaderDocument unarchiveFromFileName:documentName password:phrase];
+ NSString *filePath = [pdfs lastObject]; assert(filePath != nil); // Path to last PDF file
- if (document == nil) // We need to create a brand new ReaderDocument object the first time we run
- {
- NSString *filePath = [[NSBundle mainBundle] pathForResource:documentName ofType:nil]; // Path
-
- document = [[[ReaderDocument alloc] initWithFilePath:filePath password:phrase] autorelease];
- }
+ ReaderDocument *document = [ReaderDocument withDocumentFilePath:filePath password:phrase];
if (document != nil) // Must have a valid ReaderDocument object in order to proceed
{
View
25 Classes/ReaderDemoController.h
@@ -1,15 +1,26 @@
//
// ReaderDemoController.h
-// Reader v2.0.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
38 Classes/ReaderDemoController.m
@@ -1,15 +1,26 @@
//
// ReaderDemoController.m
-// Reader v2.3.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderDemoController.h"
@@ -215,18 +226,11 @@ - (void)handleSingleTap:(UITapGestureRecognizer *)recognizer
NSArray *pdfs = [[NSBundle mainBundle] pathsForResourcesOfType:@"pdf" inDirectory:nil];
- NSString *documentName = [[pdfs lastObject] lastPathComponent]; assert(documentName != nil);
-
- ReaderDocument *document = [ReaderDocument unarchiveFromFileName:documentName password:phrase];
+ NSString *filePath = [pdfs lastObject]; assert(filePath != nil); // Path to last PDF file
- if (document == nil) // We need to create a brand new ReaderDocument object the first time we run
- {
- NSString *filePath = [[NSBundle mainBundle] pathForResource:documentName ofType:nil]; // Path
-
- document = [[[ReaderDocument alloc] initWithFilePath:filePath password:phrase] autorelease];
- }
+ ReaderDocument *document = [ReaderDocument withDocumentFilePath:filePath password:phrase];
- if (document != nil) // Must have a valid ReaderDocument object in order to proceed
+ if (document != nil) // Must have a valid ReaderDocument object in order to proceed with things
{
ReaderViewController *readerViewController = [[ReaderViewController alloc] initWithReaderDocument:document];
View
30 LICENSE
@@ -1,19 +1,25 @@
-Copyright © 2011 Julius Oklamcak. All rights reserved.
+Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
-This work is being made available under a Creative Commons
-Attribution license: http://creativecommons.org/licenses/by/3.0/
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to
+do so, subject to the following conditions:
-You are free to use this work and any derivatives of this work in
-personal and/or commercial products and projects as long as the above
-copyright is maintained and the original author is attributed.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-=-=-=-
iOS, iPad, iPhone, iPod touch are registered trademarks of Apple Inc.
All other trademarks and service marks are the properties of their
respective owners.
-
-The software is provided "as is", without warranty of any kind,
-express or implied, including, but not limited to, the warranties of
-merchantability, fitness for a particular purpose or non-infringement.
-In no event shall the authors be held liable for any claim, damages or
-other liability arising from the use of the software.
View
34 README
@@ -4,7 +4,7 @@ PDF Reader/Viewer V2.5 for iOS
INTRODUCTION
============
-I've written this basic PDF reader/viewer app for fellow iOS
+I've crafted this open source PDF reader/viewer for fellow iOS
developers struggling with wrangling PDF files onto iOS device
screens. Version 2.x is a complete rethink and rewrite of the
original 1.x code. Please see my contact info below if you find
@@ -49,20 +49,19 @@ Supports:
NOTES
=====
-Version 2.x of the PDF reader/viewer code was developed and tested
-under Xcode 3.2.6, LLVM 1.7, iOS 4.3.5, iOS 4.2.1 and tested under
-Xcode 4.2, LLVM 3.0, iOS 5. The code uses manual memory management
-and will continue to do so in the near future.
+Version 2.x of the PDF reader/viewer code was originally developed
+and tested under Xcode 3.2.6, LLVM 1.7, iOS 4.3.5, iOS 4.2.1 with
+current development and testing under Xcode 4.2, LLVM 3.0, iOS 5.
+The code uses manual memory management and will continue to do so.
The overall PDF reader/viewer functionality is encapsulated in the
ReaderViewController class. To present a document with this class,
-you first need to initialize a ReaderDocument object with the file
-path to the PDF document - or unarchive an existing ReaderDocument
-property list - and then initialize a new ReaderViewController with
-this ReaderDocument object. The ReaderViewController class uses the
-ReaderDocument class to store information about the document and to
-keep track of document properties (bookmarks and the current page
-number for example).
+you first need to create a ReaderDocument object with the file path
+to the PDF document and then initialize a new ReaderViewController
+with this ReaderDocument object. The ReaderViewController class uses
+a ReaderDocument object to store information about the document and
+to keep track of document properties (thumb cache directory path,
+bookmarks and the current page number for example).
An initialized ReaderViewController can then be presented
modally, pushed onto a UINavigationController stack, placed in
@@ -71,7 +70,8 @@ Please note that since ReaderViewController implements its own
toolbar, you need to hide the UINavigationController navigation
bar before pushing it and then show the navigation bar after
popping it. The ReaderDemoController class shows how this is
-done with a bundled PDF file.
+done with a bundled PDF file. To create a 'book as an app',
+please see the ReaderBookDelegate class.
Required Files
--------------
@@ -97,6 +97,7 @@ reader/viewer into one of your projects:
ReaderThumbsView.h ReaderThumbsView.m
ThumbsViewController.h ThumbsViewController.m
ThumbsMainToolbar.h ThumbsMainToolbar.m
+ UIXToolbarView.h UIXToolbarView.m
Reader-Email.png Reader-Email@2x.png
Reader-Mark-N.png Reader-Mark-N@2x.png
@@ -192,7 +193,7 @@ HISTORY
2011-09-20: Version 2.4.0
- - Replaced UIToolbars with custom toolbars.
+ - Replaced UIToolbars with custom UIView-based toolbars.
2011-10-05: Version 2.5.0
@@ -210,6 +211,11 @@ HISTORY
- Various refinements and minor bug fixes.
+2012-01-14: Version 2.5.4
+
+ - Bug fix to PDF link handling in older format PDFs.
+ - Changed from CC BY 3.0 License to MIT License.
+
CONTACT INFO
============
View
2 Reader-Info.plist
@@ -25,7 +25,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.3</string>
+ <string>2.5.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIPrerenderedIcon</key>
View
32 Reader-Prefix.pch
@@ -0,0 +1,32 @@
+//
+// Reader-Prefix.pch
+// Reader v2.5.4
+//
+// Created by Julius Oklamcak on 2011-07-01.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#ifdef __OBJC__
+ #import <UIKit/UIKit.h>
+ #import <Foundation/Foundation.h>
+ #import <CoreGraphics/CoreGraphics.h>
+ #import <QuartzCore/QuartzCore.h>
+ #import <ImageIO/ImageIO.h>
+#endif
View
16 Reader.xcodeproj/project.pbxproj
@@ -65,7 +65,7 @@
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
- 32CA4F630368D1EE00C91783 /* Reader_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reader_Prefix.pch; sourceTree = "<group>"; };
+ 32CA4F630368D1EE00C91783 /* Reader-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Reader-Prefix.pch"; sourceTree = "<group>"; };
450A670311D27B9D00014BF5 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
4541A9D5122EA686001A5E60 /* en */ = {isa = PBXFileReference; fileEncoding = 10; indentWidth = 4; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = "<group>"; tabWidth = 4; };
4555C74A14211A00005F448D /* ReaderBookDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderBookDelegate.h; sourceTree = "<group>"; };
@@ -194,7 +194,7 @@
29B97315FDCFA39411CA2CEA /* Other Sources */ = {
isa = PBXGroup;
children = (
- 32CA4F630368D1EE00C91783 /* Reader_Prefix.pch */,
+ 32CA4F630368D1EE00C91783 /* Reader-Prefix.pch */,
29B97316FDCFA39411CA2CEA /* main.m */,
);
name = "Other Sources";
@@ -228,9 +228,6 @@
450A66D911D27B5800014BF5 /* Graphics */ = {
isa = PBXGroup;
children = (
- 45AB72B9141FBFCA003524C3 /* AppIcon-057.png */,
- 45AB72BA141FBFCA003524C3 /* AppIcon-072.png */,
- 45AB72BB141FBFCA003524C3 /* AppIcon-114.png */,
455C789914268F6A0053D73B /* Reader-Button-H.png */,
455C789A14268F6A0053D73B /* Reader-Button-H@2x.png */,
455C789B14268F6A0053D73B /* Reader-Button-N.png */,
@@ -245,6 +242,9 @@
45AB72C3141FBFCA003524C3 /* Reader-Print@2x.png */,
45AB72C4141FBFCA003524C3 /* Reader-Thumbs.png */,
45AB72C5141FBFCA003524C3 /* Reader-Thumbs@2x.png */,
+ 45AB72BB141FBFCA003524C3 /* AppIcon-114.png */,
+ 45AB72BA141FBFCA003524C3 /* AppIcon-072.png */,
+ 45AB72B9141FBFCA003524C3 /* AppIcon-057.png */,
);
name = Graphics;
sourceTree = "<group>";
@@ -433,7 +433,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = Reader_Prefix.pch;
+ GCC_PREFIX_HEADER = "Reader-Prefix.pch";
INFOPLIST_FILE = "Reader-Info.plist";
PRODUCT_NAME = Reader;
};
@@ -445,7 +445,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = Reader_Prefix.pch;
+ GCC_PREFIX_HEADER = "Reader-Prefix.pch";
INFOPLIST_FILE = "Reader-Info.plist";
PRODUCT_NAME = Reader;
VALIDATE_PRODUCT = YES;
@@ -476,7 +476,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = Reader_Prefix.pch;
+ GCC_PREFIX_HEADER = "Reader-Prefix.pch";
INFOPLIST_FILE = "Reader-Info.plist";
PRODUCT_NAME = Reader;
};
View
20 Reader_Prefix.pch
@@ -1,20 +0,0 @@
-//
-// Reader_Prefix.pch
-// Reader
-//
-// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
-//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
-//
-
-#ifdef __OBJC__
- #import <Foundation/Foundation.h>
- #import <CoreGraphics/CoreGraphics.h>
- #import <QuartzCore/QuartzCore.h>
- #import <UIKit/UIKit.h>
-#endif
View
BIN Resources/Reader.pdf
Binary file not shown.
View
BIN Resources/de.lproj/Localizable.strings
Binary file not shown.
View
BIN Resources/en.lproj/Localizable.strings
Binary file not shown.
View
25 Sources/CGPDFDocument.h
@@ -1,15 +1,26 @@
//
// CGPDFDocument.h
-// Reader v2.1.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <Foundation/Foundation.h>
View
25 Sources/CGPDFDocument.m
@@ -1,15 +1,26 @@
//
// CGPDFDocument.m
-// Reader v2.1.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "CGPDFDocument.h"
View
25 Sources/ReaderConstants.h
@@ -1,15 +1,26 @@
//
// ReaderConstants.h
-// Reader v2.3.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <Foundation/Foundation.h>
View
27 Sources/ReaderConstants.m
@@ -1,17 +1,28 @@
//
// ReaderConstants.m
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderConstants.h"
-NSString *const kReaderCopyrightNotice = @"Reader v2.5 • Copyright © 2011 Julius Oklamcak. All rights reserved.";
+NSString *const kReaderCopyrightNotice = @"Reader v2.5.x • Copyright © 2011-2012 Julius Oklamcak. All rights reserved.";
View
25 Sources/ReaderContentPage.h
@@ -1,15 +1,26 @@
//
// ReaderContentPage.h
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
69 Sources/ReaderContentPage.m
@@ -1,15 +1,26 @@
//
// ReaderContentPage.m
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderContentPage.h"
@@ -164,7 +175,7 @@ - (void)buildAnnotationLinksList
}
}
-- (CGPDFArrayRef)findDestinationWithName:(const char *)destinationName inDestsTree:(CGPDFDictionaryRef)node
+- (CGPDFArrayRef)destinationWithName:(const char *)destinationName inDestsTree:(CGPDFDictionaryRef)node
{
#ifdef DEBUGX
NSLog(@"%s", __FUNCTION__);
@@ -235,11 +246,11 @@ - (CGPDFArrayRef)findDestinationWithName:(const char *)destinationName inDestsTr
{
CGPDFDictionaryRef kidNode = NULL; // Kid node dictionary
- if (CGPDFArrayGetDictionary(kidsArray, index, &kidNode) == true) // Recurse into kid node
+ if (CGPDFArrayGetDictionary(kidsArray, index, &kidNode) == true) // Recurse into node
{
- destinationArray = [self findDestinationWithName:destinationName inDestsTree:kidNode];
+ destinationArray = [self destinationWithName:destinationName inDestsTree:kidNode];
- if (destinationArray != NULL) return destinationArray; // Return the destination array
+ if (destinationArray != NULL) return destinationArray; // Return destination array
}
}
}
@@ -247,7 +258,7 @@ - (CGPDFArrayRef)findDestinationWithName:(const char *)destinationName inDestsTr
return NULL;
}
-- (id)findLinkTarget:(CGPDFDictionaryRef)annotationDictionary
+- (id)annotationLinkTarget:(CGPDFDictionaryRef)annotationDictionary
{
#ifdef DEBUGX
NSLog(@"%s", __FUNCTION__);
@@ -255,9 +266,9 @@ - (id)findLinkTarget:(CGPDFDictionaryRef)annotationDictionary
id linkTarget = nil; // Link target object
- CGPDFArrayRef destArray = NULL; CGPDFStringRef destName = NULL;
+ CGPDFStringRef destName = NULL; const char *destString = NULL;
- CGPDFDictionaryRef actionDictionary = NULL; // Link action dictionary
+ CGPDFDictionaryRef actionDictionary = NULL; CGPDFArrayRef destArray = NULL;
if (CGPDFDictionaryGetDictionary(annotationDictionary, "A", &actionDictionary) == true)
{
@@ -288,11 +299,14 @@ - (id)findLinkTarget:(CGPDFDictionaryRef)annotationDictionary
}
}
}
- else // Handle other link target possibility
+ else // Handle other link target possibilities
{
if (CGPDFDictionaryGetArray(annotationDictionary, "Dest", &destArray) == false)
{
- CGPDFDictionaryGetString(annotationDictionary, "Dest", &destName);
+ if (CGPDFDictionaryGetString(annotationDictionary, "Dest", &destName) == false)
+ {
+ CGPDFDictionaryGetName(annotationDictionary, "Dest", &destString);
+ }
}
}
@@ -310,7 +324,24 @@ - (id)findLinkTarget:(CGPDFDictionaryRef)annotationDictionary
{
const char *destinationName = (const char *)CGPDFStringGetBytePtr(destName); // Name
- destArray = [self findDestinationWithName:destinationName inDestsTree:destsDictionary];
+ destArray = [self destinationWithName:destinationName inDestsTree:destsDictionary];
+ }
+ }
+ }
+
+ if (destString != NULL) // Handle a destination string
+ {
+ CGPDFDictionaryRef catalogDictionary = CGPDFDocumentGetCatalog(_PDFDocRef);
+
+ CGPDFDictionaryRef destsDictionary = NULL; // Document destinations dictionary
+
+ if (CGPDFDictionaryGetDictionary(catalogDictionary, "Dests", &destsDictionary) == true)
+ {
+ CGPDFDictionaryRef targetDictionary = NULL; // Destination target dictionary
+
+ if (CGPDFDictionaryGetDictionary(destsDictionary, destString, &targetDictionary) == true)
+ {
+ CGPDFDictionaryGetArray(targetDictionary, "D", &destArray);
}
}
}
@@ -323,7 +354,7 @@ - (id)findLinkTarget:(CGPDFDictionaryRef)annotationDictionary
if (CGPDFArrayGetDictionary(destArray, 0, &pageDictionaryFromDestArray) == true)
{
- NSInteger pageCount = CGPDFDocumentGetNumberOfPages(_PDFDocRef);
+ NSInteger pageCount = CGPDFDocumentGetNumberOfPages(_PDFDocRef); // Pages
for (NSInteger pageNumber = 1; pageNumber <= pageCount; pageNumber++)
{
@@ -374,7 +405,7 @@ - (id)singleTap:(UITapGestureRecognizer *)recognizer
{
if (CGRectContainsPoint(link.rect, point) == true) // Found it
{
- result = [self findLinkTarget:link.dictionary]; break;
+ result = [self annotationLinkTarget:link.dictionary]; break;
}
}
}
View
25 Sources/ReaderContentTile.h
@@ -1,15 +1,26 @@
//
// ReaderContentTile.h
-// Reader v2.0.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/ReaderContentTile.m
@@ -1,15 +1,26 @@
//
// ReaderContentTile.m
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderContentTile.h"
View
25 Sources/ReaderContentView.h
@@ -1,15 +1,26 @@
//
// ReaderContentView.h
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/ReaderContentView.m
@@ -1,15 +1,26 @@
//
// ReaderContentView.m
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderConstants.h"
View
27 Sources/ReaderDocument.h
@@ -1,15 +1,26 @@
//
// ReaderDocument.h
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <Foundation/Foundation.h>
@@ -50,6 +61,8 @@
@property (nonatomic, retain, readonly) NSString *password;
@property (nonatomic, retain, readonly) NSURL *fileURL;
++ (ReaderDocument *)withDocumentFilePath:(NSString *)filename password:(NSString *)phrase;
+
+ (ReaderDocument *)unarchiveFromFileName:(NSString *)filename password:(NSString *)phrase;
- (id)initWithFilePath:(NSString *)fullFilePath password:(NSString *)phrase;
View
49 Sources/ReaderDocument.m
@@ -1,15 +1,26 @@
//
// ReaderDocument.m
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderDocument.h"
@@ -127,9 +138,11 @@ + (ReaderDocument *)unarchiveFromFileName:(NSString *)filename password:(NSStrin
NSLog(@"%s", __FUNCTION__);
#endif
- ReaderDocument *document = nil;
+ ReaderDocument *document = nil; // ReaderDocument object
- NSString *archiveFilePath = [ReaderDocument archiveFilePath:filename];
+ NSString *withName = [filename lastPathComponent]; // File name only
+
+ NSString *archiveFilePath = [ReaderDocument archiveFilePath:withName];
@try // Unarchive an archived ReaderDocument object from its property list
{
@@ -150,6 +163,24 @@ + (ReaderDocument *)unarchiveFromFileName:(NSString *)filename password:(NSStrin
return document;
}
++ (ReaderDocument *)withDocumentFilePath:(NSString *)filePath password:(NSString *)phrase;
+{
+#ifdef DEBUGX
+ NSLog(@"%s", __FUNCTION__);
+#endif
+
+ ReaderDocument *document = nil; // ReaderDocument object
+
+ document = [ReaderDocument unarchiveFromFileName:filePath password:phrase];
+
+ if (document == nil) // Unarchive failed so we create a new ReaderDocument object
+ {
+ document = [[[ReaderDocument alloc] initWithFilePath:filePath password:phrase] autorelease];
+ }
+
+ return document;
+}
+
+ (BOOL)isPDF:(NSString *)filePath
{
#ifdef DEBUGX
View
25 Sources/ReaderMainPagebar.h
@@ -1,15 +1,26 @@
//
// ReaderMainPagebar.h
-// Reader v2.4.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/ReaderMainPagebar.m
@@ -1,15 +1,26 @@
//
// ReaderMainPagebar.m
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderMainPagebar.h"
View
25 Sources/ReaderMainToolbar.h
@@ -1,15 +1,26 @@
//
// ReaderMainToolbar.h
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/ReaderMainToolbar.m
@@ -1,15 +1,26 @@
//
// ReaderMainToolbar.m
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderConstants.h"
View
25 Sources/ReaderThumbCache.h
@@ -1,15 +1,26 @@
//
// ReaderThumbCache.h
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/ReaderThumbCache.m
@@ -1,15 +1,26 @@
//
// ReaderThumbCache.m
-// Reader v2.5.2
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderThumbCache.h"
View
25 Sources/ReaderThumbFetch.h
@@ -1,15 +1,26 @@
//
// ReaderThumbFetch.h
-// Reader v2.2.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <Foundation/Foundation.h>
View
25 Sources/ReaderThumbFetch.m
@@ -1,15 +1,26 @@
//
// ReaderThumbFetch.m
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderThumbFetch.h"
View
25 Sources/ReaderThumbQueue.h
@@ -1,15 +1,26 @@
//
// ReaderThumbQueue.h
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <Foundation/Foundation.h>
View
25 Sources/ReaderThumbQueue.m
@@ -1,15 +1,26 @@
//
// ReaderThumbQueue.m
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderThumbQueue.h"
View
25 Sources/ReaderThumbRender.h
@@ -1,15 +1,26 @@
//
// ReaderThumbRender.h
-// Reader v2.2.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <Foundation/Foundation.h>
View
25 Sources/ReaderThumbRender.m
@@ -1,15 +1,26 @@
//
// ReaderThumbRender.m
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderThumbRender.h"
View
25 Sources/ReaderThumbRequest.h
@@ -1,15 +1,26 @@
//
// ReaderThumbRequest.h
-// Reader v2.3.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/ReaderThumbRequest.m
@@ -1,15 +1,26 @@
//
// ReaderThumbRequest.m
-// Reader v2.5.2
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderThumbRequest.h"
View
25 Sources/ReaderThumbView.h
@@ -1,15 +1,26 @@
//
// ReaderThumbView.h
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/ReaderThumbView.m
@@ -1,15 +1,26 @@
//
// ReaderThumbView.m
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderThumbView.h"
View
25 Sources/ReaderThumbsView.h
@@ -1,15 +1,26 @@
//
// ReaderThumbsView.h
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/ReaderThumbsView.m
@@ -1,15 +1,26 @@
//
// ReaderThumbsView.m
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderThumbsView.h"
View
25 Sources/ReaderViewController.h
@@ -1,15 +1,26 @@
//
// ReaderViewController.h
-// Reader v2.5.1
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
27 Sources/ReaderViewController.m
@@ -1,15 +1,26 @@
//
// ReaderViewController.m
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-07-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderConstants.h"
@@ -278,7 +289,7 @@ - (id)initWithReaderDocument:(ReaderDocument *)object
[object updateProperties]; document = [object retain]; // Retain the supplied ReaderDocument object for our use
- [ReaderThumbCache touchThumbCacheWithGUID:object.guid]; // Touch the document thumb cache
+ [ReaderThumbCache touchThumbCacheWithGUID:object.guid]; // Touch the document thumb cache directory
reader = self; // Return an initialized ReaderViewController object
}
View
25 Sources/ThumbsMainToolbar.h
@@ -1,15 +1,26 @@
//
// ThumbsMainToolbar.h
-// Reader v2.5.0
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/ThumbsMainToolbar.m
@@ -1,15 +1,26 @@
//
// ThumbsMainToolbar.m
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderConstants.h"
View
25 Sources/ThumbsViewController.h
@@ -1,15 +1,26 @@
//
// ThumbsViewController.h
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/ThumbsViewController.m
@@ -1,15 +1,26 @@
//
// ThumbsViewController.m
-// Reader v2.5.3
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import "ReaderConstants.h"
View
25 Sources/UIXToolbarView.h
@@ -1,15 +1,26 @@
//
// UIXToolbarView.h
-// UIClass
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and
-// the original author is attributed.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to
+// do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#import <UIKit/UIKit.h>
View
25 Sources/UIXToolbarView.m
@@ -1,15 +1,26 @@
//
// UIXToolbarView.m
-// UIClass
+// Reader v2.5.4
//
// Created by Julius Oklamcak on 2011-09-01.
-// Copyright © 2011 Julius Oklamcak. All rights reserved.
+// Copyright © 2011-2012 Julius Oklamcak. All rights reserved.
//
-// This work is being made available under a Creative Commons Attribution license:
-// «http://creativecommons.org/licenses/by/3.0/»
-// You are free to use this work and any derivatives of this work in personal and/or
-// commercial products and projects as long as the above copyright is maintained and