From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sat, 16 Dec 2000 02:52:59 +0000 (+0000)
Subject: r257: *** empty log message ***
X-Git-Tag: debian-4.5.3-3~760
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=f313b7708626e8900c4eeea6cf73d4507057a1c6

r257: *** empty log message ***
---

diff --git a/include/fnetorderstream.h b/include/fnetorderstream.h
index 41be6cb..b682105 100644
--- 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 int fd)
-    : fstream (fd) {}
-
   ~fnetorderstream (void)
       {}
 
@@ -94,9 +91,6 @@ class frnetorderstream : public fnetorderstream {
   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);
diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index 49aaa99..4ea093a 100644
--- 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
 **
-**  $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
@@ -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);
-      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;
   }
@@ -407,13 +407,13 @@ Projections::copyHeader (const char* const filename, ostream& os)
   }
 
   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;
   }
 
-  os.write (pHdrData, sizeHeader);
+  os.write (reinterpret_cast<void*>(pHdrData), sizeHeader);
   if (os.fail()) {
       sys_error (ERR_FATAL, "Error writing header");
       return false;