Author: post
Date: 2010-09-22 20:48:28 +0200 (Wed, 22 Sep 2010)
New Revision: 276
Modified:
RawSpeed/NefDecoder.cpp
RawSpeed/NefDecoder.h
Log:
Fix GCC issues.
Modified: RawSpeed/NefDecoder.cpp
===================================================================
--- RawSpeed/NefDecoder.cpp 2010-09-22 18:41:42 UTC (rev 275)
+++ RawSpeed/NefDecoder.cpp 2010-09-22 18:48:28 UTC (rev 276)
@@ -213,7 +213,6 @@
uint32 w = size.x;
uint32 h = size.y;
uint32 cpp = mRaw->getCpp();
- uint32 bitPerPixel = 12;
if (input.getRemainSize() < (inputPitch*h)) {
if ((int)input.getRemainSize() > inputPitch)
h = input.getRemainSize() / inputPitch - 1;
@@ -221,7 +220,6 @@
ThrowIOE("readUncompressedRaw: Not enough data to decode a single line.
Image file truncated.");
}
- uint32 skipBits = inputPitch - w * bitPerPixel / 8; // Skip per line
if (offset.y > mRaw->dim.y)
ThrowRDE("readUncompressedRaw: Invalid y offset");
if (offset.x + size.x > mRaw->dim.x)
Modified: RawSpeed/NefDecoder.h
===================================================================
--- RawSpeed/NefDecoder.h 2010-09-22 18:41:42 UTC (rev 275)
+++ RawSpeed/NefDecoder.h 2010-09-22 18:48:28 UTC (rev 276)
@@ -43,7 +43,7 @@
bool D100IsCompressed(uint32 offset);
void DecodeUncompressed();
void DecodeD100Uncompressed();
- void NefDecoder::readCoolpixMangledRaw(ByteStream &input, iPoint2D& size,
iPoint2D& offset, int inputPitch);
+ void readCoolpixMangledRaw(ByteStream &input, iPoint2D& size, iPoint2D&
offset, int inputPitch);
};
class NefSlice {
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
