[Rawstudio-commit] rawspeed r494 - RawSpeed

[Klaus Post]

Author: post
Date: 2012-11-10 16:10:59 +0100 (Sat, 10 Nov 2012)
New Revision: 494

Modified:
   RawSpeed/BitPumpPlain.cpp
   RawSpeed/BitPumpPlain.h
   RawSpeed/OrfDecoder.cpp
Log:
Fix stricter GCC Syntax.

Modified: RawSpeed/BitPumpPlain.cpp
===================================================================
--- RawSpeed/BitPumpPlain.cpp   2012-11-10 14:56:54 UTC (rev 493)
+++ RawSpeed/BitPumpPlain.cpp   2012-11-10 15:10:59 UTC (rev 494)
@@ -38,27 +38,27 @@
     buffer(_buffer), size(_size*8), off(0) {
 }
 
-uint32 BitPumpPlain::getBit() {
+uint32 BitPumpPlain::getBit() throw() {
   uint32 v = *(uint32*) & buffer[off>>3] >> (off & 7) & 1;
   off++;
   return v;
 }
 
-uint32 BitPumpPlain::getBits(uint32 nbits) {
+uint32 BitPumpPlain::getBits(uint32 nbits) throw() {
   uint32 v = *(uint32*) & buffer[off>>3] >> (off & 7) & ((1 << nbits) - 1);
   off += nbits;
   return v;
 }
 
-uint32 BitPumpPlain::peekBit() {
+uint32 BitPumpPlain::peekBit() throw() {
   return *(uint32*)&buffer[off>>3] >> (off&7) & 1;
 }
 
-uint32 BitPumpPlain::peekBits(uint32 nbits) {
+uint32 BitPumpPlain::peekBits(uint32 nbits) throw() {
   return *(uint32*)&buffer[off>>3] >> (off&7) & ((1 << nbits) - 1);
 }
 
-uint32 BitPumpPlain::peekByte() {
+uint32 BitPumpPlain::peekByte() throw() {
   return *(uint32*)&buffer[off>>3] >> (off&7) & 0xff;
 }
 
@@ -77,7 +77,7 @@
   checkPos();
 }
 
-uchar8 BitPumpPlain::getByte() {
+uchar8 BitPumpPlain::getByte() throw() {
   uint32 v = *(uint32*) & buffer[off>>3] >> (off & 7) & 0xff;
   off += 8;
   return v;

Modified: RawSpeed/BitPumpPlain.h
===================================================================
--- RawSpeed/BitPumpPlain.h     2012-11-10 14:56:54 UTC (rev 493)
+++ RawSpeed/BitPumpPlain.h     2012-11-10 15:10:59 UTC (rev 494)
@@ -19,8 +19,8 @@
 
     http://www.klauspost.com
 */
-#ifndef BIT_PUMP_PLAIN_H
-#define BIT_PUMP_PLAIN_H
+#ifndef BIT_PUMP_PLAIN_H
+#define BIT_PUMP_PLAIN_H
 
 #include "ByteStream.h"
 
@@ -41,7 +41,7 @@
        uint32 peekBit() throw ();
   uint32 peekByte() throw ();
   void skipBits(uint32 nbits);
-       uchar8 getByte();
+       uchar8 getByte() throw();
        uchar8 getByteSafe();
        void setAbsoluteOffset(uint32 offset);
   uint32 getOffset() { return off>>3;}
@@ -56,5 +56,5 @@
 };
 
 } // namespace RawSpeed
-
-#endif
+
+#endif

Modified: RawSpeed/OrfDecoder.cpp
===================================================================
--- RawSpeed/OrfDecoder.cpp     2012-11-10 14:56:54 UTC (rev 493)
+++ RawSpeed/OrfDecoder.cpp     2012-11-10 15:10:59 UTC (rev 494)
@@ -95,7 +95,9 @@
   ByteStream s(mFile->getData(offsets->getInt()), counts->getInt() + 3);
 
   if ((hints.find(string("force_uncompressed")) != hints.end())) {
-    readUncompressedRaw(ByteStream(mFile->getData(offsets->getInt()), 
counts->getInt() + 3), iPoint2D(width, height),iPoint2D(0,0),width*bps/8,bps, 
BitOrder_Jpeg32);
+    ByteStream in(mFile->getData(offsets->getInt()), counts->getInt() + 3);
+    iPoint2D size(width, height),pos(0,0);
+    readUncompressedRaw(in, size, pos, width*bps/8,bps, BitOrder_Jpeg32);
     return mRaw;
   }
 


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit