X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Farray2dfile.cpp;h=f3e6dc9262007fe2e966f7ca4ed1b5d197511902;hb=b3b4d9344312f9812e4782c215db0133913802bc;hp=f0f19ab5d13c12d08a59b908580c243d5b7298f3;hpb=c4af77faf7f216b936f0782e918634d34980c63f;p=ctsim.git diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp index f0f19ab..f3e6dc9 100644 --- a/libctsim/array2dfile.cpp +++ b/libctsim/array2dfile.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: array2dfile.cpp,v 1.7 2000/07/23 01:49:03 kevin Exp $ +** $Id: array2dfile.cpp,v 1.11 2000/12/04 03:12:18 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 @@ -27,10 +27,13 @@ #include "array2dfile.h" #include +#ifndef WIN32 #include +#endif using namespace std; +const kuint16 Array2dFile::m_signature = ('I'*256+'F'); /////////////////////////////////////////////////////////////////////////// // CLASS IMPLEMENTATION @@ -199,12 +202,9 @@ Array2dFile::init (void) void Array2dFile::setArraySize (int x, int y, int pixelSize, int pixelFormat) { - m_nx = x; - m_ny = y; m_pixelSize = pixelSize; - m_arraySize = m_nx * m_ny * m_pixelSize; m_pixelFormat = pixelFormat; - allocArray (); + setArraySize (x, y); } void