From 18f775d805ec349a1a95ff397b0baf50bcadef05 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Wed, 15 Nov 2017 00:54:05 +0100
Subject: [PATCH] review of ph1_bithuff

---
 rtengine/dcraw.cc | 3 ++-
 rtengine/dcraw.h  | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index 8da29761f..e0ef59c9b 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -1802,6 +1802,7 @@ void CLASS phase_one_load_raw_c()
     read_shorts ((ushort *) rblack[0], raw_width*2);
   for (i=0; i < 256; i++)
     curve[i] = i*i / 3.969 + 0.5;
+  ph1_bithuff_t ph1_bithuff(this, ifp, order);
   for (row=0; row < raw_height; row++) {
     fseek (ifp, data_offset + offset[row], SEEK_SET);
     ph1_init();
@@ -2258,13 +2259,13 @@ void CLASS hasselblad_load_raw()
 
   if (!ljpeg_start (&jh, 0)) return;
   order = 0x4949;
+  ph1_bithuff_t ph1_bithuff(this, ifp, order);
   hb_bits(-1);
   back[4] = (int *) calloc (raw_width, 3*sizeof **back);
   merror (back[4], "hasselblad_load_raw()");
   FORC3 back[c] = back[4] + c*raw_width;
   cblack[6] >>= sh = tiff_samples > 1;
   shot = LIM(shot_select, 1, tiff_samples) - 1;
-  ph1_bithuff_t ph1_bithuff(this, ifp, order);
   for (row=0; row < raw_height; row++) {
     FORC4 back[(c+3) & 3] = back[c];
     for (col=0; col < raw_width; col+=2) {
diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h
index f30c0c6f1..0a3316d63 100644
--- a/rtengine/dcraw.h
+++ b/rtengine/dcraw.h
@@ -59,7 +59,6 @@ public:
     ,RT_blacklevel_from_constant(0)
     ,RT_matrix_from_constant(0)
 	,getbithuff(this,ifp,zero_after_ff)
-	,ph1_bithuff(this,ifp,order)
 	,pana_bits(ifp,load_flags)
     {
         memset(&hbd, 0, sizeof(hbd));
@@ -316,7 +315,7 @@ void parse_qt (int end);
 // ph1_bithuff(int nbits, ushort *huff);
 class ph1_bithuff_t {
 public:
-   ph1_bithuff_t(DCraw *p,IMFILE *i,short &o):parent(p),order(o),ifp(i),bitbuf(0),vbits(0){}
+   ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):parent(p),order(o),ifp(i),bitbuf(0),vbits(0){}
    unsigned operator()(int nbits, ushort *huff);
    unsigned operator()(int nbits);
    unsigned operator()();
@@ -355,7 +354,6 @@ private:
    UINT64 bitbuf;
    int vbits;
 };
-ph1_bithuff_t ph1_bithuff;
 
 void phase_one_load_raw_c();
 void hasselblad_correct();