add ignore edge function in pdiff.

files/source/CompareArgs.cpp

 /*
 Comapre Args
 Copyright (C) 2006 Yangli Hector Yee
 
 This program is free software; you can redistribute it and/or modify it under the terms of the
 GNU General Public License as published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
 without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ skipping 14 matching lines @@
 PerceptualDiff comes with ABSOLUTELY NO WARRANTY;\n\
 This is free software, and you are welcome\n\
 to redistribute it under certain conditions;\n\
 See the GPL page for details: http://www.gnu.org/copyleft/gpl.html\n\n";
 
 static const char *usage =
 "PeceptualDiff image1.tif image2.tif\n\n\
    Compares image1.tif and image2.tif using a perceptually based image metric\n\
    Options:\n\
 \t-verbose       : Turns on verbose mode\n\
-\t-noedge        : Turns on edge detection, and ignore all edges in comparison\n\
+\t-ignoreEdges e : Ignore edges in comparison. e (0 to 7) is the\n\
+\t                 max number of neighbors the pixel can have to\n\
+\t                 be considered as edge.\n\
 \t-fov deg       : Field of view in degrees (0.1 to 89.9)\n\
 \t-threshold p   : #pixels p below which differences are ignored\n\
 \t-gamma g       : Value to convert rgb into linear space (default 2.2)\n\
 \t-luminance l   : White luminance (default 100.0 cdm^-2)\n\
 \t-luminanceonly : Only consider luminance; ignore chroma (color) in the comparison\n\
 \t-colorfactor   : How much of color to use, 0.0 to 1.0, 0.0 = ignore color.\n\
 \t-downsample    : How many powers of two to down sample the image.\n\
 \t-output o.ppm  : Write difference to the file o.ppm\n\
 \n\
 \n Note: Input or Output files can also be in the PNG or JPG format or any format\
 \n that FreeImage supports.\
 \n";
 
 CompareArgs::CompareArgs()
 {
         ImgA = NULL;
         ImgB = NULL;
         ImgDiff = NULL;
         Verbose = false;
         LuminanceOnly = false;
-    EdgeDetect = false;

[vangelis, 2009/06/30 02:35:05]

Please match the indentation of the rest of the items.

+        IgnoreEdge = false;
+        EdgeNeighborNum = 0;
         FieldOfView = 45.0f;
         Gamma = 2.2f;
         ThresholdPixels = 100;
         Luminance = 100.0f;
    ColorFactor = 1.0f;
    DownSample = 0;
 }
 
 CompareArgs::~CompareArgs()
 {
         if (ImgA) delete ImgA;
         if (ImgB) delete ImgB;
         if (ImgDiff) delete ImgDiff;
 }
 
 bool CompareArgs::Parse_Args(int argc, char **argv)
 {
         if (argc < 3) {
                 ErrorStr = copyright;
                 ErrorStr += usage;
                 return false;
         }
         int image_count = 0;
         const char* output_file_name = NULL;
         for (int i = 1; i < argc; i++) {
                 if (strcmp(argv[i], "-fov") == 0) {
                         if (++i < argc) {
                                 FieldOfView = (float) atof(argv[i]);
                         }
-                } 
-                //*********************************************
-                // Add a new option as edgedetect
-                //*********************************************

[vangelis, 2009/06/30 02:35:05]

No need to have the comment above.  Better to stay consistent with the rest of
the code. 

-                else if (strcmp(argv[i], "-noedge") == 0) {
-                        EdgeDetect = true;
-                }
-                else if (strcmp(argv[i], "-verbose") == 0) {
+                } else if (strcmp(argv[i], "-ignoreEdges") == 0) {
+                        if (++i < argc) {
+                                IgnoreEdge = true;
+                                EdgeNeighborNum = (float) atoi(argv[i]);
+                                if (EdgeNeighborNum < 0)
+                                        EdgeNeighborNum = 0;
+                                if (EdgeNeighborNum > 7)
+                                        EdgeNeighborNum = 7;
+                        }
+                } else if (strcmp(argv[i], "-verbose") == 0) {
                         Verbose = true;
                 } else if (strcmp(argv[i], "-threshold") == 0) {
                         if (++i < argc) {
                                 ThresholdPixels = atoi(argv[i]);
                         }
                 } else if (strcmp(argv[i], "-gamma") == 0) {
                         if (++i < argc) {
                                 Gamma = (float) atof(argv[i]);
                         }
                 } else if (strcmp(argv[i], "-luminance") == 0) {
@@ skipping 42 matching lines @@
       if (tmp) {
          delete ImgA;
          ImgA = tmp;
       }
       tmp = ImgB->DownSample();
       if (tmp) {
          delete ImgB;
          ImgB = tmp;
       }
    }
-        if(output_file_name) {
-                ImgDiff = new RGBAImage(ImgA->Get_Width(), ImgA->Get_Height(), output_file_name);
-        }
-    else if (EdgeDetect)

[vangelis, 2009/06/30 02:35:05]

this doesn't allow us to use both an output file name and edge detect at the
same time.  Do we really want that? 

+
+    if(output_file_name) {
+        ImgDiff = new RGBAImage(ImgA->Get_Width(), ImgA->Get_Height(), 
+                                output_file_name);
+    }
+    // if no output_file_name is specified, and edge detection is enabled.
+    // create ImgDiff with default name.
+    else if (IgnoreEdge)
     {
         ImgDiff = new RGBAImage(ImgA->Get_Width(), ImgA->Get_Height());
     }
-        return true;
+    return true;
 }
 
 void CompareArgs::Print_Args()
 {
         printf("Field of view is %f degrees\n", FieldOfView);
         printf("Threshold pixels is %d pixels\n", ThresholdPixels);
         printf("The Gamma is %f\n", Gamma);
         printf("The Display's luminance is %f candela per meter squared\n", Luminance);
 }