get bitmaps working

Author: dicengine

src/base/DICe.h

@@ -573,6 +573,7 @@ enum Image_File_Type{
   PNG,
   NETCDF,
   CINE,
+  BMP,
   MAX_IMAGE_FILE_TYPE,
   NO_SUCH_IMAGE_FILE_TYPE
 };

src/utils/src/DICe_ImageIO.cpp

@@ -147,6 +147,9 @@ Image_File_Type image_file_type(const char * file_name){
   const std::string jpeg("jpeg");
   if(file_str.find(jpg)!=std::string::npos||file_str.find(jpeg)!=std::string::npos)
     return JPEG;
+  const std::string bmp("bmp");
+  if(file_str.find(bmp)!=std::string::npos)
+    return BMP;
   const std::string png("png");
   if(file_str.find(png)!=std::string::npos)
     return PNG;

tests/component/DICe_TestImage.cpp

@@ -442,8 +442,6 @@ int main(int argc, char *argv[]) {
   }
   *outStream << "hierarchical image filter has been checked" << std::endl;
 
-  bool exception_thrown = false;
-
   // create an image from jpeg file:
   *outStream << "creating an image from a jpeg file " << std::endl;
   Teuchos::RCP<Image> img_jpg = Teuchos::rcp(new Image("./images/ImageB.jpg"));
@@ -489,19 +487,6 @@ int main(int argc, char *argv[]) {
     *outStream << "Error, the jpeg sub image does not have the right intensities." << std::endl;
     errorFlag++;
   }
-//  // test that unsupported file formats throw an exception
-//  exception_thrown = false;
-//  try{
-//    DICe::Image jpg("./images/invalid.jpg");
-//  }
-//  catch (const std::exception &e){
-//    exception_thrown = true;
-//    *outStream << ".jpg throws an exception as expected" << std::endl;
-//  }
-//  if(!exception_thrown){
-//    *outStream << "Error, an exception should have been thrown for unsupported .jpg file format, but was not" << std::endl;
-//    errorFlag++;
-//  }
   // create an image from jpeg file:
   *outStream << "creating an image from a png file " << std::endl;
   Teuchos::RCP<Image> img_png = Teuchos::rcp(new Image("./images/ImageB.png"));
@@ -547,31 +532,6 @@ int main(int argc, char *argv[]) {
     *outStream << "Error, the png sub image does not have the right intensities." << std::endl;
     errorFlag++;
   }
-//  // test that unsupported file formats throw an exception
-//  exception_thrown = false;
-//  try{
-//    DICe::Image png("./images/invalid.png");
-//  }
-//  catch (const std::exception &e){
-//    exception_thrown = true;
-//    *outStream << ".png throws an exception as expected" << std::endl;
-//  }
-//  if(!exception_thrown){
-//    *outStream << "Error, an exception should have been thrown for invalid .png file format, but was not" << std::endl;
-//    errorFlag++;
-//  }
-  // test that unsupported file formats throw an exception
-  try{
-    DICe::Image bmp("./images/invalid.bmp");
-  }
-  catch (const std::exception &e){
-    exception_thrown = true;
-    *outStream << ".bmp throws an exception as expected" << std::endl;
-  }
-  if(!exception_thrown){
-    *outStream << "Error, an exception should have been thrown for invalid .bmp file format, but was not" << std::endl;
-    errorFlag++;
-  }
 
   *outStream << "--- End test ---" << std::endl;
 

tests/component/images/invalid.bmp

@@ -11,6 +11,7 @@ SET(REGRESSION_TESTS
   conformal_subset_def
   dic_challenge_12
   dic_challenge_12_sorted
+  bitmap_star
 )
 
 IF(NOT DICE_USE_DOUBLE)

tests/component/images/invalid.png

@@ -0,0 +1,14 @@
+<!-- Auto generated input file from DICe GUI -->
+<ParameterList>
+<Parameter name="output_folder" type="string" value="./results/" /> 
+<Parameter name="correlation_parameters_file" type="string" value="params.xml" />
+<Parameter name="subset_size" type="int" value="31" />
+<Parameter name="step_size" type="int" value="15" />
+<Parameter name="separate_output_file_for_each_subset" type="bool" value="false" />
+<Parameter name="create_separate_run_info_file" type="bool" value="true" />
+<Parameter name="image_folder" type="string" value="" />
+<Parameter name="reference_image" type="string" value="./images/DIC_Challenge_Wave_Deformed_Noisy.bmp" />
+<ParameterList name="deformed_images">
+<Parameter name="./images/DIC_Challenge_Wave_Reference_Noisy.bmp" type="bool" value="true" />
+</ParameterList>
+</ParameterList>