diff --git a/include/hdrplus/burst.h b/include/hdrplus/burst.h index 33d2f1c..36fddbd 100644 --- a/include/hdrplus/burst.h +++ b/include/hdrplus/burst.h @@ -20,7 +20,7 @@ class burst ~burst() = default; // Reference image index in the array - int reference_image_idx; + int m_reference_image_idx; // Source bayer images & grayscale unpadded image std::vector bayer_images; diff --git a/src/align.cpp b/src/align.cpp index 390c6cc..7dab071 100644 --- a/src/align.cpp +++ b/src/align.cpp @@ -936,13 +936,13 @@ namespace hdrplus // exit(-1); // Align every image - const std::vector& ref_grayimg_pyramid = per_grayimg_pyramid[burst_images.reference_image_idx]; + const std::vector& ref_grayimg_pyramid = per_grayimg_pyramid[burst_images.m_reference_image_idx]; std::vector>> curr_alignment; std::vector>> prev_alignment; for (int img_idx = 0; img_idx < burst_images.num_images; ++img_idx) { // Do not align with reference image - if (img_idx == burst_images.reference_image_idx) + if (img_idx == burst_images.m_reference_image_idx) continue; const std::vector& alt_grayimg_pyramid = per_grayimg_pyramid[img_idx]; diff --git a/src/burst.cpp b/src/burst.cpp index c0c83c8..3e52f47 100644 --- a/src/burst.cpp +++ b/src/burst.cpp @@ -30,16 +30,16 @@ burst::burst( const std::string& burst_path, const std::string& reference_image_ // Find reference image path in input directory // reference image path need to be absolute path - reference_image_idx = -1; + m_reference_image_idx = -1; for ( size_t i = 0; i < bayer_image_paths.size(); ++i ) { if ( bayer_image_paths[ i ] == reference_image_path ) { - reference_image_idx = i; + m_reference_image_idx = i; } } - if ( reference_image_idx == -1 ) + if (m_reference_image_idx == -1 ) { return; // throw std::runtime_error("Error unable to locate reference image " + reference_image_path ); @@ -53,7 +53,7 @@ burst::burst( const std::string& burst_path, const std::string& reference_image_ } printf("%s::%s reference image idx %d\n", \ - __FILE__, __func__, reference_image_idx ); + __FILE__, __func__, m_reference_image_idx); #endif // Get source bayer image @@ -109,13 +109,13 @@ burst::burst( const std::vector& bayer_image_paths, int reference_i // Find reference image path in input directory // reference image path need to be absolute path - reference_image_idx = -1; + m_reference_image_idx = -1; if ( reference_image_index >= 0 && reference_image_index < bayer_image_paths.size() ) { - reference_image_idx = reference_image_index; + m_reference_image_idx = reference_image_index; } - if ( reference_image_idx == -1 ) + if (m_reference_image_idx == -1 ) { return; // throw std::runtime_error("Error reference image index is out of range " ); @@ -129,7 +129,7 @@ burst::burst( const std::vector& bayer_image_paths, int reference_i } printf("%s::%s reference image idx %d\n", \ - __FILE__, __func__, reference_image_idx ); + __FILE__, __func__, m_reference_image_idx); #endif // Get source bayer image @@ -185,13 +185,13 @@ burst::burst( const std::vector >& bayer_image_contents, in // Find reference image path in input directory // reference image path need to be absolute path - reference_image_idx = -1; + m_reference_image_idx = -1; if ( reference_image_index >= 0 && reference_image_index < bayer_image_contents.size() ) { - reference_image_idx = reference_image_index; + m_reference_image_idx = reference_image_index; } - if ( reference_image_idx == -1 ) + if (m_reference_image_idx == -1 ) { return; // throw std::runtime_error("Error reference image index is out of range " ); @@ -199,7 +199,7 @@ burst::burst( const std::vector >& bayer_image_contents, in #ifndef NDEBUG printf("%s::%s reference image idx %d\n", \ - __FILE__, __func__, reference_image_idx ); + __FILE__, __func__, m_reference_image_idx); #endif // Get source bayer image @@ -255,13 +255,13 @@ burst::burst( const std::vector >& bayer_image_files, i // Find reference image path in input directory // reference image path need to be absolute path - reference_image_idx = -1; + m_reference_image_idx = -1; if ( reference_image_index >= 0 && reference_image_index < bayer_image_files.size() ) { - reference_image_idx = reference_image_index; + m_reference_image_idx = reference_image_index; } - if ( reference_image_idx == -1 ) + if (m_reference_image_idx == -1 ) { return; // throw std::runtime_error("Error reference image index is out of range " ); @@ -269,7 +269,7 @@ burst::burst( const std::vector >& bayer_image_files, i #ifndef NDEBUG printf("%s::%s reference image idx %d\n", \ - __FILE__, __func__, reference_image_idx ); + __FILE__, __func__, m_reference_image_idx); #endif // Get source bayer image diff --git a/src/finish.cpp b/src/finish.cpp index 4a16d65..2ad841c 100644 --- a/src/finish.cpp +++ b/src/finish.cpp @@ -602,7 +602,7 @@ namespace hdrplus writeCSV(DBG_OUTPUT_ROOT "merged.csv", burst_images.merged_bayer_image); #endif - this->refIdx = burst_images.reference_image_idx; + this->refIdx = burst_images.m_reference_image_idx; // this->burstPath = burstPath; // std::cout<<"processMerged:"<libraw_processor, params.rawpyArgs); std::cout << "size ref: " << processedRefImage.rows << "*" << processedRefImage.cols << std::endl; diff --git a/src/merge.cpp b/src/merge.cpp index 5f86776..4371fc4 100644 --- a/src/merge.cpp +++ b/src/merge.cpp @@ -14,12 +14,12 @@ namespace hdrplus // 4.1 Noise Parameters and RMS // Noise parameters calculated from baseline ISO noise parameters double lambda_shot, lambda_read; - std::tie(lambda_shot, lambda_read) = burst_images.bayer_images[burst_images.reference_image_idx].get_noise_params(); + std::tie(lambda_shot, lambda_read) = burst_images.bayer_images[burst_images.m_reference_image_idx].get_noise_params(); // 4.2-4.4 Denoising and Merging // Get padded bayer image - cv::Mat reference_image = burst_images.bayer_images_pad[burst_images.reference_image_idx]; + cv::Mat reference_image = burst_images.bayer_images_pad[burst_images.m_reference_image_idx]; #ifndef NDEBUG // cv::imwrite("ref.jpg", reference_image); #endif @@ -41,7 +41,7 @@ namespace hdrplus //create list of channel_i of alternate images: std::vector alternate_channel_i_list; for (int j = 0; j < burst_images.num_images; j++) { - if (j != burst_images.reference_image_idx) { + if (j != burst_images.m_reference_image_idx) { //get alternate image cv::Mat alt_image = burst_images.bayer_images_pad[j];