Revision: 7400
http://skim-app.svn.sourceforge.net/skim-app/?rev=7400&view=rev
Author: hofman
Date: 2011-07-27 10:11:16 +0000 (Wed, 27 Jul 2011)
Log Message:
-----------
remove PDFBorder category, as the remaining bug workaround is already in a
linked framework
Modified Paths:
--------------
trunk/Skim.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/PDFBorder_SKExtensions.h
trunk/PDFBorder_SKExtensions.m
Deleted: trunk/PDFBorder_SKExtensions.h
===================================================================
--- trunk/PDFBorder_SKExtensions.h 2011-07-27 10:06:28 UTC (rev 7399)
+++ trunk/PDFBorder_SKExtensions.h 2011-07-27 10:11:16 UTC (rev 7400)
@@ -1,44 +0,0 @@
-//
-// PDFBorder_SKExtensions.h
-// Skim
-//
-// Created by Christiaan Hofman on 4/1/08.
-/*
- This software is Copyright (c) 2008-2011
- Christiaan Hofman. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Christiaan Hofman nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Cocoa/Cocoa.h>
-#import <Quartz/Quartz.h>
-
-
-@interface PDFBorder (SKExtensions)
-@end
Deleted: trunk/PDFBorder_SKExtensions.m
===================================================================
--- trunk/PDFBorder_SKExtensions.m 2011-07-27 10:06:28 UTC (rev 7399)
+++ trunk/PDFBorder_SKExtensions.m 2011-07-27 10:11:16 UTC (rev 7400)
@@ -1,90 +0,0 @@
-//
-// PDFBorder_SKExtensions.m
-// Skim
-//
-// Created by Christiaan Hofman on 4/1/08.
-/*
- This software is Copyright (c) 2008-2011
- Christiaan Hofman. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Christiaan Hofman nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "PDFBorder_SKExtensions.h"
-#import "SKRuntime.h"
-#import <objc/objc-runtime.h>
-
-/*
-@interface PDFBorderPrivateVars : NSObject
-{
- NSUInteger style;
- CGFloat hCornerRadius;
- CGFloat vCornerRadius;
- CGFloat lineWidth;
- unsigned int dashCount;
- CGFloat *dashPattern;
-}
-@end
-*/
-
-@implementation PDFBorder (SKExtensions)
-
-#if __LP64__
-
-static id (*original_dashPattern)(id, SEL) = NULL;
-
-- (NSArray *)replacement_dashPattern {
- NSMutableArray *pattern = [NSMutableArray array];
- @try {
- id vars = [self valueForKey:@"pdfPriv"];
- NSUInteger i, count = [[vars valueForKey:@"dashCount"]
unsignedIntegerValue];
- Ivar ivar = object_getInstanceVariable(vars, "dashPattern", NULL);
- if (ivar != NULL) {
- CGFloat *dashPattern = *(CGFloat **)((void *)vars +
ivar_getOffset(ivar));
- for (i = 0; i < count; i++)
- [pattern addObject:[NSNumber numberWithDouble:dashPattern[i]]];
- }
- }
- @catch (id e) {}
- return pattern;
-}
-
-+ (void)load {
- // the implementation of -dashPattern is currently badly broken, probably
due to the wrong type for _pdfPriv.dashCount
- Class cls = NSClassFromString(@"PDFBorderPrivateVars");
- if (cls) {
- Ivar ivar = class_getInstanceVariable(cls, "dashCount");
- if (ivar && 0 != strcmp(ivar_getTypeEncoding(ivar),
@encode(NSUInteger)))
- original_dashPattern = (id (*)(id,
SEL))SKReplaceInstanceMethodImplementationFromSelector(self,
@selector(dashPattern), @selector(replacement_dashPattern));
- }
-}
-
-#endif
-
-@end
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2011-07-27 10:06:28 UTC (rev
7399)
+++ trunk/Skim.xcodeproj/project.pbxproj 2011-07-27 10:11:16 UTC (rev
7400)
@@ -235,7 +235,6 @@
CEE54D9C0DA2E7B30037169F /* PDFAnnotationLine_SKExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEE54D9B0DA2E7B30037169F /*
PDFAnnotationLine_SKExtensions.m */; };
CEE54DAE0DA2E8CD0037169F /*
PDFAnnotationFreeText_SKExtensions.m in Sources */ = {isa = PBXBuildFile;
fileRef = CEE54DAD0DA2E8CD0037169F /* PDFAnnotationFreeText_SKExtensions.m */;
};
CEE54DB40DA2E99D0037169F /* PDFAnnotationMarkup_SKExtensions.m
in Sources */ = {isa = PBXBuildFile; fileRef = CEE54DB30DA2E99D0037169F /*
PDFAnnotationMarkup_SKExtensions.m */; };
- CEE54DC80DA2EAE00037169F /* PDFBorder_SKExtensions.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CEE54DC70DA2EAE00037169F /*
PDFBorder_SKExtensions.m */; };
CEE54F6C0DA3FB060037169F /* SKMainToolbarController.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEE54F6B0DA3FB060037169F /*
SKMainToolbarController.m */; };
CEE54F700DA3FBE00037169F /* NSSegmentedControl_SKExtensions.m
in Sources */ = {isa = PBXBuildFile; fileRef = CEE54F6F0DA3FBE00037169F /*
NSSegmentedControl_SKExtensions.m */; };
CEE54F900DA3FE9A0037169F /* NSValueTransformer_SKExtensions.m
in Sources */ = {isa = PBXBuildFile; fileRef = CEE54F8F0DA3FE9A0037169F /*
NSValueTransformer_SKExtensions.m */; };
@@ -943,8 +942,6 @@
CEE54DAD0DA2E8CD0037169F /*
PDFAnnotationFreeText_SKExtensions.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path =
PDFAnnotationFreeText_SKExtensions.m; sourceTree = "<group>"; };
CEE54DB20DA2E99D0037169F /* PDFAnnotationMarkup_SKExtensions.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = PDFAnnotationMarkup_SKExtensions.h; sourceTree =
"<group>"; };
CEE54DB30DA2E99D0037169F /* PDFAnnotationMarkup_SKExtensions.m
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = PDFAnnotationMarkup_SKExtensions.m; sourceTree =
"<group>"; };
- CEE54DC60DA2EAE00037169F /* PDFBorder_SKExtensions.h */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= PDFBorder_SKExtensions.h; sourceTree = "<group>"; };
- CEE54DC70DA2EAE00037169F /* PDFBorder_SKExtensions.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = PDFBorder_SKExtensions.m; sourceTree = "<group>"; };
CEE54F6A0DA3FB060037169F /* SKMainToolbarController.h */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= SKMainToolbarController.h; sourceTree = "<group>"; };
CEE54F6B0DA3FB060037169F /* SKMainToolbarController.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = SKMainToolbarController.m; sourceTree = "<group>"; };
CEE54F6E0DA3FBE00037169F /* NSSegmentedControl_SKExtensions.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = NSSegmentedControl_SKExtensions.h; sourceTree =
"<group>"; };
@@ -1941,8 +1938,6 @@
CE4642E40DF5CBD900CFD8D2 /*
PDFAnnotationText_SKExtensions.m */,
CE3A3D2A0B78C0A0006B64D3 /*
SKNPDFAnnotationNote_SKExtensions.h */,
CE3A3D2B0B78C0A0006B64D3 /*
SKNPDFAnnotationNote_SKExtensions.m */,
- CEE54DC60DA2EAE00037169F /*
PDFBorder_SKExtensions.h */,
- CEE54DC70DA2EAE00037169F /*
PDFBorder_SKExtensions.m */,
CEE176E20DBD5B0C00E6C317 /*
PDFDisplayView_SKExtensions.h */,
CEE176E30DBD5B0C00E6C317 /*
PDFDisplayView_SKExtensions.m */,
CE6DC7B90D689138003A072F /*
PDFDocument_SKExtensions.h */,
@@ -2459,7 +2454,6 @@
CEE54D9C0DA2E7B30037169F /*
PDFAnnotationLine_SKExtensions.m in Sources */,
CEE54DAE0DA2E8CD0037169F /*
PDFAnnotationFreeText_SKExtensions.m in Sources */,
CEE54DB40DA2E99D0037169F /*
PDFAnnotationMarkup_SKExtensions.m in Sources */,
- CEE54DC80DA2EAE00037169F /*
PDFBorder_SKExtensions.m in Sources */,
CEE54F6C0DA3FB060037169F /*
SKMainToolbarController.m in Sources */,
CEE54F700DA3FBE00037169F /*
NSSegmentedControl_SKExtensions.m in Sources */,
CEE54F900DA3FE9A0037169F /*
NSValueTransformer_SKExtensions.m in Sources */,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit