Author: post Date: 2009-10-25 13:49:40 +0100 (Sun, 25 Oct 2009) New Revision: 163
Removed: RawSpeed/PlanarRawImage.cpp RawSpeed/PlanarRawImage.h RawSpeed/RgbImage.cpp RawSpeed/RgbImage.h Modified: RawSpeed/RawSpeed.vcproj Log: Removed unused image classes. Deleted: RawSpeed/PlanarRawImage.cpp =================================================================== --- RawSpeed/PlanarRawImage.cpp 2009-10-25 12:34:36 UTC (rev 162) +++ RawSpeed/PlanarRawImage.cpp 2009-10-25 12:49:40 UTC (rev 163) @@ -1,33 +0,0 @@ -#include "StdAfx.h" -#include "PlanarRawImage.h" -/* - RawSpeed - RAW file decoder. - - Copyright (C) 2009 Klaus Post - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.klauspost.com -*/ - -namespace RawSpeed { - -PlanarRawImage::PlanarRawImage(void) { -} - -PlanarRawImage::~PlanarRawImage(void) { -} - -} // namespace RawSpeed Deleted: RawSpeed/PlanarRawImage.h =================================================================== --- RawSpeed/PlanarRawImage.h 2009-10-25 12:34:36 UTC (rev 162) +++ RawSpeed/PlanarRawImage.h 2009-10-25 12:49:40 UTC (rev 163) @@ -1,51 +0,0 @@ -#pragma once -#include "RawImage.h" -/* - RawSpeed - RAW file decoder. - - Copyright (C) 2009 Klaus Post - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.klauspost.com -*/ - -namespace RawSpeed { - -/**** -* Conventions: -* -* The dimensions of an image is determined by the largest plane. -* Each plane size is defined as the largest plane divided by a power of two. -* Each plane can only hold one component. -* Each planar image can only hold up to four planes. -****/ -class PlanarPlane { -public: - PlanarPlane() : data(0), subfactor(0) {}; - guchar* data; - guint subfactor; -}; - -class PlanarRawImage : - public RawImage -{ -public: - PlanarRawImage(void); - virtual ~PlanarRawImage(void); - PlanarPlane p[4]; -}; - -} // namespace RawSpeed Modified: RawSpeed/RawSpeed.vcproj =================================================================== --- RawSpeed/RawSpeed.vcproj 2009-10-25 12:34:36 UTC (rev 162) +++ RawSpeed/RawSpeed.vcproj 2009-10-25 12:49:40 UTC (rev 163) @@ -188,6 +188,10 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File + RelativePath=".\CheckSum.cpp" + > + </File> + <File RelativePath=".\FileIOException.cpp" > </File> @@ -240,10 +244,6 @@ </FileConfiguration> </File> <File - RelativePath=".\RgbImage.cpp" - > - </File> - <File RelativePath=".\stdafx.cpp" > <FileConfiguration @@ -422,15 +422,15 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File - RelativePath=".\FileReader.h" + RelativePath=".\CheckSum.h" > </File> <File - RelativePath=".\RawImage.h" + RelativePath=".\FileReader.h" > </File> <File - RelativePath=".\RgbImage.h" + RelativePath=".\RawImage.h" > </File> <File Deleted: RawSpeed/RgbImage.cpp =================================================================== --- RawSpeed/RgbImage.cpp 2009-10-25 12:34:36 UTC (rev 162) +++ RawSpeed/RgbImage.cpp 2009-10-25 12:49:40 UTC (rev 163) @@ -1,44 +0,0 @@ -#include "StdAfx.h" -#include "RgbImage.h" -/* - RawSpeed - RAW file decoder. - - Copyright (C) 2009 Klaus Post - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.klauspost.com -*/ - -namespace RawSpeed { - -RgbImage::RgbImage(int _w, int _h, int _bpp) : w(_w), h(_h), bpp(_bpp), owned(true) { - pitch = ((w * bpp + 15) / 16) * 16; - data = (unsigned char*)_aligned_malloc(pitch * h, 16); -} - -RgbImage::RgbImage(int _w, int _h, int _bpp, int _pitch, unsigned char* _data) : - w(_w), h(_h), bpp(_bpp), pitch(_pitch), data(_data), owned(false) { - -} - - -RgbImage::~RgbImage(void) { - if (data && owned) { - _aligned_free(data); - } -} - -} // namespace RawSpeed Deleted: RawSpeed/RgbImage.h =================================================================== --- RawSpeed/RgbImage.h 2009-10-25 12:34:36 UTC (rev 162) +++ RawSpeed/RgbImage.h 2009-10-25 12:49:40 UTC (rev 163) @@ -1,42 +0,0 @@ -#pragma once -/* - RawSpeed - RAW file decoder. - - Copyright (C) 2009 Klaus Post - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - http://www.klauspost.com -*/ - -namespace RawSpeed { - -class RgbImage -{ -public: - RgbImage(void) : w(0), h(0), pitch(0), bpp(0), data(0), owned(false) {} - RgbImage(RgbImage &i) : w(i.w), h(i.h), pitch(i.pitch), bpp(i.pitch), data(i.data), owned(false) {} - RgbImage(int w, int h, int bpp); - RgbImage(int w, int h, int bpp, int pitch, unsigned char* data); - - virtual ~RgbImage(void); - const bool owned; - const int w,h; - int pitch; - const int bpp; - unsigned char* data; -}; - -} // namespace RawSpeed _______________________________________________ Rawstudio-commit mailing list [email protected] http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
