[Vienna-rss-submits] SF.net SVN: vienna-rss:[1506] trunk/2.5.0/StringExtensions.m

[<ste...@us...>]

Revision: 1506
          http://vienna-rss.svn.sourceforge.net/vienna-rss/?rev=1506&view=rev
Author:   stevewpalmer
Date:     2010-01-31 15:40:19 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Integrate changes 1501 and 1502 from 2.4 branch.

Modified Paths:
--------------
    trunk/2.5.0/StringExtensions.m

Modified: trunk/2.5.0/StringExtensions.m
===================================================================
--- trunk/2.5.0/StringExtensions.m	2010-01-31 14:43:04 UTC (rev 1505)
+++ trunk/2.5.0/StringExtensions.m	2010-01-31 15:40:19 UTC (rev 1506)
@@ -44,7 +44,7 @@
 		return;
 	NSURL * imgBaseURL = [NSURL URLWithString:baseURL];
 	
-	int textLength = [self length];
+	unsigned int textLength = [self length];
 	NSRange srchRange;
 	
 	srchRange.location = 0;
@@ -56,7 +56,7 @@
 		if (srcRange.location != NSNotFound)
 		{
 			// Find the src parameter range.
-			int index = srcRange.location + srcRange.length;
+			unsigned int index = srcRange.location + srcRange.length;
 			srcRange.location += srcRange.length;
 			srcRange.length = 0;
 			while (index < textLength && [self characterAtIndex:index] != '"')
@@ -66,15 +66,19 @@
 			}
 			
 			// Now extract the source parameter
-			NSString * srcPath = [[self substringWithRange:srcRange] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-			if (srcPath && ![srcPath hasPrefix:@"http://"])
+			NSString * srcPath = [self substringWithRange:srcRange];
+			if (![srcPath hasPrefix:@"http://"])
 			{
-				NSURL * imgURL = [NSURL URLWithString:srcPath relativeToURL:imgBaseURL];
-				if (imgURL != nil)
+				NSString * escapedSrcPath = [srcPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+				if (escapedSrcPath != nil)
 				{
-					srcPath = [imgURL absoluteString];
-					[self replaceCharactersInRange:srcRange withString:srcPath];
-					textLength = [self length];
+					NSURL * imgURL = [NSURL URLWithString:escapedSrcPath relativeToURL:imgBaseURL];
+					if (imgURL != nil)
+					{
+						srcPath = [imgURL absoluteString];
+						[self replaceCharactersInRange:srcRange withString:srcPath];
+						textLength = [self length];
+					}
 				}
 			}
 			


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.