LLVM Analyze corrections

git-svn-id: https://svn.code.sf.net/p/osirix/code/osirix@10948 4e9e6e3d-4551-47eb-9dbe-a6127f9400a1
pixmeo · Feb 16, 2013 · 5d1c3f5 · 5d1c3f5
1 parent eefb88c
commit 5d1c3f5
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 14 deletions.
diff --git a/AYDicomPrint/AYDicomPrintWindowController.mm b/AYDicomPrint/AYDicomPrintWindowController.mm
@@ -519,6 +519,7 @@ - (void) _createPrintjob: (id) object
 	{
 		[self performSelectorOnMainThread: @selector(_setProgressMessage:) withObject: NSLocalizedString( @"Can't write to temporary directory.", nil) waitUntilDone: NO];
 		[images release];
+        [dicomConverter release];
 		[pool release];
 		return;
 	}

diff --git a/CPRController.m b/CPRController.m
@@ -1059,7 +1059,7 @@ - (void) assistedCurvedPath:(NSNotification*) note
         N3AffineTransform patient2VolumeDataTransform = cprVolumeData.volumeTransform;
         N3AffineTransform volumeData2PatientTransform = N3AffineTransformInvert(patient2VolumeDataTransform);
 
-        CPRCurvedPath * newCP = [[CPRCurvedPath alloc] init];
+        CPRCurvedPath * newCP = [[[CPRCurvedPath alloc] init] autorelease];
         N3Vector node;
         OSIVoxel * pt;
 

diff --git a/Camera.m b/Camera.m
@@ -144,7 +144,7 @@ -(NSMutableDictionary*) exportToXML
 
     int i = 0;
     for( NSValue *v in croppingPlanes)
-        [xml setObject: (id) N3PlaneCreateDictionaryRepresentation( [v N3PlaneValue]) forKey: [NSString stringWithFormat: @"croppingPlanes %d", i]];
+        [xml setObject: [(id) N3PlaneCreateDictionaryRepresentation( [v N3PlaneValue]) autorelease] forKey: [NSString stringWithFormat: @"croppingPlanes %d", i]];
 
 	[xml setObject:[NSString stringWithFormat:@"%f",[self fusionPercentage]] forKey:@"fusionPercentage"];
 

diff --git a/DCM Framework/DCMDataContainer.m b/DCM Framework/DCMDataContainer.m
@@ -110,6 +110,8 @@ - (id) initWithData:(NSData *)data
                         else
                             object = self;
                     }
+                    else
+                        free( ptr);
                 }
             }
 
@@ -118,6 +120,9 @@ - (id) initWithData:(NSData *)data
         }
 	}
 
+    if( object == nil)
+        [self autorelease];
+
     return object;
 }
 

diff --git a/OSICoalescedPlanarROI.m b/OSICoalescedPlanarROI.m
@@ -239,8 +239,7 @@ - (OSIFloatVolumeData *)coalescedROIMaskVolumeData
 
         coalescedROIMaskVolumeBytes = malloc(width * height * depth * sizeof(float));
         memset(coalescedROIMaskVolumeBytes, 0, width * height * depth * sizeof(float));
-        _coalescedROIMaskVolumeData = [[OSIFloatVolumeData alloc] initWithFloatBytesNoCopy:coalescedROIMaskVolumeBytes pixelsWide:width pixelsHigh:height pixelsDeep:depth
-                                                                       volumeTransform:coalescedROIMaskVolumeTransform outOfBoundsValue:0 freeWhenDone:YES];
+        _coalescedROIMaskVolumeData = [[OSIFloatVolumeData alloc] initWithFloatBytesNoCopy:coalescedROIMaskVolumeBytes pixelsWide:width pixelsHigh:height pixelsDeep:depth volumeTransform:coalescedROIMaskVolumeTransform outOfBoundsValue:0 freeWhenDone:YES];
 
         for (roi in _sourceROIs) {
             coalescedMask = [roi ROIMaskForFloatVolumeData:_coalescedROIMaskVolumeData];

diff --git a/OSIPlanarBrushROI.m b/OSIPlanarBrushROI.m
@@ -55,8 +55,7 @@ - (id)initWithOsiriXROI:(ROI *)roi pixToDICOMTransfrom:(N3AffineTransform)pixToD
                 }
             }
             volumeTransform = N3AffineTransformConcat(N3AffineTransformInvert(pixToDICOMTransfrom), N3AffineTransformMakeTranslation(-roi.textureUpLeftCornerX, -roi.textureUpLeftCornerY, 0));
-            _brushMask = [[OSIFloatVolumeData alloc] initWithFloatBytesNoCopy:mask pixelsWide:roi.textureWidth pixelsHigh:roi.textureHeight pixelsDeep:1
-                                                              volumeTransform:volumeTransform outOfBoundsValue:0 freeWhenDone:YES];
+            _brushMask = [[OSIFloatVolumeData alloc] initWithFloatBytesNoCopy:mask pixelsWide:roi.textureWidth pixelsHigh:roi.textureHeight pixelsDeep:1 volumeTransform:volumeTransform outOfBoundsValue:0 freeWhenDone:YES];
         } else {
 			[self release];
 			self = nil;

diff --git a/OSIROIFloatPixelData.m b/OSIROIFloatPixelData.m
@@ -231,6 +231,8 @@ - (void)getIntensityMinimum:(float *)minimum firstQuartile:(float *)firstQuartil
     if (maximum) {
         *maximum = sorted[floatCount - 1];
     }
+
+    free( sorted);
 }
 
 - (float)intensityInterQuartileRange

diff --git a/OpenGLScreenReader.m b/OpenGLScreenReader.m
@@ -123,7 +123,7 @@ -(CGImageRef)createRGBImageFromBufferData
     NSAssert( bitmap != NULL, @"CGBitmapContextCreate failure");
 
     // Get rid of color space
-    CFRelease(cSpace);
+//    CFRelease(cSpace);
 
     // Make an image out of our bitmap; does a cheap vm_copy of the  
     // bitmap
@@ -176,6 +176,8 @@ -(id) init
 		NSOpenGLPixelFormat *glPixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes];
 		if (!glPixelFormat)
 		{
+            [self autorelease];
+
 			return nil;
 		}
 

diff --git a/SRController.mm b/SRController.mm
@@ -995,7 +995,7 @@ - (void) add2DPoint: (float) x : (float) y : (float) z
 		if (sliceNumber>=0 && sliceNumber<[[viewer2D pixList] count])
 		{
 			// Create the new 2D Point ROI
-			ROI *new2DPointROI = [[ROI alloc] initWithType: t2DPoint :[firstDCMPix pixelSpacingX] :[firstDCMPix pixelSpacingY] :[DCMPix originCorrectedAccordingToOrientation: firstDCMPix]];
+			ROI *new2DPointROI = [[[ROI alloc] initWithType: t2DPoint :[firstDCMPix pixelSpacingX] :[firstDCMPix pixelSpacingY] :[DCMPix originCorrectedAccordingToOrientation: firstDCMPix]] autorelease];
 			NSRect irect;
 			irect.origin.x = sc[0];
 			irect.origin.y = sc[1];

diff --git a/SeriesView.h b/SeriesView.h
@@ -43,8 +43,8 @@
 
 - (id)initWithFrame:(NSRect)frame seriesRows:(int)rows  seriesColumns:(int)columns;
 
-- (long)tag;
-- (void)setTag:(long)theTag;
+- (NSInteger)tag;
+- (void)setTag:(NSInteger)theTag;
 - (NSMutableArray *)imageViews;
 - (DCMView *)firstView;
 - (void)setImageViewMatrixForRows:(int)rows  columns:(int)columns;

diff --git a/SeriesView.m b/SeriesView.m
@@ -123,11 +123,11 @@ - (BOOL)acceptsFirstResponder {
     return NO;
 }
 
-- (long)tag{
+- (NSInteger)tag{
 	return tag;
 }
 
-- (void)setTag:(long)theTag{
+- (void)setTag:(NSInteger)theTag{
 	tag = theTag;
 }
 

diff --git a/VRController.mm b/VRController.mm
@@ -2271,7 +2271,7 @@ - (void) add2DPoint: (float) x : (float) y : (float) z :(float*) mm :(RGBColor)
 		if (sliceNumber>=0 && sliceNumber<[[viewer2D pixList] count])
 		{
 			// Create the new 2D Point ROI
-			ROI *new2DPointROI = [[ROI alloc] initWithType: t2DPoint :[firstDCMPix pixelSpacingX] :[firstDCMPix pixelSpacingY] :[DCMPix originCorrectedAccordingToOrientation: firstDCMPix]];
+			ROI *new2DPointROI = [[[ROI alloc] initWithType: t2DPoint :[firstDCMPix pixelSpacingX] :[firstDCMPix pixelSpacingY] :[DCMPix originCorrectedAccordingToOrientation: firstDCMPix]] autorelease];
 
             if( rgb.red != 0 && rgb.green != 1 && rgb.blue != 2)
                 new2DPointROI.rgbcolor = rgb;

diff --git a/Window3DController.m b/Window3DController.m
@@ -323,7 +323,7 @@ - (IBAction) updateSetWLWW:(id) sender
 
 - (IBAction) SetWLWW: (id) sender
 {
-	float iwl, iww;
+	float iwl = 2, iww = 2;
 
     [self getWLWW:&iwl :&iww];
 

diff --git a/XMLRPCMethods.mm b/XMLRPCMethods.mm
@@ -154,6 +154,10 @@ +(NSError*)errorWithCode:(NSInteger)code {
  Method: KillOsiriX
  */
 -(void)KillOsiriX:(NSDictionary*)params error:(NSError**)error {
+
+    if( error)
+        *error = nil;
+
     [[AppController sharedAppController] performSelectorOnMainThread:@selector(terminate:) withObject:self waitUntilDone:NO];
 }