X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fdcraw.h;h=3a12493236be862390313e07de195cbfa8e0d598;hb=5621db270ccbeabc106e0f438941dba6f930652b;hp=c0f567791a660c4b39510ee5322761507028fea9;hpb=17e433a6e5021cc080101fd88ac3236dacb9f2e8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/dcraw.h b/cinelerra-5.1/cinelerra/dcraw.h
index c0f56779..3a124932 100644
--- a/cinelerra-5.1/cinelerra/dcraw.h
+++ b/cinelerra-5.1/cinelerra/dcraw.h
@@ -87,6 +87,10 @@ public:
 	unsigned fov_huff[1024];
 	float clb_cbrt[0x10000], clb_xyz_cam[3][4];
 	uchar pana_buf[0x4000];  int pana_vbits;
+// const static data
+	static const double xyz_rgb[3][3];
+	static const float d65_white[3];
+
 };
 
 class DCRaw : public DCRaw_data {
@@ -159,6 +163,8 @@ private:
 	unsigned pana_bits(int nbits);
 	void panasonic_load_raw(void);
 	void olympus_load_raw(void);
+	void canon_crx_load_raw();
+	void fuji_xtrans_load_raw();
 	void minolta_rd175_load_raw(void);
 	void quicktake_100_load_raw(void);
 	void kodak_radc_load_raw(void);
@@ -251,6 +257,7 @@ private:
 	void parse_fuji(int offset);
 	int parse_jpeg(int offset);
 	void parse_riff(void);
+	void parse_crx(int end);
 	void parse_qt(int end);
 	void parse_smal(int offset,int fsize);
 	void parse_cine(void);
@@ -275,13 +282,6 @@ private:
 	void write_ppm_tiff(void);
 	void write_cinelerra(void);
 	void reset();
-//const data
-	const double xyz_rgb[3][3] = {			/* XYZ from RGB */
-		{ 0.412453, 0.357580, 0.180423 },
-		{ 0.212671, 0.715160, 0.072169 },
-		{ 0.019334, 0.119193, 0.950227 } };
-	const float d65_white[3] = { 0.950456, 1, 1.088754 };
-
 public:
 	DCRaw();
 	~DCRaw();