Merge branch 'release/1.1'

chuganzy · Mar 22, 2015 · 82f92ab · 82f92ab
2 parents 9c556dc + b95611e
commit 82f92ab
Show file tree

Hide file tree

Showing 19 changed files with 1,246 additions and 1,048 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+language: objective-c
+script:
+- xctool -workspace HCImage+BPG.xcworkspace -scheme Example-Mac
+- xctool -workspace HCImage+BPG.xcworkspace -scheme Example-iOS -sdk iphonesimulator
diff --git a/Example/Example-Mac/AppDelegate.h b/Example/Example-Mac/AppDelegate.h
@@ -2,14 +2,12 @@
 //  AppDelegate.h
 //  Example-Mac
 //
-//  Created by Takeru Chuganji on 1/4/15.
+//  Created by Takeru Chuganji on 3/22/15.
 //
 //
 
 #import <Cocoa/Cocoa.h>
 
 @interface AppDelegate : NSObject <NSApplicationDelegate>
-
-
 @end
 
diff --git a/Example/Example-Mac/AppDelegate.m b/Example/Example-Mac/AppDelegate.m
@@ -2,20 +2,24 @@
 //  AppDelegate.m
 //  Example-Mac
 //
-//  Created by Takeru Chuganji on 1/4/15.
+//  Created by Takeru Chuganji on 3/22/15.
 //
 //
 
 #import "AppDelegate.h"
+#import "HCImage+BPG.h"
 
 @interface AppDelegate ()
-
+@property (weak) IBOutlet NSWindow *window;
+@property (weak) IBOutlet NSImageView *imageView;
 @end
 
 @implementation AppDelegate
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
-    // Insert code here to initialize your application
+    NSString *filePath = [[NSBundle mainBundle] pathForResource:@"sample" ofType:@"bpg"];
+    NSData *data = [NSData dataWithContentsOfFile:filePath];
+    self.imageView.image = [NSImage imageWithBPGData:data];
 }
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification {

diff --git a/Example/Example-Mac/Base.lproj/Main.storyboard b/Example/Example-Mac/Base.lproj/Main.storyboard
diff --git a/Example/Example-Mac/Base.lproj/MainMenu.xib b/Example/Example-Mac/Base.lproj/MainMenu.xib
diff --git a/Example/Example-Mac/Info.plist b/Example/Example-Mac/Info.plist
@@ -24,8 +24,8 @@
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
-	<key>NSMainStoryboardFile</key>
-	<string>Main</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 </dict>

diff --git a/Example/Example-Mac/ViewController.h b/Example/Example-Mac/ViewController.h
diff --git a/Example/Example-Mac/ViewController.m b/Example/Example-Mac/ViewController.m
diff --git a/Example/Example-Mac/main.m b/Example/Example-Mac/main.m
@@ -2,7 +2,7 @@
 //  main.m
 //  Example-Mac
 //
-//  Created by Takeru Chuganji on 1/4/15.
+//  Created by Takeru Chuganji on 3/22/15.
 //
 //
 

diff --git a/Example/Example-MacTests/Example_MacTests.m b/Example/Example-MacTests/Example_MacTests.m
@@ -2,7 +2,7 @@
 //  Example_MacTests.m
 //  Example-MacTests
 //
-//  Created by Takeru Chuganji on 1/4/15.
+//  Created by Takeru Chuganji on 3/22/15.
 //
 //
 

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example-Mac.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example-Mac.xcscheme
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0620"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00B12FC71ABEC955005932F4"
+               BuildableName = "Example-Mac.app"
+               BlueprintName = "Example-Mac"
+               ReferencedContainer = "container:Example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00B12FD91ABEC955005932F4"
+               BuildableName = "Example-MacTests.xctest"
+               BlueprintName = "Example-MacTests"
+               ReferencedContainer = "container:Example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00B12FD91ABEC955005932F4"
+               BuildableName = "Example-MacTests.xctest"
+               BlueprintName = "Example-MacTests"
+               ReferencedContainer = "container:Example.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "00B12FC71ABEC955005932F4"
+            BuildableName = "Example-Mac.app"
+            BlueprintName = "Example-Mac"
+            ReferencedContainer = "container:Example.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "00B12FC71ABEC955005932F4"
+            BuildableName = "Example-Mac.app"
+            BlueprintName = "Example-Mac"
+            ReferencedContainer = "container:Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "00B12FC71ABEC955005932F4"
+            BuildableName = "Example-Mac.app"
+            BlueprintName = "Example-Mac"
+            ReferencedContainer = "container:Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0620"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00B4D88E1A5975880090300C"
+               BuildableName = "Example-iOS.app"
+               BlueprintName = "Example-iOS"
+               ReferencedContainer = "container:Example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00B4D8A71A5975880090300C"
+               BuildableName = "Example-iOSTests.xctest"
+               BlueprintName = "Example-iOSTests"
+               ReferencedContainer = "container:Example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00B4D8A71A5975880090300C"
+               BuildableName = "Example-iOSTests.xctest"
+               BlueprintName = "Example-iOSTests"
+               ReferencedContainer = "container:Example.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "00B4D88E1A5975880090300C"
+            BuildableName = "Example-iOS.app"
+            BlueprintName = "Example-iOS"
+            ReferencedContainer = "container:Example.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "00B4D88E1A5975880090300C"
+            BuildableName = "Example-iOS.app"
+            BlueprintName = "Example-iOS"
+            ReferencedContainer = "container:Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "00B4D88E1A5975880090300C"
+            BuildableName = "Example-iOS.app"
+            BlueprintName = "Example-iOS"
+            ReferencedContainer = "container:Example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/HCImage+BPG.podspec b/HCImage+BPG.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "HCImage+BPG"
-  s.version               = "1.0"
+  s.version               = "1.1"
   s.source                = { :git => "https://github.com/hoppenichu/HCImage-BPG.git", :tag => s.version }
 
   s.summary               = "BPG decoder for iOS and OS X"

diff --git a/HCImage+BPG/HCImage+BPG.m b/HCImage+BPG/HCImage+BPG.m
@@ -15,14 +15,15 @@ static void release_image_data(void *info, const void *data, size_t size) {
 + (HCImage *)imageWithBPGData:(NSData *)data {
     BPGDecoderContext *decoderContext;
     decoderContext = bpg_decoder_open();
-    if (bpg_decoder_decode(decoderContext, [data bytes], (int) [data length]) < 0) {
+    if (bpg_decoder_decode(decoderContext, data.bytes, (int) data.length) < 0) {
+        bpg_decoder_close(decoderContext);
         return nil;
     }
     BPGImageInfo imageInfo;
     bpg_decoder_get_info(decoderContext, &imageInfo);
 
-    const size_t width = (size_t) imageInfo.width;
-    const size_t height = (size_t) imageInfo.height;
+    const size_t width = imageInfo.width;
+    const size_t height = imageInfo.height;
 
     const size_t lineSize = 4 * width;
     const size_t size = lineSize * height;

diff --git a/HCImage+BPG/libbpg/VERSION b/HCImage+BPG/libbpg/VERSION
@@ -1 +1 @@
-0.9.4
+0.9.5