[Rawstudio-commit] rawspeed r232 - RawSpeed

[Klaus Post]

Author: post
Date: 2010-04-30 13:54:06 +0200 (Fri, 30 Apr 2010)
New Revision: 232

Modified:
   RawSpeed/RawDecoder.cpp
Log:
Fix a few GCC warnings.

Modified: RawSpeed/RawDecoder.cpp
===================================================================
--- RawSpeed/RawDecoder.cpp     2010-04-25 20:06:19 UTC (rev 231)
+++ RawSpeed/RawDecoder.cpp     2010-04-30 11:54:06 UTC (rev 232)
@@ -24,7 +24,7 @@
 
 namespace RawSpeed {
 
-RawDecoder::RawDecoder(FileMap* file) : mFile(file), mRaw(RawImage::create()) {
+       RawDecoder::RawDecoder(FileMap* file) : mRaw(RawImage::create()), 
mFile(file) {
   decoderVersion = 0;
 }
 
@@ -80,7 +80,7 @@
              input.getData(), inputPitch, w*mRaw->bpp, h - y);
       return;
     }
-    if (bitPerPixel == 12 && w == inputPitch * 8 / 12)  {
+    if (bitPerPixel == 12 && (int)w == inputPitch * 8 / 12)  {
       Decode12BitRaw(input, w, h);
       return;
     }
@@ -103,7 +103,7 @@
   guint pitch = mRaw->pitch;
   const guchar *in = input.getData();
   if (input.getRemainSize() < ((w*12/8)*h)) {
-    if ((int)input.getRemainSize() > (w*12/8))
+    if ((guint)input.getRemainSize() > (w*12/8))
       h = input.getRemainSize() / (w*12/8) - 1;
     else
       ThrowIOE("readUncompressedRaw: Not enough data to decode a single line. 
Image file truncated.");


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