sprang · takumakita · Apr 19, 2014 · Apr 20, 2014 · Apr 20, 2014 · May 5, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: objective-c
+
+script: xctool -project Inkpad.xcodeproj -scheme Inkpad build  CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
diff --git a/Classes/WDAppDelegate.m b/Classes/WDAppDelegate.m
@@ -40,7 +40,7 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application
     NSString *consumerKey = @"xxxx";
     NSString *consumerSecret = @"xxxx";
 
-    DBSession *session = [[DBSession alloc] initWithAppKey:consumerKey appSecret:consumerSecret root:kDBRootDropbox];
+    DBSession *session = [[DBSession alloc] initWithAppKey:consumerKey appSecret:consumerSecret root:kDBRootAppFolder];
 
     session.delegate = self; // DBSessionDelegate methods allow you to handle re-authenticating
     [DBSession setSharedSession:session];

diff --git a/Classes/WDCanvasController.h b/Classes/WDCanvasController.h
@@ -10,8 +10,6 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "WDElement.h"
-#import "WDStrokeStyle.h"
 
 @class WDCanvas;
 @class WDColorBalanceController;

diff --git a/Classes/WDCanvasController.m b/Classes/WDCanvasController.m
@@ -11,7 +11,6 @@
 
 #import <Twitter/Twitter.h>
 #import <MessageUI/MessageUI.h>
-#import "WDAbstractPath.h"
 #import "WDButton.h"
 #import "WDCanvas.h"
 #import "WDCanvasController.h"
@@ -30,7 +29,6 @@
 #import "WDLayerController.h"
 #import "WDMenu.h"
 #import "WDMenuItem.h"
-#import "WDPath.h"
 #import "WDPropertyManager.h"
 #import "WDRotateTool.h"
 #import "WDSelectionTool.h"
@@ -1417,7 +1415,9 @@ - (void) postOnFacebook:(id)sender
     [facebookSheet addImage:self.drawing.image];
     [facebookSheet setInitialText:NSLocalizedString(@"Check out my Inkpad drawing!", @"Check out my Inkpad drawing!")];
 
-    [self presentViewController:facebookSheet animated:YES completion:nil];
+    dispatch_async(dispatch_get_main_queue(), ^ {
+        [self presentViewController:facebookSheet animated:YES completion:nil];
+    });
 }
 
 - (void) tweetDrawing:(id)sender

diff --git a/Classes/WDColorAdjustmentController.m b/Classes/WDColorAdjustmentController.m
@@ -14,7 +14,6 @@
 #import "WDCanvas.h"
 #import "WDDrawingController.h"
 #import "WDColorAdjustmentController.h"
-#import "WDDrawing.h"
 #import "WDModalTitleBar.h"
 #import "WDPaletteBackgroundView.h"
 #import "UIView+Additions.h"

diff --git a/Classes/WDFillController.m b/Classes/WDFillController.m
@@ -104,6 +104,8 @@ - (void) viewDidLoad
 {
     [super viewDidLoad];
 
+    self.edgesForExtendedLayout = UIRectEdgeNone;
+
     colorController_ = [[WDColorController alloc] initWithNibName:@"Color" bundle:nil];
     [self.view addSubview:colorController_.view];
 

diff --git a/Classes/WDFontController.m b/Classes/WDFontController.m
@@ -116,6 +116,8 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
+    self.edgesForExtendedLayout = UIRectEdgeNone;
+
     sizeSlider_.minimumValue = kMinFontSize;
     sizeSlider_.maximumValue = kMaxFontSize;
 

diff --git a/Classes/WDHueSaturationController.m b/Classes/WDHueSaturationController.m
@@ -12,7 +12,6 @@
 #import "WDDrawingController.h"
 #import "WDColor.h"
 #import "WDColorSlider.h"
-#import "WDElement.h"
 #import "WDHueSaturationController.h"
 #import "WDHueShifter.h"
 

diff --git a/Classes/WDSelectionView.m b/Classes/WDSelectionView.m
@@ -12,8 +12,6 @@
 #import "WDBezierNode.h"
 #import "WDCanvas.h"
 #import "WDDrawingController.h"
-#import "WDDrawing.h"
-#import "WDElement.h"
 #import "WDGLUtilities.h"
 #import "WDLayer.h"
 #import "WDPath.h"

diff --git a/Classes/WDShadowController.m b/Classes/WDShadowController.m
@@ -161,6 +161,8 @@ - (void) viewDidLoad
 {
     [super viewDidLoad];
 
+    self.edgesForExtendedLayout = UIRectEdgeNone;
+
     colorController_ = [[WDColorController alloc] initWithNibName:@"Color" bundle:nil];
     [self.view addSubview:colorController_.view];
     colorController_.colorWell.shadowMode = YES;

diff --git a/Classes/WDStrokeController.m b/Classes/WDStrokeController.m
@@ -302,6 +302,8 @@ - (void) viewDidLoad
 {
     [super viewDidLoad];
 
+    self.edgesForExtendedLayout = UIRectEdgeNone;
+
     colorController_ = [[WDColorController alloc] initWithNibName:@"Color" bundle:nil];
 
     [self.view addSubview:colorController_.view];

diff --git a/Classes/WDSwatchController.m b/Classes/WDSwatchController.m
@@ -183,6 +183,9 @@ - (void)loadView
     [collectionView_ registerClass:[WDSwatchCell class] forCellWithReuseIdentifier:@"cellID"];
 
     self.view = collectionView_;
+
+    self.edgesForExtendedLayout = UIRectEdgeNone;
+
 }
 
 - (NSArray *) toolbarItems

diff --git a/Help/index_ar.html b/Help/index_ar.html
diff --git a/Inkpad-Core/Controllers/WDDrawingController.m b/Inkpad-Core/Controllers/WDDrawingController.m
@@ -16,19 +16,16 @@
 #import "NSArray+Additions.h"
 #import "NSString+Additions.h"
 #import "UIImage+Additions.h"
-#import "WDAbstractPath.h"
 #import "WDBezierNode.h"
 #import "WDColor.h"
 #import "WDCompoundPath.h"
-#import "WDDrawing.h"
 #import "WDDrawingController.h"
 #import "WDDynamicGuideController.h"
 #import "WDFontManager.h"
 #import "WDGroup.h"
 #import "WDImage.h"
 #import "WDInspectableProperties.h"
 #import "WDLayer.h"
-#import "WDPath.h"
 #import "WDPathfinder.h"
 #import "WDPropertyManager.h"
 #import "WDText.h"

diff --git a/Inkpad-Core/Controllers/WDPropertyManager.m b/Inkpad-Core/Controllers/WDPropertyManager.m
@@ -9,7 +9,6 @@
 //  Copyright (c) 2011-2013 Steve Sprang
 //
 
-#import "WDAbstractPath.h"
 #import "WDColor.h"
 #import "WDDrawingController.h"
 #import "WDFontManager.h"

diff --git a/Inkpad-Core/Model/WDAbstractPath.h b/Inkpad-Core/Model/WDAbstractPath.h
@@ -11,7 +11,6 @@
 
 #import <Foundation/Foundation.h>
 #import "WDStylable.h"
-#import "WDStrokeStyle.h"
 
 @protocol WDPathPainter;
 

diff --git a/Inkpad-Core/Model/WDAbstractPath.m b/Inkpad-Core/Model/WDAbstractPath.m
@@ -13,7 +13,6 @@
 #import <UIKit/UIKit.h>
 #endif
 
-#import "WDAbstractPath.h"
 #import "WDArrowhead.h"
 #import "WDColor.h"
 #import "WDCompoundPath.h"

diff --git a/Inkpad-Core/Model/WDCurveFit.m b/Inkpad-Core/Model/WDCurveFit.m
@@ -11,7 +11,6 @@
 
 #import "FitCurves.h"
 #import "WDBezierNode.h"
-#import "WDBezierSegment.h"
 #import "WDCurveFit.h"
 #import "WDPath.h"
 #import "WDUtilities.h"

diff --git a/Inkpad-Core/Model/WDDrawing.m b/Inkpad-Core/Model/WDDrawing.m
@@ -16,8 +16,6 @@
 #import "UIColor+Additions.h"
 #import "WDColor.h"
 #import "WDDocumentProtocol.h"
-#import "WDDrawing.h"
-#import "WDElement.h"
 #import "WDImage.h"
 #import "WDImageData.h"
 #import "WDLayer.h"

diff --git a/Inkpad-Core/Model/WDElement.m b/Inkpad-Core/Model/WDElement.m
@@ -11,13 +11,10 @@
 
 #import "UIColor+Additions.h"
 #import "WDColor.h"
-#import "WDDrawing.h"
-#import "WDElement.h"
 #import "WDGLUtilities.h"
 #import "WDGroup.h"
 #import "WDInspectableProperties.h"
 #import "WDLayer.h"
-#import "WDPickResult.h"
 #import "WDPropertyManager.h"
 #import "WDShadow.h"
 #import "WDSVGHelper.h"

diff --git a/Inkpad-Core/Model/WDImage.m b/Inkpad-Core/Model/WDImage.m
@@ -15,14 +15,11 @@
 #endif
 
 #import "UIColor+Additions.h"
-#import "WDBezierSegment.h"
 #import "WDColor.h"
-#import "WDDrawing.h"
 #import "WDGLUtilities.h"
 #import "WDImage.h"
 #import "WDImageData.h"
 #import "WDLayer.h"
-#import "WDPickResult.h"
 #import "WDShadow.h"
 #import "WDSVGHelper.h"
 #import "WDUtilities.h"

diff --git a/Inkpad-Core/Model/WDLayer.m b/Inkpad-Core/Model/WDLayer.m
@@ -10,7 +10,6 @@
 //
 
 #import "UIColor+Additions.h"
-#import "WDDrawing.h"
 #import "WDElement.h"
 #import "WDLayer.h"
 #import "WDSVGHelper.h"
@@ -180,7 +179,9 @@ - (WDXMLElement *) SVGElement
     }
 
     WDXMLElement *layer = [WDXMLElement elementWithName:@"g"];
-    [layer setAttribute:@"id" value:[[WDSVGHelper sharedSVGHelper] uniqueIDWithPrefix:@"Layer"]];
+    NSString *uniqueName = [[WDSVGHelper sharedSVGHelper] uniqueIDWithPrefix:
+                            [@"Layer$" stringByAppendingString:name_]];
+    [layer setAttribute:@"id" value:[uniqueName substringFromIndex:6]];
     [layer setAttribute:@"inkpad:layerName" value:name_];
 
     if (self.hidden) {

diff --git a/Inkpad-Core/Model/WDPath.m b/Inkpad-Core/Model/WDPath.m
@@ -12,7 +12,6 @@
 #import "UIColor+Additions.h"
 #import "WDArrowhead.h"
 #import "WDBezierNode.h"
-#import "WDBezierSegment.h"
 #import "WDColor.h"
 #import "WDCompoundPath.h"
 #import "WDFillTransform.h"

diff --git a/Inkpad-Core/Model/WDText.m b/Inkpad-Core/Model/WDText.m
@@ -17,9 +17,7 @@
 #import <CoreText/CoreText.h>
 #import "NSString+Additions.h"
 #import "UIColor+Additions.h"
-#import "WDBezierSegment.h"
 #import "WDColor.h"
-#import "WDDrawing.h"
 #import "WDFillTransform.h"
 #import "WDFontManager.h"
 #import "WDGLUtilities.h"

diff --git a/Inkpad-Core/Model/WDTextPath.m b/Inkpad-Core/Model/WDTextPath.m
@@ -18,7 +18,6 @@
 #import "NSString+Additions.h"
 #import "UIColor+Additions.h"
 #import "WDBezierNode.h"
-#import "WDBezierSegment.h"
 #import "WDColor.h"
 #import "WDFillTransform.h"
 #import "WDFontManager.h"

diff --git a/Inkpad-Core/SVG/WDSVGParser.h b/Inkpad-Core/SVG/WDSVGParser.h
@@ -12,9 +12,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "WDDrawing.h"
-#import "WDSVGElement.h"
-#import "WDSVGParserStateStack.h"
 #import "WDSVGStyleParser.h"
 #import "WDSVGTransformParser.h"
 

diff --git a/Inkpad-Core/SVG/WDSVGParser.m b/Inkpad-Core/SVG/WDSVGParser.m
@@ -20,8 +20,6 @@
 #import "WDGroup.h"
 #import "WDImage.h"
 #import "WDLayer.h"
-#import "WDPath.h"
-#import "WDSVGElement.h"
 #import "WDSVGParser.h"
 #import "WDSVGPathParser.h"
 #import "WDText.h"
@@ -136,6 +134,7 @@ - (CGAffineTransform) preserveAspectRatio:(NSString *)source withSize:(CGSize)si
 {
     NSArray *preserveAspectRatio = [[source lowercaseString] componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     BOOL slice = [preserveAspectRatio containsObject:@"slice"];
+    BOOL notUniformScale = [preserveAspectRatio containsObject:@"none"];
     enum {MIN, MID, MAX} xalign = MID, yalign = MID;
     for (NSString *token in preserveAspectRatio) {
         if ([token hasPrefix:@"xmin"]) {
@@ -153,6 +152,7 @@ - (CGAffineTransform) preserveAspectRatio:(NSString *)source withSize:(CGSize)si
     }
     CGPoint translate = CGPointZero;
     CGSize scale = CGSizeMake(bounds.size.width / size.width, bounds.size.height / size.height);
+    if (notUniformScale) {} else
     if (((scale.width > scale.height) && slice) || ((scale.width < scale.height) && !slice)) {
         switch (xalign) {
             case MIN:

diff --git a/Inkpad-Core/SVG/WDSVGPathParser.m b/Inkpad-Core/SVG/WDSVGPathParser.m
@@ -121,7 +121,7 @@ BOOL decomposeArcToCubic(CGMutablePathRef path, float angle, float rx, float ry,
 
     // Some results of atan2 on some platform implementations are not exact enough. So that we get more
     // cubic curves than expected here. Adding 0.001f reduces the count of segments to the correct count.
-    int segments = ceilf(fabsf(thetaArc / (M_PI_2 + 0.001f)));
+    int segments = ceilf(fabs(thetaArc / (M_PI_2 + 0.001f)));
     for (int i = 0; i < segments; ++i) {
         float startTheta = theta1 + i * thetaArc / segments;
         float endTheta = theta1 + (i + 1) * thetaArc / segments;

diff --git a/Inkpad-Core/SVG/WDSVGStyleParser.m b/Inkpad-Core/SVG/WDSVGStyleParser.m
@@ -11,7 +11,6 @@
 //  Copyright (c) 2011-2013 Steve Sprang
 //
 
-#import "WDAbstractPath.h"
 #import "WDColor.h"
 #import "WDFillTransform.h"
 #import "WDGradient.h"

diff --git a/Inkpad-Core/Tools/WDEraserTool.m b/Inkpad-Core/Tools/WDEraserTool.m
@@ -13,7 +13,6 @@
 #import "WDCanvas.h"
 #import "WDColor.h"
 #import "WDCurveFit.h"
-#import "WDDrawing.h"
 #import "WDDrawingController.h"
 #import "WDEraserTool.h"
 #import "WDPath.h"

diff --git a/Inkpad-Core/Tools/WDEyedropperTool.m b/Inkpad-Core/Tools/WDEyedropperTool.m
@@ -12,7 +12,6 @@
 #import "WDEyedropperTool.h"
 #import "WDCanvas.h"
 #import "WDDrawingController.h"
-#import "WDElement.h"
 #import "WDImage.h"
 #import "WDInspectableProperties.h"
 #import "WDPickResult.h"

diff --git a/Inkpad-Core/Tools/WDFreehandTool.m b/Inkpad-Core/Tools/WDFreehandTool.m
@@ -13,7 +13,6 @@
 #import "WDCanvas.h"
 #import "WDColor.h"
 #import "WDCurveFit.h"
-#import "WDDrawing.h"
 #import "WDDrawingController.h"
 #import "WDFreehandTool.h"
 #import "WDInspectableProperties.h"

diff --git a/Inkpad-Core/Tools/WDPenTool.m b/Inkpad-Core/Tools/WDPenTool.m
@@ -12,7 +12,6 @@
 #import "WDBezierNode.h"
 #import "WDCanvas.h"
 #import "WDDrawingController.h"
-#import "WDDrawing.h"
 #import "WDFillTransform.h"
 #import "WDInspectableProperties.h"
 #import "WDPath.h"

diff --git a/Inkpad-Core/Tools/WDSelectionTool.m b/Inkpad-Core/Tools/WDSelectionTool.m
@@ -9,7 +9,6 @@
 //  Copyright (c) 2011-2013 Steve Sprang
 //
 
-#import "WDAbstractPath.h"
 #import "WDBezierNode.h"
 #import "WDCanvas.h"
 #import "WDCanvasController.h"
@@ -18,7 +17,6 @@
 #import "WDDynamicGuideController.h"
 #import "WDDrawingController.h"
 #import "WDFillTransform.h"
-#import "WDPath.h"
 #import "WDPropertyManager.h"
 #import "WDSelectionTool.h"
 #import "WDTextPath.h"

diff --git a/Inkpad-Core/Tools/WDShapeTool.m b/Inkpad-Core/Tools/WDShapeTool.m
@@ -10,10 +10,8 @@
 //
 
 
-#import "WDAbstractPath.h"
 #import "WDBezierNode.h"
 #import "WDCanvas.h"
-#import "WDDrawing.h"
 #import "WDDrawingController.h"
 #import "WDDynamicGuideController.h"
 #import "WDInspectableProperties.h"

diff --git a/Inkpad-Core/Tools/WDTextTool.m b/Inkpad-Core/Tools/WDTextTool.m
@@ -13,7 +13,6 @@
 #import "WDCanvas.h"
 #import "WDCanvasController.h"
 #import "WDColor.h"
-#import "WDDrawing.h"
 #import "WDDrawingController.h"
 #import "WDPath.h"
 #import "WDText.h"

diff --git a/Inkpad-Core/Tools/WDTool.m b/Inkpad-Core/Tools/WDTool.m
@@ -10,7 +10,6 @@
 //
 
 #import "WDCanvas.h"
-#import "WDDrawing.h"
 #import "WDDrawingController.h"
 #import "WDPickResult.h"
 #import "WDTool.h"

diff --git a/Inkpad-Core/livarot/Path.cpp b/Inkpad-Core/livarot/Path.cpp
@@ -8,7 +8,6 @@
 
 #include "Path.h"
 #include "Shape.h"
-#include "MyMath.h"
 #include <math.h>
 
 

diff --git a/Inkpad-Core/livarot/PathConversion.cpp b/Inkpad-Core/livarot/PathConversion.cpp
@@ -8,7 +8,6 @@
 
 #include "Path.h"
 #include "Shape.h"
-#include "MyMath.h"
 
 void            Path::ConvertWithBackData(float treshhold)
 {