r3874: Auto commit for Debian build

diff --git a/debian/changelog b/debian/changelog
index be9784b827c30fdeb1b61a5b421ae0f7c556eed5..c01711d91d51269b270e5f71fce1aa4a2442252a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ctsim (4.0.1-1) unstable; urgency=low
+
+  * Fix error using new wxWindows 2.4 bitmap functions
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 28 Jan 2003 21:33:55 -0700
+
 ctsim (4.0.0-1) unstable; urgency=low
 
   * Rebuild with gcc3.2

diff --git a/src/views.cpp b/src/views.cpp
index 72b79738d44dc361ee7ee25d92a70651793b6b08..66433ee5677b90e1321e5e76a8a731752951dca1 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.164 2003/01/24 05:24:19 kevin Exp $
+**  $Id: views.cpp,v 1.165 2003/01/29 04:34:06 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
@@ -1111,8 +1111,10 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
       }
     }
     wxImage image (nx, ny, imageData, true);
-    if (m_pBitmap)
+    if (m_pBitmap) {
       delete m_pBitmap;
+      m_pBitmap = NULL;
+    }
     m_pBitmap = new wxBitmap (image);
     delete imageData;
     m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20);
@@ -3153,8 +3155,10 @@ ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)
       }
     }
     wxImage image (nDet, nView, imageData, true);
-    if (m_pBitmap)
+    if (m_pBitmap) {
       delete m_pBitmap;
+      m_pBitmap = NULL;
+    }
     m_pBitmap = new wxBitmap (image);
     delete imageData;
   }