1.1 --- a/Source/QuartzUtils.m	Sun Mar 16 15:06:47 2008 -0700
     1.2 +++ b/Source/QuartzUtils.m	Wed May 28 12:47:10 2008 -0700
     1.3 @@ -42,7 +42,7 @@
     1.4  }
     1.5  
     1.6  
     1.7 -#if TARGET_OS_ASPEN
     1.8 +#if TARGET_OS_IPHONE
     1.9  CGColorRef CreateGray(CGFloat gray, CGFloat alpha)
    1.10  {
    1.11      CGColorSpaceRef graySpace = CGColorSpaceCreateDeviceGray();
    1.12 @@ -100,7 +100,7 @@
    1.13  
    1.14  CGImageRef CreateCGImageFromFile( NSString *path )
    1.15  {
    1.16 -#if TARGET_OS_ASPEN
    1.17 +#if TARGET_OS_IPHONE
    1.18      UIImage *uiImage = [UIImage imageWithContentsOfFile: path];
    1.19      if(!uiImage) NSLog(@"Warning: UIImage imageWithContentsOfFile failed on file %@",path);
    1.20      return CGImageRetain(uiImage.CGImage);
    1.21 @@ -120,7 +120,7 @@
    1.22  
    1.23  CGImageRef GetCGImageNamed( NSString *name )
    1.24  {
    1.25 -#if TARGET_OS_ASPEN
    1.26 +#if TARGET_OS_IPHONE
    1.27      name = name.lastPathComponent;
    1.28      UIImage *uiImage = [UIImage imageNamed: name];
    1.29      NSCAssert1(uiImage,@"Couldn't find bundle image resource '%@'",name);
    1.30 @@ -168,7 +168,7 @@
    1.31  }
    1.32  
    1.33  
    1.34 -#if ! TARGET_OS_ASPEN
    1.35 +#if ! TARGET_OS_IPHONE
    1.36  CGImageRef GetCGImageFromPasteboard( NSPasteboard *pb )
    1.37  {
    1.38      CGImageSourceRef src = NULL;
    1.39 @@ -197,7 +197,7 @@
    1.40  
    1.41  float GetPixelAlpha( CGImageRef image, CGSize imageSize, CGPoint pt )
    1.42  {
    1.43 -#if TARGET_OS_ASPEN
    1.44 +#if TARGET_OS_IPHONE
    1.45      // iPhone uses "flipped" (i.e. normal) coords, so images are wrong-way-up
    1.46      pt.y = imageSize.height - pt.y;
    1.47  #endif