Author: post
Date: 2009-10-25 13:34:36 +0100 (Sun, 25 Oct 2009)
New Revision: 162
Modified:
RawSpeed/ArwDecoder.cpp
RawSpeed/ArwDecoder.h
RawSpeed/BitPumpJPEG.cpp
RawSpeed/BitPumpJPEG.h
RawSpeed/BitPumpMSB.cpp
RawSpeed/BitPumpMSB.h
RawSpeed/BitPumpPlain.cpp
RawSpeed/BitPumpPlain.h
RawSpeed/BlackArea.cpp
RawSpeed/BlackArea.h
RawSpeed/ByteStream.cpp
RawSpeed/ByteStream.h
RawSpeed/Camera.cpp
RawSpeed/Camera.h
RawSpeed/CameraMetaData.cpp
RawSpeed/CameraMetaData.h
RawSpeed/CameraMetadataException.cpp
RawSpeed/CameraMetadataException.h
RawSpeed/ColorFilterArray.cpp
RawSpeed/ColorFilterArray.h
RawSpeed/Common.h
RawSpeed/Cr2Decoder.cpp
RawSpeed/Cr2Decoder.h
RawSpeed/DngDecoder.cpp
RawSpeed/DngDecoder.h
RawSpeed/DngDecoderSlices.cpp
RawSpeed/DngDecoderSlices.h
RawSpeed/FileIOException.cpp
RawSpeed/FileIOException.h
RawSpeed/FileMap.cpp
RawSpeed/FileMap.h
RawSpeed/FileReader.cpp
RawSpeed/FileReader.h
RawSpeed/LJpegDecompressor.cpp
RawSpeed/LJpegDecompressor.h
RawSpeed/LJpegPlain.cpp
RawSpeed/LJpegPlain.h
RawSpeed/NefDecoder.cpp
RawSpeed/NefDecoder.h
RawSpeed/NikonDecompressor.cpp
RawSpeed/NikonDecompressor.h
RawSpeed/OrfDecoder.cpp
RawSpeed/OrfDecoder.h
RawSpeed/PefDecoder.cpp
RawSpeed/PefDecoder.h
RawSpeed/PentaxDecompressor.cpp
RawSpeed/PentaxDecompressor.h
RawSpeed/PlanarRawImage.cpp
RawSpeed/PlanarRawImage.h
RawSpeed/Point.h
RawSpeed/RawDecoder.cpp
RawSpeed/RawDecoder.h
RawSpeed/RawDecoderException.cpp
RawSpeed/RawDecoderException.h
RawSpeed/RawImage.cpp
RawSpeed/RawImage.h
RawSpeed/RawSpeed.cpp
RawSpeed/RgbImage.cpp
RawSpeed/RgbImage.h
RawSpeed/Rw2Decoder.cpp
RawSpeed/Rw2Decoder.h
RawSpeed/TiffEntry.cpp
RawSpeed/TiffEntry.h
RawSpeed/TiffEntryBE.cpp
RawSpeed/TiffEntryBE.h
RawSpeed/TiffIFD.cpp
RawSpeed/TiffIFD.h
RawSpeed/TiffIFDBE.cpp
RawSpeed/TiffIFDBE.h
RawSpeed/TiffParser.cpp
RawSpeed/TiffParser.h
RawSpeed/TiffParserException.cpp
RawSpeed/TiffParserException.h
RawSpeed/TiffParserHeaderless.cpp
RawSpeed/TiffParserHeaderless.h
RawSpeed/TiffParserOlympus.cpp
RawSpeed/TiffParserOlympus.h
RawSpeed/TiffTag.h
RawSpeed/rawstudio-plugin-api.cpp
Log:
Put all code in "RawSpeed" namespace.
Modified: RawSpeed/ArwDecoder.cpp
===================================================================
--- RawSpeed/ArwDecoder.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/ArwDecoder.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
ArwDecoder::ArwDecoder(TiffIFD *rootIFD, FileMap* file) :
RawDecoder(file), mRootIFD(rootIFD) {
@@ -210,3 +211,5 @@
}
}
}
+
+} // namespace RawSpeed
Modified: RawSpeed/ArwDecoder.h
===================================================================
--- RawSpeed/ArwDecoder.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/ArwDecoder.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -25,6 +25,8 @@
#include "TiffIFD.h"
#include "BitPumpPlain.h"
+namespace RawSpeed {
+
class ArwDecoder :
public RawDecoder
{
@@ -42,3 +44,5 @@
guint curve[0x4001];
ByteStream *in;
};
+
+} // namespace RawSpeed
Modified: RawSpeed/BitPumpJPEG.cpp
===================================================================
--- RawSpeed/BitPumpJPEG.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/BitPumpJPEG.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -25,6 +25,7 @@
Copyright (C) 2007 Hubert Figuiere, released under LGPL
*/
+namespace RawSpeed {
/*** Used for entropy encoded sections ***/
@@ -201,3 +202,4 @@
BitPumpJPEG::~BitPumpJPEG(void) {
}
+} // namespace RawSpeed
Modified: RawSpeed/BitPumpJPEG.h
===================================================================
--- RawSpeed/BitPumpJPEG.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/BitPumpJPEG.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,9 +22,10 @@
#pragma once
#include "ByteStream.h"
+namespace RawSpeed {
+
// Note: Allocated buffer MUST be at least size+sizeof(guint) large.
-
class BitPumpJPEG
{
public:
@@ -63,4 +64,4 @@
private:
};
-
+} // namespace RawSpeed
Modified: RawSpeed/BitPumpMSB.cpp
===================================================================
--- RawSpeed/BitPumpMSB.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/BitPumpMSB.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
/*** Used for entropy encoded sections ***/
#define BITS_PER_LONG (8*sizeof(guint))
@@ -177,3 +179,4 @@
BitPumpMSB::~BitPumpMSB(void) {
}
+} // namespace RawSpeed
Modified: RawSpeed/BitPumpMSB.h
===================================================================
--- RawSpeed/BitPumpMSB.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/BitPumpMSB.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,9 +22,10 @@
#pragma once
#include "ByteStream.h"
+namespace RawSpeed {
+
// Note: Allocated buffer MUST be at least size+sizeof(guint) large.
-
class BitPumpMSB
{
public:
@@ -63,4 +64,4 @@
private:
};
-
+} // namespace RawSpeed
Modified: RawSpeed/BitPumpPlain.cpp
===================================================================
--- RawSpeed/BitPumpPlain.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/BitPumpPlain.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
/*** Used for entropy encoded sections ***/
#define BITS_PER_LONG (8*sizeof(guint))
@@ -113,3 +115,5 @@
BitPumpPlain::~BitPumpPlain(void) {
}
+
+} // namespace RawSpeed
Modified: RawSpeed/BitPumpPlain.h
===================================================================
--- RawSpeed/BitPumpPlain.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/BitPumpPlain.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,9 +22,10 @@
#pragma once
#include "ByteStream.h"
+namespace RawSpeed {
+
// Note: Allocated buffer MUST be at least size+sizeof(guint) large.
-
class BitPumpPlain
{
public:
@@ -53,4 +54,4 @@
private:
};
-
+} // namespace RawSpeed
Modified: RawSpeed/BlackArea.cpp
===================================================================
--- RawSpeed/BlackArea.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/BlackArea.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
BlackArea::BlackArea( int _offset, int _size, gboolean _isVertical ) :
offset(_offset), size(_size), isVertical(isVertical)
{
@@ -31,3 +33,5 @@
BlackArea::~BlackArea(void)
{
}
+
+} // namespace RawSpeed
Modified: RawSpeed/BlackArea.h
===================================================================
--- RawSpeed/BlackArea.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/BlackArea.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -20,6 +20,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
class BlackArea
{
@@ -30,3 +31,5 @@
guint size; // Size in bayer pixels.
gboolean isVertical; // Otherwise horizontal
};
+
+} // namespace RawSpeed
Modified: RawSpeed/ByteStream.cpp
===================================================================
--- RawSpeed/ByteStream.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/ByteStream.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
ByteStream::ByteStream(const guchar* _buffer, guint _size) :
buffer(_buffer), size(_size), off(0) {
@@ -84,3 +85,5 @@
}
// _RPT1(0,"Skipped %u bytes.\n", c);
}
+
+} // namespace RawSpeed
Modified: RawSpeed/ByteStream.h
===================================================================
--- RawSpeed/ByteStream.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/ByteStream.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -21,6 +21,8 @@
*/
#pragma once
+namespace RawSpeed {
+
class ByteStream
{
public:
@@ -51,3 +53,5 @@
_RPT1(0, "IO Exception: %s\n", _msg.c_str());
}
};
+
+} // namespace RawSpeed
Modified: RawSpeed/Camera.cpp
===================================================================
--- RawSpeed/Camera.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/Camera.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -23,6 +23,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
Camera::Camera(xmlDocPtr doc, xmlNodePtr cur) {
xmlChar *key;
key = xmlGetProp(cur, (const xmlChar *)"make");
@@ -188,3 +190,4 @@
return i;
}
+} // namespace RawSpeed
Modified: RawSpeed/Camera.h
===================================================================
--- RawSpeed/Camera.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/Camera.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -25,6 +25,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class Camera
{
public:
@@ -48,3 +50,5 @@
int StringToInt(const xmlChar *in, const xmlChar *tag, const char*
attribute);
int getAttributeAsInt( xmlNodePtr cur , const xmlChar *tag, const char*
attribute);
};
+
+} // namespace RawSpeed
Modified: RawSpeed/CameraMetaData.cpp
===================================================================
--- RawSpeed/CameraMetaData.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/CameraMetaData.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
CameraMetaData::CameraMetaData(char *docname) {
ctxt = xmlNewParserCtxt();
doc = xmlCtxtReadFile(ctxt, docname, NULL, XML_PARSE_DTDVALID);
@@ -117,3 +119,5 @@
return NULL;
return cameras[id];
}
+
+} // namespace RawSpeed
Modified: RawSpeed/CameraMetaData.h
===================================================================
--- RawSpeed/CameraMetaData.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/CameraMetaData.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -25,6 +25,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class CameraMetaData
{
public:
@@ -38,3 +40,5 @@
protected:
void dumpCameraXML(Camera* cam);
};
+
+} // namespace RawSpeed
Modified: RawSpeed/CameraMetadataException.cpp
===================================================================
--- RawSpeed/CameraMetadataException.cpp 2009-10-22 16:00:50 UTC (rev
161)
+++ RawSpeed/CameraMetadataException.cpp 2009-10-25 12:34:36 UTC (rev
162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
void ThrowCME(const char* fmt, ...) {
va_list val;
va_start(val, fmt);
@@ -39,3 +41,5 @@
CameraMetadataException::CameraMetadataException(const string _msg):
runtime_error(_msg) {
_RPT1(0, "CameraMetadata Exception: %s\n", _msg.c_str());
}
+
+} // namespace RawSpeed
Modified: RawSpeed/CameraMetadataException.h
===================================================================
--- RawSpeed/CameraMetadataException.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/CameraMetadataException.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -21,6 +21,8 @@
*/
#pragma once
+namespace RawSpeed {
+
void ThrowCME(const char* fmt, ...);
class CameraMetadataException :
@@ -29,3 +31,5 @@
public:
CameraMetadataException(const string _msg);
};
+
+} // namespace RawSpeed
Modified: RawSpeed/ColorFilterArray.cpp
===================================================================
--- RawSpeed/ColorFilterArray.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/ColorFilterArray.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
ColorFilterArray::ColorFilterArray(void) {
setCFA(CFA_UNKNOWN, CFA_UNKNOWN, CFA_UNKNOWN, CFA_UNKNOWN);
}
@@ -122,3 +124,5 @@
cfa[2] = tmp1;
cfa[3] = tmp2;
}
+
+} // namespace RawSpeed
Modified: RawSpeed/ColorFilterArray.h
===================================================================
--- RawSpeed/ColorFilterArray.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/ColorFilterArray.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
typedef enum {
CFA_COLOR_MIN = 0,
CFA_RED = 0,
@@ -62,3 +64,5 @@
private:
CFAColor cfa[4];
};
+
+} // namespace RawSpeed
Modified: RawSpeed/Common.h
===================================================================
--- RawSpeed/Common.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/Common.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -52,6 +52,7 @@
typedef char* LPCWSTR;
#endif // __unix__
+namespace RawSpeed {
inline void BitBlt(BYTE* dstp, int dst_pitch, const BYTE* srcp, int src_pitch,
int row_size, int height) {
if (height == 1 || (dst_pitch == src_pitch && src_pitch == row_size)) {
@@ -113,3 +114,5 @@
inline guint clampbits(gint x, guint n) { guint32 _y_temp; if( (_y_temp=x>>n)
) x = ~_y_temp >> (32-n); return x;}
+
+} // namespace RawSpeed
Modified: RawSpeed/Cr2Decoder.cpp
===================================================================
--- RawSpeed/Cr2Decoder.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/Cr2Decoder.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -24,6 +24,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
Cr2Decoder::Cr2Decoder(TiffIFD *rootIFD, FileMap* file) :
RawDecoder(file), mRootIFD(rootIFD) {
@@ -404,3 +406,5 @@
STORE_RGB(c_line, off + 3, off + 4, off + 5);
}
}
+
+} // namespace RawSpeed
Modified: RawSpeed/Cr2Decoder.h
===================================================================
--- RawSpeed/Cr2Decoder.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/Cr2Decoder.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -24,6 +24,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class Cr2Decoder :
public RawDecoder
{
@@ -51,4 +53,6 @@
guint h;
guint offset;
guint count;
-};
\ No newline at end of file
+};
+
+} // namespace RawSpeed
\ No newline at end of file
Modified: RawSpeed/DngDecoder.cpp
===================================================================
--- RawSpeed/DngDecoder.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/DngDecoder.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -24,6 +24,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
//#define PRINT_INFO
DngDecoder::DngDecoder(TiffIFD *rootIFD, FileMap* file) : RawDecoder(file),
mRootIFD(rootIFD) {
@@ -474,4 +476,4 @@
}
-
+} // namespace RawSpeed
Modified: RawSpeed/DngDecoder.h
===================================================================
--- RawSpeed/DngDecoder.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/DngDecoder.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -24,8 +24,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
-
class DngDecoder :
public RawDecoder
{
@@ -50,3 +50,5 @@
guint count;
guint offsetY;
};
+
+} // namespace RawSpeed
Modified: RawSpeed/DngDecoderSlices.cpp
===================================================================
--- RawSpeed/DngDecoderSlices.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/DngDecoderSlices.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
void *DecodeThread(void *_this) {
DngDecoderThread* me = (DngDecoderThread*)_this;
DngDecoderSlices* parent = me->parent;
@@ -112,3 +114,5 @@
int DngDecoderSlices::size() {
return (int)slices.size();
}
+
+} // namespace RawSpeed
Modified: RawSpeed/DngDecoderSlices.h
===================================================================
--- RawSpeed/DngDecoderSlices.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/DngDecoderSlices.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -25,6 +25,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class DngSliceElement
{
public:
@@ -69,3 +71,4 @@
guint nThreads;
};
+} // namespace RawSpeed
Modified: RawSpeed/FileIOException.cpp
===================================================================
--- RawSpeed/FileIOException.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/FileIOException.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -27,6 +27,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
FileIOException::FileIOException(const string error) :
RawDecoderException(error) {
}
@@ -40,3 +42,5 @@
_RPT1(0, "EXCEPTION: %s\n", buf);
throw FileIOException(buf);
}
+
+} // namespace RawSpeed
Modified: RawSpeed/FileIOException.h
===================================================================
--- RawSpeed/FileIOException.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/FileIOException.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -23,6 +23,8 @@
*/
#pragma once
+namespace RawSpeed {
+
void ThrowTPE(const char* fmt, ...);
class FileIOException: public RawDecoderException
@@ -30,3 +32,5 @@
public:
FileIOException(const string);
};
+
+} // namespace RawSpeed
Modified: RawSpeed/FileMap.cpp
===================================================================
--- RawSpeed/FileMap.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/FileMap.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
FileMap::FileMap(guint _size) : size(_size) {
data = (unsigned char*)_aligned_malloc(size + 4, 16);
if (!data) {
@@ -55,3 +57,5 @@
data[pos] = rand() & 0xff;
}
}
+
+} // namespace RawSpeed
Modified: RawSpeed/FileMap.h
===================================================================
--- RawSpeed/FileMap.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/FileMap.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
/*************************************************************************
* This is the basic file map
*
@@ -47,3 +49,5 @@
guint size;
gboolean mOwnAlloc;
};
+
+} // namespace RawSpeed
Modified: RawSpeed/FileReader.cpp
===================================================================
--- RawSpeed/FileReader.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/FileReader.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -29,6 +29,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
FileReader::FileReader(LPCWSTR _filename) : mFilename(_filename) {
}
@@ -86,3 +87,5 @@
FileReader::~FileReader(void) {
}
+
+} // namespace RawSpeed
Modified: RawSpeed/FileReader.h
===================================================================
--- RawSpeed/FileReader.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/FileReader.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -23,6 +23,8 @@
#include "FileIOException.h"
#include "FileMap.h"
+namespace RawSpeed {
+
class FileReader
{
public:
@@ -35,3 +37,5 @@
private:
LPCWSTR mFilename;
};
+
+} // namespace RawSpeed
Modified: RawSpeed/LJpegDecompressor.cpp
===================================================================
--- RawSpeed/LJpegDecompressor.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/LJpegDecompressor.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -58,6 +58,8 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
+namespace RawSpeed {
+
const guint bitMask[] = { 0xffffffff, 0x7fffffff,
0x3fffffff, 0x1fffffff,
0x0fffffff, 0x07ffffff,
@@ -592,3 +594,4 @@
return 0;
}
+} // namespace RawSpeed
Modified: RawSpeed/LJpegDecompressor.h
===================================================================
--- RawSpeed/LJpegDecompressor.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/LJpegDecompressor.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -28,6 +28,8 @@
* Comments added by tm. See Copyright in LJpegDecompressor.cpp
*/
+namespace RawSpeed {
+
typedef enum { /* JPEG marker codes */
M_STUFF = 0x00,
M_SOF0 = 0xc0, /* baseline DCT */
@@ -191,4 +193,4 @@
HuffmanTable huff[4];
};
-
+} // namespace RawSpeed
Modified: RawSpeed/LJpegPlain.cpp
===================================================================
--- RawSpeed/LJpegPlain.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/LJpegPlain.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
LJpegPlain::LJpegPlain(FileMap* file, RawImage img) :
LJpegDecompressor(file, img) {
@@ -773,3 +774,4 @@
}
}
+} // namespace RawSpeed
Modified: RawSpeed/LJpegPlain.h
===================================================================
--- RawSpeed/LJpegPlain.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/LJpegPlain.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -23,6 +23,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
/******************
* Decompresses Lossless non subsampled JPEGs, with 2-4 components
*****************/
@@ -45,3 +47,5 @@
guint *offset;
int* slice_width;
};
+
+} // namespace RawSpeed
Modified: RawSpeed/NefDecoder.cpp
===================================================================
--- RawSpeed/NefDecoder.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/NefDecoder.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
NefDecoder::NefDecoder(TiffIFD *rootIFD, FileMap* file) :
RawDecoder(file), mRootIFD(rootIFD) {
@@ -239,5 +241,6 @@
mRaw->whitePoint = white;
if (black >= 0)
mRaw->blackLevel = black;
+}
-}
+} // namespace RawSpeed
Modified: RawSpeed/NefDecoder.h
===================================================================
--- RawSpeed/NefDecoder.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/NefDecoder.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -27,6 +27,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class NefDecoder :
public RawDecoder
{
@@ -50,4 +52,6 @@
guint h;
guint offset;
guint count;
-};
\ No newline at end of file
+};
+
+} // namespace RawSpeed
\ No newline at end of file
Modified: RawSpeed/NikonDecompressor.cpp
===================================================================
--- RawSpeed/NikonDecompressor.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/NikonDecompressor.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
NikonDecompressor::NikonDecompressor(FileMap* file, RawImage img) :
LJpegDecompressor(file, img) {
for (guint i = 0; i < 0xffff ; i++) {
@@ -198,3 +200,4 @@
return diff;
}
+} // namespace RawSpeed
Modified: RawSpeed/NikonDecompressor.h
===================================================================
--- RawSpeed/NikonDecompressor.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/NikonDecompressor.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -23,6 +23,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class NikonDecompressor :
public LJpegDecompressor
{
@@ -51,3 +53,5 @@
8,0x5c,0x4b,0x3a,0x29,7,6,5,4,3,2,1,0,13,14 },
{ 0,1,4,2,2,3,1,2,0,0,0,0,0,0,0,0, /* 14-bit lossless */
7,6,8,5,9,4,10,3,11,12,2,0,1,13,14 } };
+
+} // namespace RawSpeed
Modified: RawSpeed/OrfDecoder.cpp
===================================================================
--- RawSpeed/OrfDecoder.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/OrfDecoder.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -26,6 +26,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
OrfDecoder::OrfDecoder(TiffIFD *rootIFD, FileMap* file):
RawDecoder(file), mRootIFD(rootIFD) {
}
@@ -182,5 +184,6 @@
string model = data[0]->getEntry(MODEL)->getString();
setMetaData(meta, make, model, "");
+}
-}
+} // namespace RawSpeed
Modified: RawSpeed/OrfDecoder.h
===================================================================
--- RawSpeed/OrfDecoder.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/OrfDecoder.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -25,6 +25,9 @@
http://www.klauspost.com
*/
+
+namespace RawSpeed {
+
class OrfDecoder :
public RawDecoder
{
@@ -37,5 +40,6 @@
private:
void decodeCompressed(ByteStream& s,guint w, guint h);
TiffIFD *mRootIFD;
+};
-};
+} // namespace RawSpeed
Modified: RawSpeed/PefDecoder.cpp
===================================================================
--- RawSpeed/PefDecoder.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/PefDecoder.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
PefDecoder::PefDecoder(TiffIFD *rootIFD, FileMap* file) :
RawDecoder(file), mRootIFD(rootIFD) {
}
@@ -105,3 +107,5 @@
}
*/
}
+
+} // namespace RawSpeed
Modified: RawSpeed/PefDecoder.h
===================================================================
--- RawSpeed/PefDecoder.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/PefDecoder.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -23,6 +23,9 @@
http://www.klauspost.com
*/
+
+namespace RawSpeed {
+
class PefDecoder :
public RawDecoder
{
@@ -34,3 +37,5 @@
virtual void checkSupport(CameraMetaData *meta);
TiffIFD *mRootIFD;
};
+
+} // namespace RawSpeed
Modified: RawSpeed/PentaxDecompressor.cpp
===================================================================
--- RawSpeed/PentaxDecompressor.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/PentaxDecompressor.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
PentaxDecompressor::PentaxDecompressor(FileMap* file, RawImage img) :
LJpegDecompressor(file, img) {
pentaxBits = 0;
@@ -162,3 +164,4 @@
return 0;
}
+} // namespace RawSpeed
Modified: RawSpeed/PentaxDecompressor.h
===================================================================
--- RawSpeed/PentaxDecompressor.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/PentaxDecompressor.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,9 @@
http://www.klauspost.com
*/
+
+namespace RawSpeed {
+
class PentaxDecompressor :
public LJpegDecompressor
{
@@ -32,3 +35,5 @@
void decodePentax( guint offset, guint size );
BitPumpMSB *pentaxBits;
};
+
+} // namespace RawSpeed
Modified: RawSpeed/PlanarRawImage.cpp
===================================================================
--- RawSpeed/PlanarRawImage.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/PlanarRawImage.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,8 +22,12 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
PlanarRawImage::PlanarRawImage(void) {
}
PlanarRawImage::~PlanarRawImage(void) {
}
+
+} // namespace RawSpeed
Modified: RawSpeed/PlanarRawImage.h
===================================================================
--- RawSpeed/PlanarRawImage.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/PlanarRawImage.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -21,6 +21,9 @@
http://www.klauspost.com
*/
+
+namespace RawSpeed {
+
/****
* Conventions:
*
@@ -44,3 +47,5 @@
virtual ~PlanarRawImage(void);
PlanarPlane p[4];
};
+
+} // namespace RawSpeed
Modified: RawSpeed/Point.h
===================================================================
--- RawSpeed/Point.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/Point.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -19,6 +19,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
#ifndef SS_Point_H
#define SS_Point_H
@@ -42,4 +44,6 @@
int x,y;
};
+} // namespace RawSpeed
+
#endif // SS_Point_H
Modified: RawSpeed/RawDecoder.cpp
===================================================================
--- RawSpeed/RawDecoder.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/RawDecoder.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
RawDecoder::RawDecoder(FileMap* file) : mFile(file), mRaw(RawImage::create()) {
}
@@ -215,3 +217,4 @@
ThrowRDE("Internal Error: This class does not support threaded decoding");
}
+} // namespace RawSpeed
\ No newline at end of file
Modified: RawSpeed/RawDecoder.h
===================================================================
--- RawSpeed/RawDecoder.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/RawDecoder.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -28,6 +28,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class RawDecoder;
class RawDecoderThread
@@ -62,4 +64,4 @@
void TrimSpaces( string& str);
};
-
+} // namespace RawSpeed
Modified: RawSpeed/RawDecoderException.cpp
===================================================================
--- RawSpeed/RawDecoderException.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/RawDecoderException.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -27,6 +27,7 @@
*/
+namespace RawSpeed {
void ThrowRDE(const char* fmt, ...) {
va_list val;
@@ -37,3 +38,5 @@
_RPT1(0, "EXCEPTION: %s\n", buf);
throw RawDecoderException(buf);
}
+
+} // namespace RawSpeed
Modified: RawSpeed/RawDecoderException.h
===================================================================
--- RawSpeed/RawDecoderException.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/RawDecoderException.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -21,6 +21,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
void ThrowRDE(const char* fmt, ...);
class RawDecoderException : public std::runtime_error
@@ -30,3 +32,5 @@
_RPT1(0, "RawDecompressor Exception: %s\n", _msg.c_str());
}
};
+
+} // namespace RawSpeed
Modified: RawSpeed/RawImage.cpp
===================================================================
--- RawSpeed/RawImage.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/RawImage.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
RawImageData::RawImageData(void):
dim(0, 0), bpp(0), isCFA(true),
@@ -316,3 +317,5 @@
if (--old->dataRefCount == 0) delete old;
return *this;
}
+
+} // namespace RawSpeed
Modified: RawSpeed/RawImage.h
===================================================================
--- RawSpeed/RawImage.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/RawImage.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -25,6 +25,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class RawImage;
class RawImageData
{
@@ -80,3 +82,5 @@
inline RawImage RawImage::create() { return new RawImageData(); }
inline RawImage RawImage::create(iPoint2D dim, guint bytesPerPixel, guint
componentsPerPixel)
{ return new RawImageData(dim, bytesPerPixel, componentsPerPixel); }
+
+} // namespace RawSpeed
Modified: RawSpeed/RawSpeed.cpp
===================================================================
--- RawSpeed/RawSpeed.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/RawSpeed.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -27,7 +27,9 @@
http://www.klauspost.com
*/
-//#define _USE_GFL_
+using namespace RawSpeed;
+
+#define _USE_GFL_
#ifdef _USE_GFL_
#include "libgfl.h"
#pragma comment(lib, "libgfl.lib")
@@ -42,7 +44,7 @@
RawDecoder *d = 0;
FileMap* m = 0;
try {
- wprintf(L"Opening:%s\n",f.Filename());
+// wprintf(L"Opening:%s\n",f.Filename());
m = f.readFile();
TiffParser t(m);
t.parseData();
@@ -54,18 +56,18 @@
d->decodeRaw();
d->decodeMetaData(meta);
RawImage r = d->mRaw;
+ r->scaleBlackWhite();
guint time = GetTickCount()-startTime;
float mpps = (float)r->dim.x * (float)r->dim.y * (float)r->getCpp() /
(1000.0f * (float)time);
wprintf(L"Decoding %s took: %u ms, %4.2f Mpixel/s\n", f.Filename(),
time, mpps);
- r->scaleBlackWhite();
for (guint i = 0; i < d->errors.size(); i++) {
printf("Error Encountered:%s", d->errors[i]);
}
if (r->isCFA) {
- printf("DCRAW filter:%x\n",r->cfa.getDcrawFilter());
- printf(r->cfa.asString().c_str());
+// printf("DCRAW filter:%x\n",r->cfa.getDcrawFilter());
+// printf(r->cfa.asString().c_str());
}
#ifdef _USE_GFL_
@@ -174,7 +176,37 @@
#endif
CameraMetaData meta("..\\cameras.xml");
//meta.dumpXML();
+/*
+ OpenFile(FileReader(L"..\\testimg\\Panasonic_FZ35FARI0200.RW2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\Panasonic_FZ35hSLI0200.RW2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\Panasonic_FZ35hVFAWB.RW2"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Panasonic_DMCGF1hSLI0200_NR_LOW.RW2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\Panasonic_DMCGF1hMULTII0200.RW2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\panasonic_lumix_dmc_lx3_02.rw2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\gh1_sample_iso100.RW2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\gh1_sample_iso400.RW2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\gh1_studio_iso100.RW2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\gh1_studio_iso1600.RW2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\Panasonic_DMC-FX150.rw2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\Panasonic_FZ28.rw2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\panasonic_lumix_dmc_lx3_01.rw2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\panasonic_lumix_dmc_lx3_02.rw2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\panasonic_lumix_dmc_lx3_03.rw2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\panasonic_lumix_dmc_lx3_04.rw2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\panasonic_lumix_dmc_lx3_05.rw2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\panasonic_lumix_dmc_lx3_06.rw2"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\Panasonic_LX3.rw2"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\panasonic_DMC_gh1_sample_iso100.RW2"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\panasonic_DMC_gh1_sample_iso400.RW2"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\panasonic_DMC_gh1_studio_iso100.RW2"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\panasonic_DMC_gh1_studio_iso1600.RW2"),&meta);
+
+
OpenFile(FileReader(L"..\\testimg\\camera_dngs\\ricoh_gr_digital_iii_01.dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\camera_dngs\\ricoh_gr_digital_iii_07.dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\camera_dngs\\ricoh_gr_digital_iii_09.dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\camera_dngs\\ricoh_gr_digital_iii_10.dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\camera_dngs\\ricoh_gr_digital_iii_14.dng"),&meta);
OpenFile(FileReader(L"..\\testimg\\camera_dngs\\Pentax-K7FARI0200.DNG"),&meta);
OpenFile(FileReader(L"..\\testimg\\camera_dngs\\Pentax-K7FARI6400.DNG"),&meta);
OpenFile(FileReader(L"..\\testimg\\camera_dngs\\Pentax-K7hMULTII0200.DNG"),&meta);
@@ -222,7 +254,7 @@
OpenFile(FileReader(L"..\\testimg\\Pentax_K20D.pef"),&meta);
OpenFile(FileReader(L"..\\testimg\\Pentax_optio_33wr.pef"),&meta);
-
+
OpenFile(FileReader(L"..\\testimg\\SONY-DSLR-A700.arw"),&meta);
OpenFile(FileReader(L"..\\testimg\\SONY_A200.ARW"),&meta);
OpenFile(FileReader(L"..\\testimg\\Sony_A300.arw"),&meta);
@@ -231,6 +263,17 @@
OpenFile(FileReader(L"..\\testimg\\Sony_DSLR-A900-2.arw"),&meta);
OpenFile(FileReader(L"..\\testimg\\Sony_DSLR-A900.arw"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\Sony_a700_ISO1600_compressed.ARW"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Sony_a700_ISO1600_uncompressed.ARW"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Sony_a700_ISO200_compressed.ARW"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Sony_a700_ISO200_uncompressed.ARW"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Sony_a700_ISO6400_compressed.ARW"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Sony_a700_ISO6400_uncompressed.ARW"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Sony_A900_ISO1600_uncompressed.ARW"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Sony_A900_ISO3200_uncompressed.ARW"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Sony_A900_ISO400_uncompressed.ARW"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Sony_A900_ISO6400_uncompressed.ARW"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Sony_A900_ISO800_uncompressed.ARW"),&meta);
OpenFile(FileReader(L"..\\testimg\\nikon_coolpix_p6000_05.nrw"),&meta);
OpenFile(FileReader(L"..\\testimg\\Nikon_D1.nef"),&meta);
OpenFile(FileReader(L"..\\testimg\\Nikon_D100-backhigh.nef"),&meta);
@@ -256,7 +299,25 @@
OpenFile(FileReader(L"..\\testimg\\Nikon_E5400.nef"),&meta);
OpenFile(FileReader(L"..\\testimg\\Nikon_E5700.nef"),&meta);
OpenFile(FileReader(L"..\\testimg\\Nikon_E5700_(sRGB).nef"),&meta);
+*/
+OpenFile(FileReader(L"..\\testimg\\Canon_Powershot_SX1IShMULTII1600.CR2"),&meta);
+OpenFile(FileReader(L"..\\testimg\\Canon_Powershot_SX1ISFARI0200.CR2"),&meta);
+OpenFile(FileReader(L"..\\testimg\\Canon_Powershot_SX1IShMULTII0200.CR2"),&meta);
+OpenFile(FileReader(L"..\\testimg\\Canon_Powershot_SX1IShSLI0080.CR2"),&meta);
+OpenFile(FileReader(L"..\\testimg\\Canon_Powershot_SX1IShSLI0200.CR2"),&meta);
+OpenFile(FileReader(L"..\\testimg\\canon_powershot_g11_02.cr2"),&meta);
+OpenFile(FileReader(L"..\\testimg\\canon_powershot_g11_07.cr2"),&meta);
+OpenFile(FileReader(L"..\\testimg\\canon_powershot_g11_08.cr2"),&meta);
+
+
OpenFile(FileReader(L"..\\testimg\\nikon_d3s_Ycircus_vidrig_102400.NEF"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\nikon_d3s_Ycircus_dogjump3_2500.NEF"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\nikon_d3s_Ycircus_granny_10000.NEF"),&meta);
+
+ OpenFile(FileReader(L"..\\testimg\\nikon_d300s_01.nef"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\nikon_d300s_03.nef"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\nikon_d300s_06.nef"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\Olympus_500UZ.orf"),&meta);
OpenFile(FileReader(L"..\\testimg\\Olympus_C7070WZ.orf"),&meta);
OpenFile(FileReader(L"..\\testimg\\Olympus_C8080.orf"),&meta);
@@ -408,6 +469,22 @@
OpenFile(FileReader(L"..\\testimg\\dng\\Olympus_E520-5.dng"),&meta);
OpenFile(FileReader(L"..\\testimg\\dng\\Olympus_E520.dng"),&meta);
OpenFile(FileReader(L"..\\testimg\\dng\\Olympus_SP350.dng"),&meta);
+
+
OpenFile(FileReader(L"..\\testimg\\dng\\Panasonic_DMC-FX150(010909).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\panasonic_DMC-G1FARI0200(010909).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\panasonic_DMC-G1hMULTII0200(010909).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\panasonic_DMC-G1hSLI0400(010909).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\panasonic_DMC-G1LL0207LENROFF(010909).dng"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\dng\\Panasonic_FZ28(010909).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\panasonic_lumix_dmc_lx3_01(010909).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\panasonic_lumix_dmc_lx3_02(010909).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\panasonic_lumix_dmc_lx3_03(010909).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\panasonic_lumix_dmc_lx3_04(010909).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\panasonic_lumix_dmc_lx3_05(010909).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\panasonic_lumix_dmc_lx3_06(010909).dng"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\dng\\Panasonic_LX3(010909).dng"),&meta);
+ OpenFile(FileReader(L"..\\testimg\\dng\\Panasonic_LX3(300109).dng"),&meta);
+
OpenFile(FileReader(L"..\\testimg\\dng\\PENTAX-ISD-linear.dng"),&meta);
OpenFile(FileReader(L"..\\testimg\\dng\\PENTAX-ISD.dng"),&meta);
OpenFile(FileReader(L"..\\testimg\\dng\\Pentax_K100D.dng"),&meta);
Modified: RawSpeed/RgbImage.cpp
===================================================================
--- RawSpeed/RgbImage.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/RgbImage.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
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);
@@ -38,3 +40,5 @@
_aligned_free(data);
}
}
+
+} // namespace RawSpeed
Modified: RawSpeed/RgbImage.h
===================================================================
--- RawSpeed/RgbImage.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/RgbImage.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -21,6 +21,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class RgbImage
{
public:
@@ -36,3 +38,5 @@
const int bpp;
unsigned char* data;
};
+
+} // namespace RawSpeed
Modified: RawSpeed/Rw2Decoder.cpp
===================================================================
--- RawSpeed/Rw2Decoder.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/Rw2Decoder.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
Rw2Decoder::Rw2Decoder(TiffIFD *rootIFD, FileMap* file) :
RawDecoder(file), mRootIFD(rootIFD), input_start(0) {
@@ -218,3 +219,5 @@
byte = vbits >> 3 ^ 0x3ff0;
return (buf[byte] | buf[byte+1] << 8) >> (vbits & 7) & ~(-1 << nbits);
}
+
+} // namespace RawSpeed
Modified: RawSpeed/Rw2Decoder.h
===================================================================
--- RawSpeed/Rw2Decoder.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/Rw2Decoder.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -25,6 +25,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class PanaBitpump {
public:
PanaBitpump(ByteStream* input);
@@ -56,3 +58,5 @@
ByteStream* input_start;
guint load_flags;
};
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffEntry.cpp
===================================================================
--- RawSpeed/TiffEntry.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffEntry.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -23,6 +23,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
TiffEntry::TiffEntry() {
}
@@ -112,3 +113,5 @@
int TiffEntry::getElementShift() {
return datashifts[type];
}
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffEntry.h
===================================================================
--- RawSpeed/TiffEntry.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffEntry.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -24,6 +24,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
const guint datasizes[] = {0,1,1,2,4,8,1,1,2,4, 8, 4, 8, 4};
// 0-1-2-3-4-5-6-7-8-9-10-11-12-13
const guint datashifts[] = {0,0,0,1,2,3,0,0,1,2, 3, 2, 3, 2};
@@ -86,3 +88,5 @@
float debug_floatVal;
#endif
};
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffEntryBE.cpp
===================================================================
--- RawSpeed/TiffEntryBE.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffEntryBE.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
TiffEntryBE::TiffEntryBE(FileMap* f, guint offset) : mDataSwapped(false) {
type = TIFF_UNDEFINED; // We set type to undefined to avoid debug assertion
errors.
@@ -102,3 +103,5 @@
mDataSwapped = true;
return d;
}
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffEntryBE.h
===================================================================
--- RawSpeed/TiffEntryBE.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffEntryBE.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -23,6 +23,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class TiffEntryBE :
public TiffEntry
{
@@ -38,3 +40,4 @@
bool mDataSwapped;
};
+} // namespace RawSpeed
Modified: RawSpeed/TiffIFD.cpp
===================================================================
--- RawSpeed/TiffIFD.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffIFD.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
#ifdef CHECKSIZE
#undef CHECKSIZE
#endif
@@ -95,3 +97,5 @@
bool TiffIFD::hasEntry(TiffTag tag) {
return mEntry.find(tag) != mEntry.end();
}
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffIFD.h
===================================================================
--- RawSpeed/TiffIFD.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffIFD.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -25,6 +25,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
typedef enum Endianness {
big, little
@@ -48,6 +49,4 @@
gint nextIFD;
};
-
-
-
+} // namespace RawSpeed
Modified: RawSpeed/TiffIFDBE.cpp
===================================================================
--- RawSpeed/TiffIFDBE.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffIFDBE.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -23,6 +23,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
TiffIFDBE::TiffIFDBE() {
endian = big;
}
@@ -55,3 +57,5 @@
TiffIFDBE::~TiffIFDBE(void) {
}
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffIFDBE.h
===================================================================
--- RawSpeed/TiffIFDBE.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffIFDBE.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class TiffIFDBE :
public TiffIFD
{
@@ -30,3 +32,5 @@
TiffIFDBE(FileMap* f, guint offset);
virtual ~TiffIFDBE(void);
};
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffParser.cpp
===================================================================
--- RawSpeed/TiffParser.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffParser.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
TiffParser::TiffParser(FileMap* inputData): mInput(inputData), mRootIFD(0) {
}
@@ -132,3 +134,5 @@
throw TiffParserException("No decoder found. Sorry.");
return NULL;
}
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffParser.h
===================================================================
--- RawSpeed/TiffParser.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffParser.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -34,6 +34,8 @@
#include "OrfDecoder.h"
#include "Rw2Decoder.h"
+namespace RawSpeed {
+
class TiffParser
{
public:
@@ -49,3 +51,4 @@
TiffIFD* mRootIFD;
};
+} // namespace RawSpeed
Modified: RawSpeed/TiffParserException.cpp
===================================================================
--- RawSpeed/TiffParserException.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffParserException.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -27,6 +27,7 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
TiffParserException::TiffParserException(const string _msg) :
runtime_error(_msg) {
_RPT1(0, "TIFF Exception: %s\n", _msg.c_str());
@@ -41,3 +42,5 @@
_RPT1(0, "EXCEPTION: %s\n", buf);
throw TiffParserException(buf);
}
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffParserException.h
===================================================================
--- RawSpeed/TiffParserException.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffParserException.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -21,6 +21,8 @@
*/
#pragma once
+namespace RawSpeed {
+
void ThrowTPE(const char* fmt, ...);
class TiffParserException : public std::runtime_error
@@ -28,3 +30,5 @@
public:
TiffParserException(const string _msg);
};
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffParserHeaderless.cpp
===================================================================
--- RawSpeed/TiffParserHeaderless.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffParserHeaderless.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
TiffParserHeaderless::TiffParserHeaderless(FileMap* input, Endianness _end) :
TiffParser(input) {
endian = _end;
@@ -65,3 +67,5 @@
nextIFD = mRootIFD->mSubIFD.back()->getNextIFD();
} while (nextIFD);
}
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffParserHeaderless.h
===================================================================
--- RawSpeed/TiffParserHeaderless.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffParserHeaderless.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class TiffParserHeaderless :
public TiffParser
{
@@ -31,3 +33,5 @@
void parseData(guint firstIfdOffset);
virtual void parseData();
};
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffParserOlympus.cpp
===================================================================
--- RawSpeed/TiffParserOlympus.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffParserOlympus.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -24,6 +24,8 @@
// More relaxed Tiff parser for olympus makernote
+namespace RawSpeed {
+
TiffParserOlympus::TiffParserOlympus(FileMap* input) :
TiffParser(input) {
}
@@ -72,3 +74,5 @@
nextIFD = mRootIFD->mSubIFD.back()->getNextIFD();
} while (nextIFD);
}
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffParserOlympus.h
===================================================================
--- RawSpeed/TiffParserOlympus.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffParserOlympus.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -22,6 +22,8 @@
http://www.klauspost.com
*/
+namespace RawSpeed {
+
class TiffParserOlympus :
public TiffParser
{
@@ -30,3 +32,5 @@
virtual void parseData();
virtual ~TiffParserOlympus(void);
};
+
+} // namespace RawSpeed
Modified: RawSpeed/TiffTag.h
===================================================================
--- RawSpeed/TiffTag.h 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/TiffTag.h 2009-10-25 12:34:36 UTC (rev 162)
@@ -23,6 +23,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+namespace RawSpeed {
typedef enum {
INTEROPERABILITYINDEX = 0x0001,
@@ -304,3 +305,5 @@
// PRINT IMAGE MATCHING DATA
PIMIFDPOINTER = 0xC4A5
} TiffTag;
+
+} // namespace RawSpeed
Modified: RawSpeed/rawstudio-plugin-api.cpp
===================================================================
--- RawSpeed/rawstudio-plugin-api.cpp 2009-10-22 16:00:50 UTC (rev 161)
+++ RawSpeed/rawstudio-plugin-api.cpp 2009-10-25 12:34:36 UTC (rev 162)
@@ -29,6 +29,8 @@
#define TIME_LOAD 1
+using namespace RawSpeed;
+
extern "C" {
RS_IMAGE16 *
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
