Fix DIS coding style by running them all through clang-format

Also fixes a missing header in DISstressmarkRNG.h and the "all"
make target. No functional changes.

1 files changed, 198 insertions, 237 deletions

diff --git a/dis/Neighborhood/utili.h b/dis/Neighborhood/utili.h
index 5b54d9b..b5a7498 100644
--- a/dis/Neighborhood/utili.h
+++ b/dis/Neighborhood/utili.h
@@ -1,12 +1,12 @@
 /*
  *  Sample code for the DIS Pointer Stressmark
  *
- * This source code is the completely correct source code based on 
- * the example codes provided by Atlantic Aerospace Division, Titan 
+ * This source code is the completely correct source code based on
+ * the example codes provided by Atlantic Aerospace Division, Titan
  * Systems Corporation, 2000.
- * 
- * If you just compile and generate the executables from this source 
- * code, this code would be enough. However, if you wish to get a complete 
+ *
+ * If you just compile and generate the executables from this source
+ * code, this code would be enough. However, if you wish to get a complete
  * understanding of this stressmark, it is strongly suggested that you
  * read the Benchmark Analysis and Specifications Document Version 1.0
  * before going on since the detailed comments are given in this documents.
@@ -22,287 +22,248 @@
 
 #define MIN_PIXEL 0
 #define MAX_DIMENSION 32768
-#define MIN_SEED  -2147483647
-#define MAX_SEED  -1
+#define MIN_SEED -2147483647
+#define MAX_SEED -1
 #define MAX_NUMBER_LINES 65536
-#define MIN_BIT_DEPTH    7
-#define MAX_BIT_DEPTH    15
+#define MIN_BIT_DEPTH 7
+#define MAX_BIT_DEPTH 15
 
 typedef struct {
   int column;
   int row;
-}Coord;
+} Coord;
 
-/* 
+/*
  * Neighborhood structure consists of the GLCM descriptors entropy and
- * energy for each of 2 distance and 4 angels 
+ * energy for each of 2 distance and 4 angels
  */
 typedef struct {
   float entropy;
   float energy;
-}Descriptors;
+} Descriptors;
 
 typedef struct {
   Descriptors deg0;
   Descriptors deg45;
   Descriptors deg90;
   Descriptors deg135;
-}Angeles;
+} Angeles;
 
 typedef struct {
   Angeles distShort;
   Angeles distLong;
-}Neighborhood;
+} Neighborhood;
 
 typedef short int Pixel; /* short int;*/
 
 typedef struct {
-  int           numColumns;     /* number of columns in image */
-  int           numRows;        /* number of rows in image */
-  Pixel         maxImageValue;  /* max legal image value */
-  Pixel         *data;          /* data pointer */
+  int numColumns;      /* number of columns in image */
+  int numRows;         /* number of rows in image */
+  Pixel maxImageValue; /* max legal image value */
+  Pixel *data;         /* data pointer */
 } Image;
 
 // For correct implementation of drawLineSegment
 #include "initializeImage.c"
 
-Pixel *createImage (Pixel *image,
-            int dimension,
-                    Pixel maxPixel,
-                    int numberLines,
-                    int minThickness,
-                    int maxThickness)
-  {
-    int i;
-    
-    Coord startPoint;
-    Coord endPoint;
-    int thickness;
-    int startValue;
-    int endValue;
-    Image img;
-    img.numColumns = dimension;
-    img.numRows = dimension;
-    img.maxImageValue = maxPixel;
-    img.data = image;
-
-    for (i=0; i<dimension*dimension; i++){
-      image[i] = 0;
-    }
+Pixel *createImage(Pixel *image, int dimension, Pixel maxPixel, int numberLines,
+                   int minThickness, int maxThickness) {
+  int i;
+
+  Coord startPoint;
+  Coord endPoint;
+  int thickness;
+  int startValue;
+  int endValue;
+  Image img;
+  img.numColumns = dimension;
+  img.numRows = dimension;
+  img.maxImageValue = maxPixel;
+  img.data = image;
+
+  for (i = 0; i < dimension * dimension; i++) {
+    image[i] = 0;
+  }
 
-    for (i=0; i<numberLines; i++){
-      float temp;
-      float prev;
+  for (i = 0; i < numberLines; i++) {
+    float temp;
+    float prev;
 
-      temp = randomUInt(0, dimension*dimension - 1);
-      startPoint.row = (int) temp/dimension;
-      startPoint.column = (int) temp % dimension;
-      prev = temp;
+    temp = randomUInt(0, dimension * dimension - 1);
+    startPoint.row = (int)temp / dimension;
+    startPoint.column = (int)temp % dimension;
+    prev = temp;
 
-      // Make sure that the end is different than the start
-      while((temp = randomUInt(0, dimension*dimension -1)) == prev);
+    // Make sure that the end is different than the start
+    while ((temp = randomUInt(0, dimension * dimension - 1)) == prev)
+      ;
 
-      endPoint.row = (int) temp/dimension;
-      endPoint.column = (int) temp% dimension;
+    endPoint.row = (int)temp / dimension;
+    endPoint.column = (int)temp % dimension;
 
-      thickness = randomUInt(minThickness, maxThickness);
-      startValue = randomUInt(MIN_PIXEL, maxPixel);
-      endValue = randomUInt(MIN_PIXEL, maxPixel);
+    thickness = randomUInt(minThickness, maxThickness);
+    startValue = randomUInt(MIN_PIXEL, maxPixel);
+    endValue = randomUInt(MIN_PIXEL, maxPixel);
 
-      drawLineSegment(&startPoint, &endPoint,
-                      startValue, endValue, thickness, &img);
-    }
-    return(image);
+    drawLineSegment(&startPoint, &endPoint, startValue, endValue, thickness,
+                    &img);
+  }
+  return (image);
 }
 
+void calcEntropyEnergy(int *sumHist, int *diffHist, Pixel *image, int numBins,
+                       int dx, int dy, float *entropy, float *energy,
+                       int dimension, Pixel maxPixel) {
+  int index;
+  int totalNumPixels;
+  int rowIndex;
+  int rowLow, rowHigh;
+  int columnIndex;
+  int columnLow, columnHigh;
+  int columnForPixelAtDistance;
+  int rowForPixelAtDistance;
+  int value0RowOffset;
+  int value1RowOffset;
+
+  *entropy = 0.0;
+  *energy = 0.0;
+
+  for (index = 0; index < numBins; index++) {
+    sumHist[index] = 0;
+    diffHist[index] = 0;
+  }
 
-void calcEntropyEnergy(
-                       int *sumHist,
-                       int *diffHist,
-                       Pixel *image,
-                       int numBins,
+  if (dy < 0) {
+    rowLow = -dy;
+    rowHigh = dimension;
+  } else {
+    rowLow = 0;