Skip to content
Permalink
Browse files

all warnings gone

  • Loading branch information...
aglv committed Jun 24, 2016
1 parent 677de89 commit 24eed4834a65ea8fb82cd469876aa7ad3374100e
Showing with 1,298 additions and 1,197 deletions.
  1. +1 −0 Anonymization.mm
  2. +6 −8 AnonymizationSavePanelController.mm
  3. +7 −2 AnonymizationTagsPopUpButton.h
  4. +18 −10 AnonymizationTagsPopUpButton.mm
  5. +4 −4 AnonymizationTagsView.mm
  6. +1 −0 AnonymizationViewController.mm
  7. +3 −1 AppController.h
  8. +5 −4 AppController.m
  9. +1 −1 Binaries/dcmtk-source/dcmdata/dcdatset.cc
  10. +1 −1 Binaries/dcmtk-source/dcmdata/dcrleccd.cc
  11. +2 −2 Binaries/dcmtk-source/dcmdata/dcswap.cc
  12. +2 −2 Binaries/dcmtk-source/dcmdata/dcvr.cc
  13. +1 −1 Binaries/dcmtk-source/dcmimage/dicmypxt.h
  14. +3 −3 Binaries/dcmtk-source/dcmimage/dicoopxt.h
  15. +2 −2 Binaries/dcmtk-source/dcmimage/dicopxt.h
  16. +1 −1 Binaries/dcmtk-source/dcmimage/dipalpxt.h
  17. +2 −2 Binaries/dcmtk-source/dcmimage/diqtcmap.h
  18. +10 −10 Binaries/dcmtk-source/dcmimage/diqtctab.cc
  19. +4 −4 Binaries/dcmtk-source/dcmimage/diqtctab.h
  20. +1 −1 Binaries/dcmtk-source/dcmimage/diqthash.cc
  21. +1 −1 Binaries/dcmtk-source/dcmimage/diquant.cc
  22. +1 −1 Binaries/dcmtk-source/dcmimage/dirgbpxt.h
  23. +4 −4 Binaries/dcmtk-source/dcmimage/diybrpxt.h
  24. +1 −1 Binaries/dcmtk-source/dcmimgle/dibaslut.cc
  25. +3 −3 Binaries/dcmtk-source/dcmimgle/dicielut.cc
  26. +2 −2 Binaries/dcmtk-source/dcmimgle/didispfn.cc
  27. +4 −4 Binaries/dcmtk-source/dcmimgle/digsdfn.cc
  28. +3 −3 Binaries/dcmtk-source/dcmimgle/digsdlut.cc
  29. +2 −2 Binaries/dcmtk-source/dcmimgle/diinpxt.h
  30. +4 −4 Binaries/dcmtk-source/dcmimgle/diluptab.cc
  31. +5 −5 Binaries/dcmtk-source/dcmimgle/dimoimg.cc
  32. +5 −5 Binaries/dcmtk-source/dcmimgle/dimoopxt.h
  33. +3 −3 Binaries/dcmtk-source/dcmimgle/dimopxt.h
  34. +1 −1 Binaries/dcmtk-source/dcmimgle/diovlimg.cc
  35. +2 −2 Binaries/dcmtk-source/dcmimgle/diovpln.cc
  36. +9 −9 Binaries/dcmtk-source/dcmimgle/discalet.h
  37. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg12/jccolor.c
  38. +6 −6 Binaries/dcmtk-source/dcmjpeg/libijg12/jcdctmgr.c
  39. +5 −5 Binaries/dcmtk-source/dcmjpeg/libijg12/jclhuff.c
  40. +10 −10 Binaries/dcmtk-source/dcmjpeg/libijg12/jcphuff.c
  41. +1 −1 Binaries/dcmtk-source/dcmjpeg/libijg12/jcprepct.c
  42. +3 −3 Binaries/dcmtk-source/dcmjpeg/libijg12/jcsample.c
  43. +7 −7 Binaries/dcmtk-source/dcmjpeg/libijg12/jcshuff.c
  44. +7 −7 Binaries/dcmtk-source/dcmjpeg/libijg12/jdcolor.c
  45. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg12/jdhuff.c
  46. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg12/jdhuff12.h
  47. +1 −1 Binaries/dcmtk-source/dcmjpeg/libijg12/jdlhuff.c
  48. +2 −2 Binaries/dcmtk-source/dcmjpeg/libijg12/jdmerge.c
  49. +3 −3 Binaries/dcmtk-source/dcmjpeg/libijg12/jdphuff.c
  50. +3 −3 Binaries/dcmtk-source/dcmjpeg/libijg12/jdsample.c
  51. +1 −1 Binaries/dcmtk-source/dcmjpeg/libijg12/jdshuff.c
  52. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg12/jquant1.c
  53. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg12/jquant2.c
  54. +2 −2 Binaries/dcmtk-source/dcmjpeg/libijg12/jutils.c
  55. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg16/jccolor.c
  56. +6 −6 Binaries/dcmtk-source/dcmjpeg/libijg16/jcdctmgr.c
  57. +5 −5 Binaries/dcmtk-source/dcmjpeg/libijg16/jclhuff.c
  58. +10 −10 Binaries/dcmtk-source/dcmjpeg/libijg16/jcphuff.c
  59. +1 −1 Binaries/dcmtk-source/dcmjpeg/libijg16/jcprepct.c
  60. +3 −3 Binaries/dcmtk-source/dcmjpeg/libijg16/jcsample.c
  61. +7 −7 Binaries/dcmtk-source/dcmjpeg/libijg16/jcshuff.c
  62. +7 −7 Binaries/dcmtk-source/dcmjpeg/libijg16/jdcolor.c
  63. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg16/jdhuff.c
  64. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg16/jdhuff16.h
  65. +1 −1 Binaries/dcmtk-source/dcmjpeg/libijg16/jdlhuff.c
  66. +2 −2 Binaries/dcmtk-source/dcmjpeg/libijg16/jdmerge.c
  67. +3 −3 Binaries/dcmtk-source/dcmjpeg/libijg16/jdphuff.c
  68. +3 −3 Binaries/dcmtk-source/dcmjpeg/libijg16/jdsample.c
  69. +1 −1 Binaries/dcmtk-source/dcmjpeg/libijg16/jdshuff.c
  70. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg16/jquant1.c
  71. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg16/jquant2.c
  72. +2 −2 Binaries/dcmtk-source/dcmjpeg/libijg16/jutils.c
  73. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg8/jccolor.c
  74. +6 −6 Binaries/dcmtk-source/dcmjpeg/libijg8/jcdctmgr.c
  75. +5 −5 Binaries/dcmtk-source/dcmjpeg/libijg8/jclhuff.c
  76. +10 −10 Binaries/dcmtk-source/dcmjpeg/libijg8/jcphuff.c
  77. +1 −1 Binaries/dcmtk-source/dcmjpeg/libijg8/jcprepct.c
  78. +3 −3 Binaries/dcmtk-source/dcmjpeg/libijg8/jcsample.c
  79. +7 −7 Binaries/dcmtk-source/dcmjpeg/libijg8/jcshuff.c
  80. +7 −7 Binaries/dcmtk-source/dcmjpeg/libijg8/jdcolor.c
  81. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg8/jdhuff.c
  82. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg8/jdhuff8.h
  83. +1 −1 Binaries/dcmtk-source/dcmjpeg/libijg8/jdlhuff.c
  84. +2 −2 Binaries/dcmtk-source/dcmjpeg/libijg8/jdmerge.c
  85. +3 −3 Binaries/dcmtk-source/dcmjpeg/libijg8/jdphuff.c
  86. +3 −3 Binaries/dcmtk-source/dcmjpeg/libijg8/jdsample.c
  87. +1 −1 Binaries/dcmtk-source/dcmjpeg/libijg8/jdshuff.c
  88. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg8/jquant1.c
  89. +4 −4 Binaries/dcmtk-source/dcmjpeg/libijg8/jquant2.c
  90. +2 −2 Binaries/dcmtk-source/dcmjpeg/libijg8/jutils.c
  91. +2 −2 Binaries/dcmtk-source/dcmqrdb/dcmqrcbg.mm
  92. +7 −7 Binaries/dcmtk-source/dcmqrdb/dcmqrcbm.mm
  93. +3 −2 Binaries/dcmtk-source/dcmqrdb/dcmqrdbq.mm
  94. +8 −8 Binaries/dcmtk-source/ofstd/ofstd.cc
  95. +3 −3 BrowserController+Sources.m
  96. +80 −84 BrowserMatrix.m
  97. +7 −8 CLUTOpacityView.mm
  98. +73 −60 CPRController.m
  99. +2 −2 CPRStraightenedView.m
  100. +3 −3 CPRStretchedView.m
  101. +2 −2 CPRTransverseView.m
  102. +1 −1 CPRView.m
  103. +1 −1 DCM Framework/DCMDataContainer.m
  104. +1 −1 DCM Framework/DCMObject.m
  105. +1 −1 DCM Framework/DCMPixelDataAttributeJPEG16.m
  106. +3 −3 DCM Framework/DCMPixelDataAttributeJPEG8.m
  107. +1 −1 DCM Framework/DCMValueRepresentation.m
  108. +6 −6 DCMPix.m
  109. +1 −1 DCMTKQueryNode.mm
  110. +6 −6 DCMTKStoreSCU.mm
  111. +7 −7 DCMView.m
  112. +1 −1 DICOMToNSString.h
  113. +1 −1 DICOMToNSString.m
  114. +3 −3 DefaultsOsiriX.m
  115. +6 −6 DicomDatabase+Clean.mm
  116. +1 −1 DicomDatabase+Scan.mm
  117. +42 −45 DicomDatabase.mm
  118. +3 −3 DicomFileDCMTKCategory.mm
  119. +2 −1 DicomStudy+Report.mm
  120. +2 −3 EndoscopyMPRView.m
  121. +4 −4 FVTiff.m
  122. +2 −2 FlyAssistant.mm
  123. +20 −12 Horos.xcodeproj/project.pbxproj
  124. +1 −1 Info.plist
  125. +17 −26 LetsMoveAndDock/NSString+SymlinksAndAliases.m
  126. +39 −32 MPRController.m
  127. +5 −5 NIfTI_Library/nifti1_io.c
  128. +7 −2 O2DicomPredicateEditorView.h
  129. +38 −21 O2DicomPredicateEditorView.m
  130. +1 −1 O2ViewerThumbnailsMatrix.h
  131. +20 −24 O2ViewerThumbnailsMatrix.mm
  132. +1 −1 OnOffSwitchControlCell.m
  133. +4 −4 OrthogonalMPRPETCTViewer.m
  134. +4 −8 OrthogonalMPRViewer.m
  135. +4 −4 OrthogonalReslice.m
  136. +29 −29 OsiriXSCPDataHandler.mm
  137. +7 −0 PluginFilter.h
  138. +1 −1 PluginManager.h
  139. +6 −26 PluginManager.m
  140. +1 −1 Preference Panes/AYDicomPrintPreferencePane/AYDicomPrintPref.m
  141. +1 −1 Preference Panes/OSI3DPreferencePane/OSI3DPreferencePane.mm
  142. +1 −1 Preference Panes/OSIAutoroutingPreferencePane/OSIAutoroutingPreferencePanePref.m
  143. +9 −12 Preference Panes/OSICDPreferencePane/OSICDPreferencePanePref.m
  144. +27 −27 Preference Panes/OSICustomImageAnnotations/CIALayoutController.m
  145. +31 −27 Preference Panes/OSICustomImageAnnotations/OSICustomImageAnnotations.m
  146. +36 −36 Preference Panes/OSIDatabasePreferencePane/OSIDatabasePreferencePanePref.m
  147. +1 −1 Preference Panes/OSIGeneralPreferencePane/OSIGeneralPreferencePanePref.m
  148. +1 −1 Preference Panes/OSIHangingPreferencePane/OSIHangingPreferencePanePref.m
  149. +1 −1 Preference Panes/OSIHotKeysPreferencePane/OSIHotKeysPref.m
  150. +2 −2 Preference Panes/OSIListenerPreferencePane/OSIListenerPreferencePanePref.mm
  151. +47 −30 Preference Panes/OSILocationsPreferencePane/OSILocationsPreferencePanePref.m
  152. +1 −1 Preference Panes/OSIPACSOnDemandPreferencePane/OSIPACSOnDemandPreferencePane.m
  153. +1 −1 Preference Panes/OSIPETPreferencePane/OSIPETPreferencePane.m
  154. +1 −1 Preference Panes/OSIViewerPreferencePane/OSIViewerPreferencePanePref.m
  155. +1 −1 Preference Panes/OSIWebSharingPreferencePane/OSIWebSharingPreferencePanePref.mm
  156. +7 −1 PreferencesWindowController.mm
  157. +1 −4 QuicktimeExport.m
  158. +1 −2 ROIVolumeView.mm
  159. +15 −15 RemoteDicomDatabase.mm
  160. +2 −1 Reports.m
  161. +5 −1 SFHorosAuthorizationView.h
  162. +3 −5 SRController.mm
  163. +3 −3 VRController.mm
  164. +1 −1 ViewerController.h
  165. +14 −15 ViewerController.m
  166. +1 −1 WADODownload.m
  167. +2 −0 WebPortal+Email+Log.h
  168. +7 −1 WebPortal.mm
  169. +2 −2 WebPortalConnection+Data.mm
  170. +6 −6 WebPortalConnection.mm
  171. +2 −2 Window3DController.m
  172. +1 −1 browserController.h
  173. +118 −99 browserController.m
  174. +1 −1 cocoahttpserver/HTTPAsyncFileResponse.m
  175. +1 −1 nitrogen/Sources/ISO8601DateFormatter.m
  176. +2 −0 nitrogen/Sources/N2CellDescriptor.h
  177. +1 −1 nitrogen/Sources/N2ColumnLayout.h
  178. +1 −1 nitrogen/Sources/N2ColumnLayout.mm
  179. +1 −0 nitrogen/Sources/N2Layout.h
  180. +1 −0 nitrogen/Sources/N2Panel.h
  181. +4 −3 nitrogen/Sources/N2PopUpMenu.mm
  182. +6 −5 nitrogen/Sources/N2Step.h
  183. +5 −5 nitrogen/Sources/N2Step.mm
  184. +1 −0 nitrogen/Sources/N2StepView.h
  185. +8 −7 nitrogen/Sources/N2Steps.h
  186. +3 −3 nitrogen/Sources/N2Steps.mm
  187. +1 −0 nitrogen/Sources/N2StepsView.h
  188. +13 −9 nitrogen/Sources/N2Task.h
  189. +1 −0 nitrogen/Sources/N2View.h
  190. +6 −0 nitrogen/Sources/N2View.mm
  191. +1 −1 nitrogen/Sources/N2WebServiceClient.mm
  192. +1 −0 nitrogen/Sources/N2Window.h
  193. +1 −1 nitrogen/Sources/N2XMLRPC.mm
  194. +1 −1 nitrogen/Sources/N2XMLRPCConnection.mm
  195. +2 −2 nitrogen/Sources/N3Geometry.m
  196. +4 −1 nitrogen/Sources/NSBitmapImageRep+N2.mm
  197. +3 −5 nitrogen/Sources/NSButton+N2.mm
  198. +6 −6 nitrogen/Sources/NSFileManager+N2.h
  199. +15 −8 nitrogen/Sources/NSFileManager+N2.mm
  200. +6 −3 nitrogen/Sources/NSImage+N2.mm
  201. +1 −1 nitrogen/Sources/NSInvocation+N2.mm
  202. +1 −1 nitrogen/Sources/NSString+N2.h
  203. +19 −28 nitrogen/Sources/NSString+N2.mm
  204. +1 −1 nitrogen/Sources/SMTPClient.m
@@ -52,6 +52,7 @@ This file is part of the Horos Project (www.horosproject.org)
#import "XMLControllerDCMTKCategory.h"
#import "N2Debug.h"
#import "libGDCM.h"
#import "NSUserDefaultsController+N2.h"

static NSString *templateDicomFile = nil;

@@ -63,14 +63,12 @@ -(IBAction)actionOk:(NSView*)sender {
panel.message = NSLocalizedString(@"Select the location where to export the DICOM files:", NULL);
panel.prompt = NSLocalizedString(@"Choose", NULL);
// TODO: save and reuse location
[panel beginSheetForDirectory:NULL file:NULL modalForWindow:self.window modalDelegate:self didEndSelector:@selector(saveAsSheetDidEnd:returnCode:contextInfo:) contextInfo:NULL];
}

-(void)saveAsSheetDidEnd:(NSOpenPanel*)sheet returnCode:(NSInteger)returnCode contextInfo:(void*)contextInfo {
if (returnCode == 1) {
self.outputDir = [sheet.filenames objectAtIndex:0];
[NSApp endSheet:self.window];
}
[panel beginSheet:self.window completionHandler:^(NSModalResponse returnCode) {
if (returnCode != NSFileHandlingPanelOKButton)
return;

self.outputDir = [panel.URL path];
}];
}

-(IBAction)actionAdd:(NSView*)sender {
@@ -37,12 +37,17 @@
@class DCMAttributeTag;

@interface AnonymizationTagsPopUpButton : NSPopUpButton {
DCMAttributeTag* selectedTag;
DCMAttributeTag* selectedDCMAttributeTag;
}

+(NSMenu*)tagsMenu;
+(NSMenu*)tagsMenuWithTarget:(id)obj action:(SEL)action;

@property(retain,nonatomic) DCMAttributeTag* selectedTag;
@property (retain,nonatomic) DCMAttributeTag* selectedDCMAttributeTag;

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wincompatible-property-type"
@property(retain,nonatomic) DCMAttributeTag* selectedTag NS_UNAVAILABLE;
#pragma clang diagnostv pop

@end
@@ -46,7 +46,7 @@ This file is part of the Horos Project (www.horosproject.org)

@implementation AnonymizationTagsPopUpButton

@synthesize selectedTag;
@synthesize selectedDCMAttributeTag;

NSInteger CompareDCMAttributeTagNames(id lsp, id rsp, void* context) {
return [[lsp name] caseInsensitiveCompare: [rsp name]];
@@ -163,14 +163,14 @@ -(id)initWithFrame:(NSRect)frame {
extraItem.target = self;
[self.menu addItem:extraItem];

self.selectedTag = NULL;
self.selectedDCMAttributeTag = NULL;

return self;
}

-(void)customMenuItemAction:(id)sender {
AnonymizationCustomTagPanelController* panelController = [[AnonymizationCustomTagPanelController alloc] init];
[panelController setAttributeTag:self.selectedTag];
[panelController setAttributeTag:self.selectedDCMAttributeTag];
[NSApp beginSheet:panelController.window modalForWindow:self.window modalDelegate:self didEndSelector:@selector(addCustomTagPanelDidEnd:returnCode:contextInfo:) contextInfo:panelController];
[panelController.window orderFront:self];
}
@@ -179,20 +179,20 @@ -(void)addCustomTagPanelDidEnd:(NSPanel*)panel returnCode:(NSInteger)returnCode
AnonymizationCustomTagPanelController* panelController = (id)contextInfo;

if (returnCode == NSRunStoppedResponse) {
[self setSelectedTag:[panelController attributeTag]];
[self setSelectedDCMAttributeTag:[panelController attributeTag]];
}

[panel close];
[panelController release];
}

-(void)tagsMenuItemSelectedAction:(NSMenuItem*)menuItem {
[self setSelectedTag:menuItem.representedObject];
[self setSelectedDCMAttributeTag:menuItem.representedObject];
}

-(void)setSelectedTag:(DCMAttributeTag*)tag {
[selectedTag release];
selectedTag = [tag retain];
-(void)setSelectedDCMAttributeTag:(DCMAttributeTag*)tag {
[selectedDCMAttributeTag release];
selectedDCMAttributeTag = [tag retain];

[self didChangeValueForKey:@"title"];

@@ -203,10 +203,10 @@ -(void)setSelectedTag:(DCMAttributeTag*)tag {
subitem.state = tag && [subitem.representedObject isEqual:tag];
}

[self.cell setDisplayedTitle: selectedTag? (selectedTag.name? [NSString stringWithFormat:@"%@ - %@", selectedTag.name, selectedTag.stringValue] : selectedTag.stringValue) : NSLocalizedString(@"Select a DICOM tag...", NULL) ];
[self.cell setDisplayedTitle: selectedDCMAttributeTag? (selectedDCMAttributeTag.name? [NSString stringWithFormat:@"%@ - %@", selectedDCMAttributeTag.name, selectedDCMAttributeTag.stringValue] : selectedDCMAttributeTag.stringValue) : NSLocalizedString(@"Select a DICOM tag...", NULL) ];
[self setNeedsDisplay:YES];

[self didChangeValueForKey:@"selectedTag"];
[self didChangeValueForKey:@"selectedDCMAttributeTag"];
}

- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
@@ -233,4 +233,12 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
return YES;
}

- (DCMAttributeTag *)selectedTag {
return self.selectedDCMAttributeTag;
}

- (void)setSelectedTag:(DCMAttributeTag *)tag {
[self setSelectedDCMAttributeTag:tag];
}

@end
@@ -74,10 +74,10 @@ -(NSArray*)groupForObject:(id)object {
}

-(void)addButtonAction:(NSButton*)sender {
[anonymizationViewController addTag:dcmTagsPopUpButton.selectedTag];
[[anonymizationViewController.tagsView checkBoxForObject:dcmTagsPopUpButton.selectedTag] setState:NSOnState];
[self.window makeFirstResponder:[anonymizationViewController.tagsView textFieldForObject:dcmTagsPopUpButton.selectedTag]];
[dcmTagsPopUpButton setSelectedTag:NULL];
[anonymizationViewController addTag:dcmTagsPopUpButton.selectedDCMAttributeTag];
[[anonymizationViewController.tagsView checkBoxForObject:dcmTagsPopUpButton.selectedDCMAttributeTag] setState:NSOnState];
[self.window makeFirstResponder:[anonymizationViewController.tagsView textFieldForObject:dcmTagsPopUpButton.selectedDCMAttributeTag]];
[dcmTagsPopUpButton setSelectedDCMAttributeTag:NULL];
}

-(void)rmButtonAction:(NSButton*)sender {
@@ -40,6 +40,7 @@ This file is part of the Horos Project (www.horosproject.org)
#import "N2AdaptiveBox.h"
#import "N2TextField.h"
#import "N2CustomTitledPopUpButtonCell.h"
#import "NSUserDefaultsController+N2.h"
#include <cmath>
#include <algorithm>

@@ -181,7 +181,7 @@ extern AppController* OsiriX;
+ (void) resizeWindowWithAnimation:(NSWindow*) window newSize: (NSRect) newWindowFrame;
+ (void) pause __deprecated;
+ (ThumbnailsListPanel*)thumbnailsListPanelForScreen:(NSScreen*)screen;
+ (NSString*)printStackTrace:(NSException*)e __deprecated; // use -[NSException printStackTrace] form NSException+N2
+ (NSString*)printStackTrace:(NSException*)e __deprecated; // use -[NSException printStackTrace] from NSException+N2
+ (BOOL) isKDUEngineAvailable;

#pragma mark-
@@ -305,5 +305,7 @@ extern AppController* OsiriX;

- (void)playGrabSound;

- (void)displayError:(NSString *)err;

@end

@@ -101,6 +101,7 @@ This file is part of the Horos Project (www.horosproject.org)
#import "SRAnnotation.h"
#import "Reports.h"
#import "WebPortalDatabase.h"
#import "NSString+SymlinksAndAliases.h"
#include <OpenGL/OpenGL.h>

#include <kdu_OsiriXSupport.h>
@@ -982,7 +983,7 @@ - (void) installPlugins: (NSArray*) pluginsArray

NSString *pluginBundleName = [[path lastPathComponent] stringByDeletingPathExtension];

NSURL *bundleURL = [NSURL fileURLWithPath: [PluginManager pathResolved:path]];
NSURL *bundleURL = [NSURL fileURLWithPath:path.stringByResolvingAlias];
CFDictionaryRef bundleInfoDict = CFBundleCopyInfoDictionaryInDirectory((CFURLRef)bundleURL);

CFStringRef versionString = nil;
@@ -1061,7 +1062,7 @@ - (NSString *)computerName

- (NSString*) privateIP
{
return [NSString stringWithCString:GetPrivateIP() encoding:NSUTF8StringEncoding];
return [NSString stringWithUTF8String:GetPrivateIP()];
}

- (IBAction)cancelModal:(id)sender
@@ -1159,7 +1160,7 @@ - (void) setAETitleToHostname
{
char s[_POSIX_HOST_NAME_MAX+1];
gethostname(s,_POSIX_HOST_NAME_MAX);
NSString *c = [NSString stringWithCString:s encoding:NSUTF8StringEncoding];
NSString *c = [NSString stringWithUTF8String:s];
NSRange range = [c rangeOfString: @"."];
if( range.location != NSNotFound) c = [c substringToIndex: range.location];

@@ -2752,7 +2753,7 @@ - (id)init
#endif
[[NSFileManager defaultManager] removeItemAtPath:[[NSFileManager defaultManager] tmpDirPath] error:NULL];

if ([[NSFileManager defaultManager] fileExistsAtPath:[[[[NSFileManager defaultManager] findSystemFolderOfType:kApplicationSupportFolderType forDomain:kLocalDomain] stringByAppendingPathComponent:[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleNameKey]] stringByAppendingPathComponent:@"DLog.enable"]])
if ([[NSFileManager defaultManager] fileExistsAtPath:[[[[[[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSLocalDomainMask] firstObject] path] stringByAppendingPathComponent:[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleNameKey]] stringByAppendingPathComponent:@"DLog.enable"]])
[N2Debug setActive:YES];

// NSLog(@"%@ -> %d", [[[[NSFileManager defaultManager] findSystemFolderOfType:kApplicationSupportFolderType forDomain:kLocalDomain] stringByAppendingPathComponent:[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleNameKey]] stringByAppendingPathComponent:@"DLog.enable"], [N2Debug isActive]);
@@ -115,7 +115,7 @@ OFBool DcmDataset::canWriteXfer(const E_TransferSyntax newXfer,
//First : GE private group...
delete remove( DcmTagKey( 0x0009, 0x1110)); // "GEIIS" The problematic private group, containing a *always* JPEG compressed PixelData

register E_TransferSyntax originalXfer = Xfer;
E_TransferSyntax originalXfer = Xfer;
if (newXfer == EXS_Unknown)
return OFFalse;
if (Xfer == EXS_Unknown)
@@ -199,7 +199,7 @@ OFCondition DcmRLECodecDecoder::decode(
// temporary variables
Uint32 sample = 0;
Uint32 byte = 0;
register Uint32 pixel = 0;
Uint32 pixel = 0;

// for each stripe in stripe set
for (i=0; (i<numberOfStripes) && result.good(); ++i)
@@ -99,7 +99,7 @@ void swapBytes(void * value, const Uint32 byteLength,
{
Uint8 * first = &OFstatic_cast(Uint8*, value)[0];
Uint8 * second = &OFstatic_cast(Uint8*, value)[1];
register Uint32 times = byteLength/2;
Uint32 times = byteLength/2;
while(times--)
{
save = *first;
@@ -112,7 +112,7 @@ void swapBytes(void * value, const Uint32 byteLength,
/* if valWidth is greater than 2, swap correspondingly */
else if (valWidth > 2)
{
register size_t i;
size_t i;
const size_t halfWidth = valWidth/2;
const size_t offset = valWidth-1;
Uint8 *start;
@@ -212,8 +212,8 @@ DcmVR::setVR(const char* vrName)
* letters as "real" future VRs (and thus assume extended length).
* All other VR strings are treated as "illegal" VRs.
*/
register char c1 = *vrName;
register char c2 = (c1)?(*(vrName+1)):('\0');
char c1 = *vrName;
char c2 = (c1)?(*(vrName+1)):('\0');
if ((c1=='?')&&(c2=='?')) vr = EVR_UNKNOWN2B;
if (!found && ((c1<'A')||(c1>'Z')||(c2<'A')||(c2>'Z'))) vr = EVR_UNKNOWN2B;
}
@@ -139,7 +139,7 @@ class DiCMYKPixelTemplate
else
{
T1 k;
register int j;
int j;
unsigned int i;
for (i = 0; i < count; ++i)
{
@@ -192,7 +192,7 @@ class DiColorOutputPixelTemplate
{
T2 *p = Data;
unsigned int i;
register int j;
int j;
for (i = FrameSize; i != 0; --i)
for (j = 3; j != 0; --j)
stream << OFstatic_cast(unsigned int, *(p++)) << " "; // typecast to resolve problems with 'char'
@@ -213,7 +213,7 @@ class DiColorOutputPixelTemplate
{
T2 *p = Data;
unsigned int i;
register int j;
int j;
for (i = FrameSize; i != 0; --i)
for (j = 3; j != 0; --j)
fprintf(stream, "%u ", OFstatic_cast(unsigned int, *(p++)));
@@ -342,7 +342,7 @@ class DiColorOutputPixelTemplate
}
else /* not planar */
{
register int j;
int j;
if (bits1 == bits2)
{
/* invert output data */
@@ -339,7 +339,7 @@ class DiColorPixelTemplate
data = new Uint32[count];
if (data != NULL)
{
register Uint32 *q = OFstatic_cast(Uint32 *, data);
Uint32 *q = OFstatic_cast(Uint32 *, data);
if (fromBits == toBits)
{
/* copy pixel data as is */
@@ -442,7 +442,7 @@ class DiColorPixelTemplate
const T *r = Data[0] + start;
const T *g = Data[1] + start;
const T *b = Data[2] + start;
register Uint32 *q = OFstatic_cast(Uint32 *, data);
Uint32 *q = OFstatic_cast(Uint32 *, data);
unsigned int i;
if (fromBits == toBits)
{
@@ -108,7 +108,7 @@ class DiPalettePixelTemplate
const T1 *p = pixel;
T2 value = 0;
unsigned int i;
register int j;
int j;
// use the number of input pixels derived from the length of the 'PixelData'
// attribute), but not more than the size of the intermediate buffer
const unsigned int count = (this->InputCount < this->Count) ? this->InputCount : this->Count;
@@ -93,9 +93,9 @@ class DcmQuantColorMapping
long limitcol;
long col; // must be signed!
long maxval_l = OFstatic_cast(long, maxval);
register int ind;
int ind;
const DcmQuantComponent *currentpixel;
register DcmQuantComponent cr, cg, cb;
DcmQuantComponent cr, cg, cb;

// create scale table
DcmQuantScaleTable scaletable;
@@ -152,7 +152,7 @@ OFCondition DcmQuantColorTable::medianCut(
for (unsigned int xx=0; xx < numberOfColors; xx++) array[xx] = new DcmQuantHistogramItem();
numColors = numberOfColors;

register int i;
int i;
unsigned int bi;
DcmQuantPixelBoxArray bv(numberOfColors);

@@ -165,9 +165,9 @@ OFCondition DcmQuantColorTable::medianCut(
// Main loop: split boxes until we have enough.
while ( boxes < numberOfColors )
{
register int indx, clrs;
int indx, clrs;
unsigned int sm;
register int minr, maxr, ming, maxg, minb, maxb, v;
int minr, maxr, ming, maxg, minb, maxb, v;
unsigned int halfsum, lowersum;

// Find the first splittable box.
@@ -270,9 +270,9 @@ OFCondition DcmQuantColorTable::medianCut(
{
for ( bi = 0; bi < boxes; ++bi )
{
register int indx = bv[bi].ind;
register int clrs = bv[bi].colors;
register int minr, maxr, ming, maxg, minb, maxb, v;
int indx = bv[bi].ind;
int clrs = bv[bi].colors;
int minr, maxr, ming, maxg, minb, maxb, v;

minr = maxr = histogram.array[indx]->getRed();
ming = maxg = histogram.array[indx]->getGreen();
@@ -296,8 +296,8 @@ OFCondition DcmQuantColorTable::medianCut(
{
for ( bi = 0; bi < boxes; ++bi )
{
register int indx = bv[bi].ind;
register int clrs = bv[bi].colors;
int indx = bv[bi].ind;
int clrs = bv[bi].colors;
long r = 0, g = 0, b = 0;

for ( i = 0; i < clrs; ++i )
@@ -316,8 +316,8 @@ OFCondition DcmQuantColorTable::medianCut(
{
for ( bi = 0; bi < boxes; ++bi )
{
register int indx = bv[bi].ind;
register int clrs = bv[bi].colors;
int indx = bv[bi].ind;
int clrs = bv[bi].colors;
unsigned int r = 0, g = 0, b = 0, sumVal = 0;

for ( i = 0; i < clrs; ++i )
Oops, something went wrong.

0 comments on commit 24eed48

Please sign in to comment.
You can’t perform that action at this time.