Author: post
Date: 2011-03-19 20:38:48 +0100 (Sat, 19 Mar 2011)
New Revision: 348

Modified:
   RawSpeed/RawImage.cpp
   RawSpeed/RawImage.h
Log:
Minor adjustments.

Modified: RawSpeed/RawImage.cpp
===================================================================
--- RawSpeed/RawImage.cpp       2011-03-19 19:23:21 UTC (rev 347)
+++ RawSpeed/RawImage.cpp       2011-03-19 19:38:48 UTC (rev 348)
@@ -29,9 +29,9 @@
 namespace RawSpeed {
 
 RawImageData::RawImageData(void):
-    dim(0, 0), bpp(0), isCFA(true),
+    dim(0, 0), isCFA(true),
     blackLevel(-1), whitePoint(65536),
-    dataRefCount(0), data(0), cpp(1),
+    dataRefCount(0), data(0), cpp(1), bpp(0),
     uncropped_dim(0, 0) {
   blackLevelSeparate[0] = blackLevelSeparate[1] = blackLevelSeparate[2] = 
blackLevelSeparate[3] = -1;
   pthread_mutex_init(&mymutex, NULL);
@@ -39,9 +39,9 @@
 }
 
 RawImageData::RawImageData(iPoint2D _dim, uint32 _bpc, uint32 _cpp) :
-    dim(_dim), bpp(_bpc),
+    dim(_dim),
     blackLevel(-1), whitePoint(65536),
-    dataRefCount(0), data(0), cpp(cpp),
+    dataRefCount(0), data(0), cpp(cpp), bpp(_bpc),
     uncropped_dim(0, 0) {
   blackLevelSeparate[0] = blackLevelSeparate[1] = blackLevelSeparate[2] = 
blackLevelSeparate[3] = -1;
   subsampling.x = subsampling.y = 1;

Modified: RawSpeed/RawImage.h
===================================================================
--- RawSpeed/RawImage.h 2011-03-19 19:23:21 UTC (rev 347)
+++ RawSpeed/RawImage.h 2011-03-19 19:38:48 UTC (rev 348)
@@ -40,7 +40,7 @@
   void setCpp(uint32 val);
   virtual void createData();
   virtual void destroyData();
-  RawSpeed::RawImageType DataType() const { return dataType; }
+  RawSpeed::RawImageType getDataType() const { return dataType; }
   uchar8* getData();
   uchar8* getData(uint32 x, uint32 y);    // Not super fast, but safe. Don't 
use per pixel.
   uchar8* getDataUncropped(uint32 x, uint32 y);


_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit

Reply via email to