sprang · lopesval · Apr 30, 2014 · Apr 30, 2014 · Apr 30, 2014
diff --git a/Classes/WDCanvasController.h b/Classes/WDCanvasController.h
@@ -11,8 +11,6 @@
 
 #import <UIKit/UIKit.h>
 #import "WDActionSheet.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"

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/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/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/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)
 {

diff --git a/Inkpad-Core/livarot/ShapeSweep.cpp b/Inkpad-Core/livarot/ShapeSweep.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "Shape.h"
-#include "LivarotDefs.h"
 #include "MyMath.h"
 
 

diff --git a/Inkpad-Core/livarot/ShapeSweepUtils.cpp b/Inkpad-Core/livarot/ShapeSweepUtils.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "Shape.h"
-#include "LivarotDefs.h"
 #include "MyMath.h"
 
 SweepEvent::SweepEvent()

diff --git a/Openclipart/OCAThumbnailCell.m b/Openclipart/OCAThumbnailCell.m
@@ -11,7 +11,6 @@
 
 #import "OCAThumbnailCell.h"
 #import "OCAEntry.h"
-#import "OCAThumbnailCache.h"
 #import "UIView+Additions.h"
 
 @interface OCAThumbnailCell ()
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ @@
      */
     #include "Shape.h"
-    #include "LivarotDefs.h"
     #include "MyMath.h"
@@ Expand Down @@