Commit: 6820c3c720c9ed8b35023fd9f9532c727b5fabbd - KanColleGraphicDivider (git)

swfから画像を抽出するコマンドラインアプリケーション

Commit MetaInfo

• Revision: 6820c3c720c9ed8b35023fd9f9532c727b5fabbd (tree)
• Time: 2018-05-22 22:59:06
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

不要な部分を削除。書式をそろえた

Change Summary

• modified: KanColleGraphicDivider.xcodeproj/project.pbxproj
• modified: KanColleGraphicDivider/Decoder/BitLossless2ColorTableDecoder.m
• modified: KanColleGraphicDivider/Decoder/BitsDecoder.m
• modified: KanColleGraphicDivider/Decoder/BitsJPEG3Decoder.m
• modified: KanColleGraphicDivider/Decoder/BitsLossless2Decoder.m
• modified: KanColleGraphicDivider/ImageDataConverter.m
• modified: KanColleGraphicDivider/ImageStore.m
• modified: KanColleGraphicDivider/Information.m
• delete: KanColleGraphicDivider/KanColleGraphicDivider.h
• modified: KanColleGraphicDivider/main.m

Incremental Difference

--- a/KanColleGraphicDivider.xcodeproj/project.pbxproj
+++ b/KanColleGraphicDivider.xcodeproj/project.pbxproj
@@ -51,7 +51,6 @@
 		F490569220B0512C00CF637D /* Information.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Information.m; sourceTree = "<group>"; };
 		F490569420B0568F00CF637D /* ImageStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ImageStore.h; sourceTree = "<group>"; };
 		F490569520B0568F00CF637D /* ImageStore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ImageStore.m; sourceTree = "<group>"; };
-		F490569720B0584600CF637D /* KanColleGraphicDivider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KanColleGraphicDivider.h; sourceTree = "<group>"; };
 		F490569820B059B800CF637D /* BitLossless2ColorTableDecoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BitLossless2ColorTableDecoder.h; sourceTree = "<group>"; };
 		F490569920B059B800CF637D /* BitLossless2ColorTableDecoder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BitLossless2ColorTableDecoder.m; sourceTree = "<group>"; };
 		F490569B20B05B9400CF637D /* BitsJPEG3Decoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BitsJPEG3Decoder.h; sourceTree = "<group>"; };
@@ -97,7 +96,6 @@
 			isa = PBXGroup;
 			children = (
 				F486709E20B30A3D00DB9579 /* mics */,
-				F490569720B0584600CF637D /* KanColleGraphicDivider.h */,
 				F44C14C11D84F27500ADE497 /* SWFStructure.h */,
 				F44C14BA1D84F07300ADE497 /* main.m */,
 				F486709C20B30A2300DB9579 /* SWFParser */,

--- a/KanColleGraphicDivider/Decoder/BitLossless2ColorTableDecoder.m
+++ b/KanColleGraphicDivider/Decoder/BitLossless2ColorTableDecoder.m
@@ -8,8 +8,7 @@
 
 #import "BitLossless2ColorTableDecoder.h"
 
-#include "KanColleGraphicDivider.h"
-#import "Information.h"
+#include "SWFStructure.h"
 #import "ImageDataConverter.h"
 
 #import "HMZlibData.h"
@@ -71,13 +70,16 @@
     // ARGBカラーマップからARGBビットマップを作成
     UInt32 *imageDataP = calloc(4, data->width * data->height);
     if(!imageDataP) {
+        
         fprintf(stderr, "Can not allocate enough memory.\n");
         return nil;
     }
     
     UInt32 *imageDataPixel = imageDataP;
     for(UInt16 h = 0; h < data->height; h++) {
+        
         for(UInt16 w = 0; w < data->width; w++) {
+            
             *imageDataPixel++ = mapP[*colorIndexP++];
         }
         colorIndexP += skipBytes;

--- a/KanColleGraphicDivider/Decoder/BitsDecoder.m
+++ b/KanColleGraphicDivider/Decoder/BitsDecoder.m
@@ -52,6 +52,7 @@
     
     NSImage *pict = [[NSImage alloc] initWithData:contentData];
     if(!pict) {
+        
         fprintf(stderr, "Can not create image from data.\n");
         return nil;
     }

--- a/KanColleGraphicDivider/Decoder/BitsJPEG3Decoder.m
+++ b/KanColleGraphicDivider/Decoder/BitsJPEG3Decoder.m
@@ -8,7 +8,7 @@
 
 #import "BitsJPEG3Decoder.h"
 
-#include "KanColleGraphicDivider.h"
+#include "SWFStructure.h"
 #import "ImageDataConverter.h"
 
 #import "BitsDecoder.h"
@@ -75,6 +75,7 @@
     NSData *pic = [NSData dataWithBytes:p length:imageSize];
     NSImage *pict = [[NSImage alloc] initWithData:pic];
     if(!pict) {
+        
         fprintf(stderr, "Can not create image from data.\n");
         return nil;
     }
@@ -97,6 +98,7 @@
                                                                              bytesPerRow:size.width
                                                                             bitsPerPixel:0];
     if(!alphaImageRef) {
+        
         fprintf(stderr, "Can not create alpha image from data.\n");
         return nil;
     }

--- a/KanColleGraphicDivider/Decoder/BitsLossless2Decoder.m
+++ b/KanColleGraphicDivider/Decoder/BitsLossless2Decoder.m
@@ -8,7 +8,7 @@
 
 #import "BitsLossless2Decoder.h"
 
-#include "KanColleGraphicDivider.h"
+#include "SWFStructure.h"
 #import "ImageDataConverter.h"
 
 #import "HMZlibData.h"

--- a/KanColleGraphicDivider/ImageDataConverter.m
+++ b/KanColleGraphicDivider/ImageDataConverter.m
@@ -12,11 +12,13 @@ NSData *convertToPNGImagaData(id<ImageConvertible> image) {
     
     NSData *tiffData = [image TIFFRepresentation];
     if(!tiffData) {
+        
         fprintf(stderr, "Can not create TIFF representation.\n");
         return nil;
     }
     
     NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initWithData:tiffData];
+    
     return [rep representationUsingType:NSPNGFileType
                              properties:@{}];
 }

--- a/KanColleGraphicDivider/ImageStore.m
+++ b/KanColleGraphicDivider/ImageStore.m
@@ -6,7 +6,6 @@
 //  Copyright © 2018年 Hori,Masaki. All rights reserved.
 //
 
-#include "KanColleGraphicDivider.h"
 #import "ImageStore.h"
 
 @interface ImageStore()

--- a/KanColleGraphicDivider/Information.m
+++ b/KanColleGraphicDivider/Information.m
@@ -8,7 +8,6 @@
 
 #import "Information.h"
 
-
 @interface Information()
 
 @property (copy, readwrite) NSURL *originalURL;

--- a/KanColleGraphicDivider/KanColleGraphicDivider.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  KanColleGraphicDivider.h
-//  KanColleGraphicDivider
-//
-//  Created by Hori,Masaki on 2018/05/19.
-//  Copyright © 2018年 Hori,Masaki. All rights reserved.
-//
-
-#ifndef KanColleGraphicDivider_h
-#define KanColleGraphicDivider_h
-
-#include "SWFStructure.h"
-
-#if 0
-#define printLog(...) printLogF( __VA_ARGS__)
-void printLogF(const char *fmt, ...);
-#else
-#define printLog(...)
-#endif
-
-#endif /* KanColleGraphicDivider_h */

--- a/KanColleGraphicDivider/main.m
+++ b/KanColleGraphicDivider/main.m
@@ -10,27 +10,9 @@
 
 #include <getopt.h>
 
-#include "KanColleGraphicDivider.h"
-
 #import "Information.h"
 #import "SWFDecodeProcessor.h"
 
-void printLogF(const char *fmt, ...) {
-    va_list ap;
-    va_start(ap, fmt);
-    vfprintf(stderr, fmt, ap);
-    va_end(ap);
-}
-
-void printHex(const unsigned char *p) {
-    for(int i=0;i<1;i++) {
-        for(int j=0;j<16;j++) {
-            printLog("%02x ", *p++);
-        }
-        printLog("\n");
-    }
-}
-
 const char *toolName;
 const char *versionString = "1.0";
 
@@ -39,8 +21,8 @@ const char *toolNameStr(const char *argv0)
     return [[[NSString stringWithFormat:@"%s", argv0] lastPathComponent] fileSystemRepresentation];
 }
 
-static void usage(int exitVal, FILE *fp)
-{
+static void usage(int exitVal, FILE *fp) {
+    
     fprintf(fp, "Usage: %s [OPTIONS] input-swf-file\n", toolName);
     
     fprintf(fp, "\n");
@@ -56,8 +38,8 @@ static void usage(int exitVal, FILE *fp)
     
     exit(exitVal);
 }
-static void version()
-{
+static void version() {
+    
     printf("KanColleGraphicDivider %s\n", versionString);
     exit(EXIT_SUCCESS);
 }
@@ -85,6 +67,7 @@ int main(int argc, char * const *argv) {
         };
         
         while((opt = getopt_long(argc, argv, SHORTOPTS, longopts, NULL)) != -1) {
+            
             switch(opt) {
                 case 'o':
                     oFilename = optarg;
@@ -105,39 +88,46 @@ int main(int argc, char * const *argv) {
         }
         
         if(optind >= argc) {
+            
             usage(EXIT_FAILURE, stderr);
         }
         
         if(oFilename) {
+            
             outputDir = [[NSString alloc] initWithUTF8String:oFilename];
             if( outputDir.length == 0 ) {
+                
                 fprintf(stderr, "Output directory:%s can not convert file represendation.\n", oFilename);
                 exit(EXIT_FAILURE);
             }
             NSFileManager *fm = [NSFileManager defaultManager];
             BOOL isDir = NO;
             if(![fm fileExistsAtPath:outputDir isDirectory:&isDir] || !isDir) {
+                
                 fprintf(stderr, "Output directory:%s is not found or not directory.\n", outputDir.UTF8String);
                 exit(EXIT_FAILURE);
             }
+            
         } else {
+            
             NSFileManager *fm = [NSFileManager defaultManager];
             outputDir = fm.currentDirectoryPath;
         }
         
         if(charactorid) {
+            
             NSString *charactoridsString = [[NSString alloc] initWithUTF8String:charactorid];
             NSArray *ids = [charactoridsString componentsSeparatedByString:@","];
             if(ids.count != 0) {
-                charactorIds = ids;
                 
-                printLog("CaractorIDs is %s\n", [NSString stringWithFormat:@"%@", ids].fileSystemRepresentation);
+                charactorIds = ids;
             }
         }
                 
         dispatch_group_t group = dispatch_group_create();
         dispatch_queue_t queue = dispatch_queue_create("Create image", DISPATCH_QUEUE_CONCURRENT);
         for(int filePos = optind; filePos < argc; filePos++) {
+            
             const char *filename = argv[filePos];
             Information *info = [Information new];
             info.outputDir = outputDir;
@@ -154,4 +144,3 @@ int main(int argc, char * const *argv) {
     }
     return 0;
 }
-