Fixed some potential crashes/leaks, added scan enable/disable code

Author: psiroki

English.lproj/VertexDocument.xib

@@ -21,7 +21,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="100023"/>
+			<integer value="5"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -174,7 +174,7 @@
 											<string key="NSFrameSize">{599, 300}</string>
 											<reference key="NSSuperview" ref="808025513"/>
 											<bool key="NSViewIsLayerTreeHost">YES</bool>
-											<float key="zoomFactor">0.18125000596046448</float>
+											<float key="zoomFactor">1</float>
 											<float key="rotationAngle">0.0</float>
 											<string key="currentToolMode">IKToolModeNone</string>
 											<bool key="autoresizes">NO</bool>
@@ -202,7 +202,7 @@
 										<object class="NSButton" id="209450221">
 											<reference key="NSNextResponder" ref="190226495"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{109, 4}, {118, 25}}</string>
+											<string key="NSFrame">{{90, 4}, {137, 25}}</string>
 											<reference key="NSSuperview" ref="190226495"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="902948351">
@@ -463,7 +463,7 @@
 																	<string>public.url</string>
 																</object>
 															</object>
-															<string key="NSFrameSize">{326, 28}</string>
+															<string key="NSFrame">{{0, 14}, {326, 14}}</string>
 															<reference key="NSSuperview" ref="246688413"/>
 															<object class="NSTextContainer" key="NSTextContainer" id="728819784">
 																<object class="NSLayoutManager" key="NSLayoutManager">
@@ -859,6 +859,14 @@
 					</object>
 					<int key="connectionID">100093</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">scanButton</string>
+						<reference key="source" ref="512844837"/>
+						<reference key="destination" ref="209450221"/>
+					</object>
+					<int key="connectionID">100094</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1385,7 +1393,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">100093</int>
+			<int key="maxID">100094</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1418,6 +1426,7 @@
 							<string>imageView</string>
 							<string>resultTextView</string>
 							<string>rowsTextField</string>
+							<string>scanButton</string>
 							<string>stylePopUpButton</string>
 							<string>typePopUpButton</string>
 							<string>variableTextField</string>
@@ -1428,6 +1437,7 @@
 							<string>IKImageView</string>
 							<string>NSTextView</string>
 							<string>NSTextField</string>
+							<string>NSButton</string>
 							<string>NSPopUpButton</string>
 							<string>NSPopUpButton</string>
 							<string>NSTextField</string>

VertexDocument.h

@@ -22,6 +22,8 @@
 	IBOutlet NSPopUpButton *typePopUpButton;
 	IBOutlet NSPopUpButton *stylePopUpButton;
 
+	IBOutlet NSButton *scanButton;
+	
 	ImageViewGridLayer *gridLayer;
 	// each row has columns, each column has points
 	NSMutableArray *pointMatrix;

VertexDocument.m

@@ -49,6 +49,7 @@ - (void)windowControllerDidLoadNib:(NSWindowController *) aController
 	[gridLayer setNeedsDisplay];
 
 	[imageView setOverlay:gridLayer forType:IKOverlayTypeImage];
+	[scanButton setEnabled:NO];
 }
 
 - (NSData *)dataOfType:(NSString *)typeName error:(NSError **)outError
@@ -84,6 +85,10 @@ - (IBAction)updateGrid:(id)sender
 	int rows = [[rowsTextField stringValue] intValue];
 	int cols = [[colsTextField stringValue] intValue];
 
+	BOOL enabled = (rows > 0 && cols > 0);
+	NSLog(@"Matrix: %d %d", rows, cols);
+	[scanButton setEnabled:enabled];
+	
 
 	if (rows <= 50 && cols <= 50 && (rows != gridLayer.rows || cols != gridLayer.cols)) {
 		//reset our array
@@ -104,13 +109,21 @@ - (IBAction)updateGrid:(id)sender
 }
 - (IBAction)scanImage:(id)sender
 {
+	NSLog(@"Image properties: %@", [imageView imageProperties]);
 	[self updateGrid:sender];
+
 	CGImageRef img = [imageView image];
 	size_t width = CGImageGetWidth(img);
 	size_t height = CGImageGetHeight(img);
 	size_t pitch = CGImageGetBytesPerRow(img);
-	CFDataRef dataRef = CGDataProviderCopyData(CGImageGetDataProvider(img));
-	const UInt8 *data = CFDataGetBytePtr(dataRef);
+	
+	UInt8 *bits = (UInt8*)malloc(width * height * 4);
+	CGContextRef textureContext = CGBitmapContextCreate(bits, width, height, 8, width*4,
+													  CGImageGetColorSpace(img), kCGImageAlphaPremultipliedLast);
+	CGContextDrawImage(textureContext, CGRectMake(0.0, 0.0, (CGFloat)width, (CGFloat)height), img);
+	CGContextRelease(textureContext);
+	
+	const UInt8 *data = bits;
 	int cellWidth = (width / gridLayer.cols);
 	int cellHeight = (height / gridLayer.rows);
 
@@ -127,7 +140,7 @@ - (IBAction)scanImage:(id)sender
 			// so data will point to the last row
 			cell.data = data+(height-1)*pitch;
 			// also offset it by the coordinates of the cell
-			cell.data += (cx*cellWidth*4)+(cy*cellHeight*pitch);
+			cell.data += (cx*cellWidth*4)+(cy*cellHeight*(-pitch));
 			Vec2Array points;
 			findPoints(&cell, &points);
 			if(points.count > 0)
@@ -142,8 +155,11 @@ - (IBAction)scanImage:(id)sender
 					[arr addObject:[NSValue valueWithPoint:NSMakePoint(p.x, p.y)]];
 				}
 			}
+			if(points.points)
+				free(points.points);
 		}
 	}
+	free(bits);
 	[gridLayer setNeedsDisplay];
 	[self updateResultTextField];
 }

VertexScanner.mm

@@ -6,7 +6,7 @@
  *
  */
 
-#define VERBOSE
+//#define VERBOSE
 
 #ifdef VERBOSE
 #import <Foundation/Foundation.h>
@@ -66,6 +66,9 @@ static Vec2 normalize(const Vec2 &a)
 
 static vector<Vec2> removeDuplicates(vector<Vec2> &points)
 {
+	if(points.size() <= 0)
+		return points;
+	
 	vector<Vec2> result;
 	Vec2 last = *(points.end()-1);
 	for(int i=0; i<points.size(); i++)
@@ -90,6 +93,9 @@ inline bool isConvex(float sineOfAngle)
 
 static vector<Vec2> makeConvex(vector<Vec2> &points)
 {
+	if(points.size() <= 0)
+		return points;
+
 	vector<Vec2> convex;
 	convex.push_back(points[0]);
 	convex.push_back(points[1]);