r257: *** empty log message ***

diff --git a/include/fnetorderstream.h b/include/fnetorderstream.h
index 41be6cb8f0b95ba70c34058ac48c7eab2401b179..b682105b9dfecb322a6f06163148193e5b67a7db 100644 (file)
--- a/include/fnetorderstream.h
+++ b/include/fnetorderstream.h
@@ -71,9 +71,6 @@ class fnetorderstream : public fstream {
   fnetorderstream (const char* filename, int mode)
     : fstream (filename, mode) {}
 
   fnetorderstream (const char* filename, int mode)
     : fstream (filename, mode) {}
 

-  fnetorderstream (const int fd)
-    : fstream (fd) {}
-

   ~fnetorderstream (void)
       {}
 
   ~fnetorderstream (void)
       {}
 


@@ -94,9 +91,6 @@ class frnetorderstream : public fnetorderstream {
   frnetorderstream (const char* filename, int mode)
     : fnetorderstream (filename, mode) {}
 
   frnetorderstream (const char* filename, int mode)
     : fnetorderstream (filename, mode) {}
 

-  frnetorderstream (const int fd)
-    : fnetorderstream (fd) {}
-

   virtual void writeInt16 (kuint16 n);
   virtual void writeInt32 (kuint32 n);
   virtual void writeFloat32 (kfloat32 n);
   virtual void writeInt16 (kuint16 n);
   virtual void writeInt32 (kuint32 n);
   virtual void writeFloat32 (kfloat32 n);

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index 49aaa9942b078ea417817adb45789a0de5df26bc..4ea093a021678ed13487c675d9733d00e1ed8908 100644 (file)
--- a/libctsim/projections.cpp
+++ b/libctsim/projections.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: projections.cpp,v 1.29 2000/12/16 02:31:00 kevin Exp $
+**  $Id: projections.cpp,v 1.30 2000/12/16 02:52:59 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


@@ -372,8 +372,8 @@ Projections::copyViewData (const char* const filename, ostream& os, int startVie
 
   for (int i = startView; i <= endView; i++) {
       is.seekg (sizeHeader + i * sizeView);
 
   for (int i = startView; i <= endView; i++) {
       is.seekg (sizeHeader + i * sizeView);

-      is.read (pViewData, sizeView);
-      os.write (pViewData, sizeView);
+      is.read (reinterpret_cast<void*>(pViewData), sizeView);
+      os.write (reinterpret_cast<void*>(pViewData), sizeView);

       if (is.fail() || os.fail())
          break;
   }
       if (is.fail() || os.fail())
          break;
   }


@@ -407,13 +407,13 @@ Projections::copyHeader (const char* const filename, ostream& os)
   }
 
   unsigned char* pHdrData = new unsigned char [sizeHeader];
   }
 
   unsigned char* pHdrData = new unsigned char [sizeHeader];

-  is.read (pHdrData, sizeHeader);
+  is.read (reinterpret_cast<void*>(pHdrData), sizeHeader);

   if (is.fail()) {
       sys_error (ERR_FATAL, "Error reading header");
       return false;
   }
 
   if (is.fail()) {
       sys_error (ERR_FATAL, "Error reading header");
       return false;
   }
 

-  os.write (pHdrData, sizeHeader);
+  os.write (reinterpret_cast<void*>(pHdrData), sizeHeader);

   if (os.fail()) {
       sys_error (ERR_FATAL, "Error writing header");
       return false;
   if (os.fail()) {
       sys_error (ERR_FATAL, "Error writing header");
       return false;