Revision: 5799
http://skim-app.svn.sourceforge.net/skim-app/?rev=5799&view=rev
Author: hofman
Date: 2009-09-23 15:05:15 +0000 (Wed, 23 Sep 2009)
Log Message:
-----------
don't declare base64 methods that are not used outside the category
Modified Paths:
--------------
trunk/NSData_SKExtensions.h
trunk/NSData_SKExtensions.m
Modified: trunk/NSData_SKExtensions.h
===================================================================
--- trunk/NSData_SKExtensions.h 2009-09-23 15:01:51 UTC (rev 5798)
+++ trunk/NSData_SKExtensions.h 2009-09-23 15:05:15 UTC (rev 5799)
@@ -50,9 +50,7 @@
- (NSString *)xmlString;
- (id)initWithBase64String:(NSString *)base64String;
-- (id)initWithBase64String:(NSString *)base64String
withNewlines:(BOOL)encodedWithNewlines;
- (NSString *)base64String;
-- (NSString *)base64StringWithNewlines:(BOOL)encodeWithNewlines;
+ (NSData *)dataWithPointAsQDPoint:(NSPoint)point;
+ (NSData *)dataWithRectAsQDRect:(NSRect)rect;
Modified: trunk/NSData_SKExtensions.m
===================================================================
--- trunk/NSData_SKExtensions.m 2009-09-23 15:01:51 UTC (rev 5798)
+++ trunk/NSData_SKExtensions.m 2009-09-23 15:05:15 UTC (rev 5799)
@@ -147,17 +147,12 @@
// base 64 encoding/decoding methods modified from sample code on CocoaDev
http://www.cocoadev.com/index.pl?BaseSixtyFour
- (id)initWithBase64String:(NSString *)base64String {
- return [self initWithBase64String:base64String withNewlines:NO];
-}
-
-- (id)initWithBase64String:(NSString *)base64String
withNewlines:(BOOL)encodedWithNewlines {
// Create a memory buffer containing Base64 encoded string data
BIO *mem = BIO_new_mem_buf((void *)[base64String
cStringUsingEncoding:NSASCIIStringEncoding], [base64String
lengthOfBytesUsingEncoding:NSASCIIStringEncoding]);
// Push a Base64 filter so that reading from the buffer decodes it
BIO *b64 = BIO_new(BIO_f_base64());
- if (encodedWithNewlines == NO)
- BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
+ BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
mem = BIO_push(b64, mem);
// Decode into an NSMutableData
@@ -176,10 +171,6 @@
return self;
}
-- (NSString *)base64String {
- return [self base64StringWithNewlines:NO];
-}
-
- (NSString *)base64StringWithNewlines:(BOOL)encodeWithNewlines {
// Create a memory buffer which will contain the Base64 encoded string
BIO *mem = BIO_new(BIO_s_mem());
@@ -204,6 +195,10 @@
return base64String;
}
+- (NSString *)base64String {
+ return [self base64StringWithNewlines:NO];
+}
+
#pragma mark Templating support
- (NSString *)xmlString {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
