Author: post
Date: 2010-03-21 18:23:30 +0100 (Sun, 21 Mar 2010)
New Revision: 212
Modified:
RawSpeed/BitPumpJPEG.h
RawSpeed/BitPumpMSB.h
RawSpeed/DngDecoder.cpp
Log:
Fix a few GCC warnings
Modified: RawSpeed/BitPumpJPEG.h
===================================================================
--- RawSpeed/BitPumpJPEG.h 2010-03-21 17:16:20 UTC (rev 211)
+++ RawSpeed/BitPumpJPEG.h 2010-03-21 17:23:30 UTC (rev 212)
@@ -61,7 +61,7 @@
// Fill the buffer with at least 24 bits
- void __inline BitPumpJPEG::fill() {
+ __inline void fill() {
guchar c, c2, c3;
int m = mLeft >> 3;
@@ -108,11 +108,11 @@
protected:
void __inline init();
const guchar* buffer;
+ const guint size; // This if the end of buffer.
guint mLeft;
+ guint mCurr;
guint off; // Offset in bytes
- guint mCurr;
guint stuffed; // How many bytes has been stuffed?
- const guint size; // This if the end of buffer.
private:
};
Modified: RawSpeed/BitPumpMSB.h
===================================================================
--- RawSpeed/BitPumpMSB.h 2010-03-21 17:16:20 UTC (rev 211)
+++ RawSpeed/BitPumpMSB.h 2010-03-21 17:23:30 UTC (rev 212)
@@ -71,7 +71,7 @@
// 0 to 7 bits left, we can add 3 bytes
unsigned int c = *(unsigned int*)&buffer[off+2];
- mCurr = (mCurr << 24) | c&0x00ffffff;
+ mCurr = (mCurr << 24) | (c&0x00ffffff);
mLeft += 24;
off+=3;
Modified: RawSpeed/DngDecoder.cpp
===================================================================
--- RawSpeed/DngDecoder.cpp 2010-03-21 17:16:20 UTC (rev 211)
+++ RawSpeed/DngDecoder.cpp 2010-03-21 17:23:30 UTC (rev 212)
@@ -365,7 +365,6 @@
else
black = 0;
} else if (black_entry->isFloat()) {
- const guint* blackarray = (const guint*)black_entry->getData();
black = (int)black_entry->getFloat();
}
}
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
