From fe5e8e2752729fa51f7d5c93e267404b6a333dab Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 29 Nov 2000 11:12:53 +0000 Subject: [PATCH] r224: *** empty log message *** --- tools/Makefile.am | 2 +- tools/Makefile.in | 2 +- tools/phm2if.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index ff51444..7f2398b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -49,7 +49,7 @@ realclean: rm -f *.pgm *.if *~ *.pj if USE_LAM -CC_LAM = $(lamdir)/bin/balky +CC_LAM = $(lamdir)/bin/hcp LAM_EXTRA_SRC = mpiworld.cpp pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a diff --git a/tools/Makefile.in b/tools/Makefile.in index ce4917d..dbfd186 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -133,7 +133,7 @@ phm2if_lam_LDADD = @ctlamlibs@ phm2pj_lam_SOURCES = phm2pj.cpp phm2pj_lam_LDADD = @ctlamlibs@ -@USE_LAM_TRUE@CC_LAM = $(lamdir)/bin/balky +@USE_LAM_TRUE@CC_LAM = $(lamdir)/bin/hcp @USE_LAM_TRUE@LAM_EXTRA_SRC = mpiworld.cpp mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff --git a/tools/phm2if.cpp b/tools/phm2if.cpp index f56a8f1..de84572 100644 --- a/tools/phm2if.cpp +++ b/tools/phm2if.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: phm2if.cpp,v 1.13 2000/11/09 00:12:25 kevin Exp $ +** $Id: phm2if.cpp,v 1.14 2000/11/29 11:12:53 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 @@ -50,7 +50,7 @@ static struct option my_options[] = {0, 0, 0, 0} }; -static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.13 2000/11/09 00:12:25 kevin Exp $"; +static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.14 2000/11/29 11:12:53 kevin Exp $"; void phm2if_usage (const char *program) @@ -301,7 +301,7 @@ phm2if_main (int argc, char* argv[]) pImGlobal = new ImageFile (opt_nx, opt_ny); #endif - ImageFileArray v; + ImageFileArray v = NULL; #ifdef HAVE_MPI if (mpiWorld.getRank() == 0) v = pImGlobal->getArray (); -- 2.34.1