r2090: *** empty log message ***

diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp
index 7976adc0253a4c9241498748d18858480a1790ed..d8f5deb9d2d58246aa57e91e9ed353933a3461c7 100644 (file)
--- a/src/dlgprojections.cpp
+++ b/src/dlgprojections.cpp
@@ -9,7 +9,7 @@
  **  This is part of the CTSim program
  **  Copyright (c) 1983-2001 Kevin Rosenberg
  **
  **  This is part of the CTSim program
  **  Copyright (c) 1983-2001 Kevin Rosenberg
  **

- **  $Id: dlgprojections.cpp,v 1.25 2002/05/05 14:22:44 kevin Exp $
+ **  $Id: dlgprojections.cpp,v 1.26 2002/05/30 06:27:46 kevin Exp $

  **
  **  This program is free software; you can redistribute it and/or modify
  **  it under the terms of the GNU General Public License (version 2) as
  **
  **  This program is free software; you can redistribute it and/or modify
  **  it under the terms of the GNU General Public License (version 2) as


@@ -104,8 +104,8 @@ BEGIN_EVENT_TABLE(ProjectionsDialog, wxDialog)
        
   wxSize sizeDlg (500,500);
   if (sizeDlg.x != sizeDlg.y) {
        
   wxSize sizeDlg (500,500);
   if (sizeDlg.x != sizeDlg.y) {

-    sizeDlg.x = max(sizeDlg.x,sizeDlg.y);
-    sizeDlg.y = max(sizeDlg.x,sizeDlg.y);
+    sizeDlg.x = imax(sizeDlg.x,sizeDlg.y);
+    sizeDlg.y = imax(sizeDlg.x,sizeDlg.y);

   }
   if (m_iTrace >= Trace::TRACE_PLOT)
     sizeDlg.x += 250;
   }
   if (m_iTrace >= Trace::TRACE_PLOT)
     sizeDlg.x += 250;

diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp
index 093586bedc8552631c9b46a9b42c773b8a1f1c94..ee420c457cdba5c7cb15a0ce7fc56002c52e1f99 100644 (file)
--- a/src/dlgreconstruct.cpp
+++ b/src/dlgreconstruct.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **

-**  $Id: dlgreconstruct.cpp,v 1.18 2001/02/22 11:05:38 kevin Exp $
+**  $Id: dlgreconstruct.cpp,v 1.19 2002/05/30 06:27:46 kevin Exp $

 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as


@@ -122,7 +122,7 @@ ReconstructDialog::ReconstructDialog (Reconstructor& rReconstruct, const Project
                   m_nyImage = MAX_IMAGE_Y;
        
     sizeDlg.x += m_nxImage;
                   m_nyImage = MAX_IMAGE_Y;
        
     sizeDlg.x += m_nxImage;

-    sizeDlg.y = max (sizeDlg.y, m_nyImage);
+    sizeDlg.y = imax (sizeDlg.y, m_nyImage);

        
     m_iClientX = sizeDlg.x;
     m_iClientY = sizeDlg.y;
        
     m_iClientX = sizeDlg.x;
     m_iClientY = sizeDlg.y;