Move cat project into Cat Demo folder

hollance · Aug 6, 2017 · 33e6893 · 33e6893
1 parent b81af19
commit 33e6893
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 7 deletions.
diff --git a/MobileNetCoreML.xcodeproj/project.pbxproj → ...MobileNetCoreML.xcodeproj/project.pbxproj b/MobileNetCoreML.xcodeproj/project.pbxproj → ...MobileNetCoreML.xcodeproj/project.pbxproj
@@ -26,8 +26,7 @@
 		7BDDAE2F1EE7033600CF05C3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		7BDDAE321EE7033600CF05C3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		7BDDAE341EE7033600CF05C3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		7BDDAE3A1EE7035000CF05C3 /* README.markdown */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.markdown; sourceTree = "<group>"; };
-		7BDDAE3B1EE706EB00CF05C3 /* MobileNet.mlmodel */ = {isa = PBXFileReference; lastKnownFileType = file.mlmodel; path = MobileNet.mlmodel; sourceTree = SOURCE_ROOT; };
+		7BDDAE3B1EE706EB00CF05C3 /* MobileNet.mlmodel */ = {isa = PBXFileReference; lastKnownFileType = file.mlmodel; name = MobileNet.mlmodel; path = ../MobileNet.mlmodel; sourceTree = SOURCE_ROOT; };
 		7BDDAE441EE71A3900CF05C3 /* UIImage+CVPixelBuffer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+CVPixelBuffer.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -45,7 +44,6 @@
 		7BDDAE1C1EE7033600CF05C3 = {
 			isa = PBXGroup;
 			children = (
-				7BDDAE3A1EE7035000CF05C3 /* README.markdown */,
 				7BDDAE271EE7033600CF05C3 /* MobileNetCoreML */,
 				7BDDAE261EE7033600CF05C3 /* Products */,
 			);

diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/MobileNetCoreML/AppDelegate.swift → Cat Demo/MobileNetCoreML/AppDelegate.swift b/MobileNetCoreML/AppDelegate.swift → Cat Demo/MobileNetCoreML/AppDelegate.swift
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...CoreML/Base.lproj/LaunchScreen.storyboard → ...CoreML/Base.lproj/LaunchScreen.storyboard b/...CoreML/Base.lproj/LaunchScreen.storyboard → ...CoreML/Base.lproj/LaunchScreen.storyboard
diff --git a/MobileNetCoreML/Base.lproj/Main.storyboard → ...obileNetCoreML/Base.lproj/Main.storyboard b/MobileNetCoreML/Base.lproj/Main.storyboard → ...obileNetCoreML/Base.lproj/Main.storyboard
diff --git a/MobileNetCoreML/Info.plist → Cat Demo/MobileNetCoreML/Info.plist b/MobileNetCoreML/Info.plist → Cat Demo/MobileNetCoreML/Info.plist
diff --git a/MobileNetCoreML/UIImage+CVPixelBuffer.swift → ...bileNetCoreML/UIImage+CVPixelBuffer.swift b/MobileNetCoreML/UIImage+CVPixelBuffer.swift → ...bileNetCoreML/UIImage+CVPixelBuffer.swift
@@ -6,8 +6,8 @@ extension UIImage {
     let attrs = [kCVPixelBufferCGImageCompatibilityKey: kCFBooleanTrue,
                  kCVPixelBufferCGBitmapContextCompatibilityKey: kCFBooleanTrue]
     let status = CVPixelBufferCreate(kCFAllocatorDefault,
-                                     Int(width),
-                                     Int(height),
+                                     width,
+                                     height,
                                      kCVPixelFormatType_32ARGB,
                                      attrs as CFDictionary,
                                      &maybePixelBuffer)
@@ -20,8 +20,8 @@ extension UIImage {
     let pixelData = CVPixelBufferGetBaseAddress(pixelBuffer)
 
     guard let context = CGContext(data: pixelData,
-                                  width: Int(width),
-                                  height: Int(height),
+                                  width: width,
+                                  height: height,
                                   bitsPerComponent: 8,
                                   bytesPerRow: CVPixelBufferGetBytesPerRow(pixelBuffer),
                                   space: CGColorSpaceCreateDeviceRGB(),

diff --git a/MobileNetCoreML/ViewController.swift → ...Demo/MobileNetCoreML/ViewController.swift b/MobileNetCoreML/ViewController.swift → ...Demo/MobileNetCoreML/ViewController.swift
diff --git a/cat.jpg → Cat Demo/cat.jpg b/cat.jpg → Cat Demo/cat.jpg