incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: [CB-1502] Re-fix - rename asset for @2x, remove scaling
Date Thu, 20 Sep 2012 20:50:30 GMT
Updated Branches:
  refs/heads/master 1dd9b330c -> 4f7583152


[CB-1502] Re-fix - rename asset for @2x, remove scaling


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/4f758315
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/4f758315
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/4f758315

Branch: refs/heads/master
Commit: 4f75831520f0429baebd6e2d6bef9cbe44fbea1f
Parents: 1dd9b33
Author: Shazron Abdullah <shazron@apache.org>
Authored: Thu Sep 20 13:50:19 2012 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Thu Sep 20 13:50:19 2012 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/CDVCapture.m                    |    3 ---
 .../Resources/Capture.bundle/microphone-568h.png   |  Bin 516905 -> 0 bytes
 .../Capture.bundle/microphone-568h@2x~iphone.png   |  Bin 0 -> 516760 bytes
 3 files changed, 0 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4f758315/CordovaLib/Classes/CDVCapture.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCapture.m b/CordovaLib/Classes/CDVCapture.m
index aaa5b03..a6e46c1 100644
--- a/CordovaLib/Classes/CDVCapture.m
+++ b/CordovaLib/Classes/CDVCapture.m
@@ -594,9 +594,6 @@
     }
     
     UIImage* microphone = [UIImage imageNamed:[self resolveImageResource:microphoneResource]];
-    if (CDV_IsIPhone5()) { // need to set it to 2.0x if not it will be 1.0 scale but too
big for the screen
-        microphone = [UIImage imageWithCGImage:microphone.CGImage scale:2.0f orientation:UIImageOrientationUp];
-    }
     UIView* microphoneView = [[UIView alloc] initWithFrame: CGRectMake(0,0,viewRect.size.width,
microphone.size.height)];
     [microphoneView setBackgroundColor:[UIColor colorWithPatternImage:microphone]];
     [microphoneView setUserInteractionEnabled: NO];

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4f758315/bin/templates/project/__TESTING__/Resources/Capture.bundle/microphone-568h.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/__TESTING__/Resources/Capture.bundle/microphone-568h.png
b/bin/templates/project/__TESTING__/Resources/Capture.bundle/microphone-568h.png
deleted file mode 100644
index 4a90af2..0000000
Binary files a/bin/templates/project/__TESTING__/Resources/Capture.bundle/microphone-568h.png
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4f758315/bin/templates/project/__TESTING__/Resources/Capture.bundle/microphone-568h@2x~iphone.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/__TESTING__/Resources/Capture.bundle/microphone-568h@2x~iphone.png
b/bin/templates/project/__TESTING__/Resources/Capture.bundle/microphone-568h@2x~iphone.png
new file mode 100644
index 0000000..5af7f1f
Binary files /dev/null and b/bin/templates/project/__TESTING__/Resources/Capture.bundle/microphone-568h@2x~iphone.png
differ


Mime
View raw message