[med-svn] [SCM] mricron branch, master, updated. upstream/0.20100725.1.dfsg.1-41-g9699ce7
Michael Hanke
michael.hanke at gmail.com
Mon Nov 8 17:53:03 UTC 2010
The following commit has been merged in the master branch:
commit f3a92a50ba6bcd3e265a10f9d74ccf5344289ac6
Author: Michael Hanke <michael.hanke at gmail.com>
Date: Mon Nov 8 07:38:01 2010 -0500
BF: Revert accidentally applied and commited patch
diff --git a/common/define_types.pas b/common/define_types.pas
index 06faa95..ed56a2c 100644
--- a/common/define_types.pas
+++ b/common/define_types.pas
@@ -17,7 +17,7 @@ interface
SysUtils,classes,IniFiles,
{$IFDEF GUI} forms,userdir,dialogs;{$ELSE} dialogsx;{$ENDIF}
const
- kMRIcronVers = '20 August 2010 (Debian)';
+ kMRIcronVers = '20 August 2010';
NaN : double = 1/0;
kMagicDouble : double = -111666222;
kTxtFilter = 'Text (*.txt)|*.txt;*.csv|Comma Separated (*.csv)|*.csv';
diff --git a/nifti_img_view.pas b/nifti_img_view.pas
index 4bb598f..2792c3b 100644
--- a/nifti_img_view.pas
+++ b/nifti_img_view.pas
@@ -1564,9 +1564,7 @@ begin
LoadMonochromeLUT(lInc,gBGImg,gMRIcroOverlay[kVOIOverlayNum]);
SetBGImgDefaults(gBGImg);
CloseImagesClick(nil);
- // Fixed path on Debian
- //gColorSchemeDir := extractfilepath(paramstr(0))+'lut';
- gColorSchemeDir := '/usr/share/mricron/lut';
+ gColorSchemeDir := extractfilepath(paramstr(0))+'lut';
{$IFNDEF Unix} DragAcceptFiles(Handle, True); //engage drag and drop
{$ENDIF}
UpdateColorSchemes;
@@ -1583,9 +1581,7 @@ begin
YokeMenu.visible := false;
{$ENDIF}
{$ENDIF}
- // Fixed path on Debian
- //gTemplateDir := extractfilepath(paramstr(0))+'templates';
- gTemplateDir := '/usr/share/mricron/templates';
+ gTemplateDir := extractfilepath(paramstr(0))+'templates';
UpdateTemplates;
for lInc := 1 to knMRU do
--
Debian packaging of MRIcron
More information about the debian-med-commit
mailing list