Support @2x.png if @2x~iphone.png.

diff --git a/Library.mm b/Library.mm
index e97e739cdfaf2a56c5887217b695fad7fe2cff64..505851f65f6f4233d693535facd045488b6d6014 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -237,9 +237,6 @@ static unsigned $getScale$(NSString *path) {
 }
 
 static NSArray *$useScale$(NSArray *files, bool use = true) {
-    if (!use)
-        return files;
-
     if (Scale_ == 0) {
         UIScreen *screen([UIScreen mainScreen]);
         if ([screen respondsToSelector:@selector(scale)])
@@ -254,7 +251,10 @@ static NSArray *$useScale$(NSArray *files, bool use = true) {
     NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 2)]);
 
     for (NSString *file in files) {
-        [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", [file stringByDeletingPathExtension], [file pathExtension]]];
+        if (use && Scale_ == 2)
+            [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", [file stringByDeletingPathExtension], [file pathExtension]]];
+        if ([file hasSuffix:@"@2x~iphone.png"])
+            [scaled addObject:[[file substringWithRange:NSMakeRange(0, [file length] - 11)] stringByAppendingPathExtension:@"png"]];
         [scaled addObject:file];
     }