From d5a7a1d369dcc47803acf63f3d2b5f999b76f052 Mon Sep 17 00:00:00 2001 From: Andrei Sandor Date: Thu, 16 May 2024 15:27:49 -0400 Subject: [PATCH] COMP: Fix unused general macros This is to fix the -Wunused-macros warning from clang. This is about fixing general macros used in the code. In the commit, the macros are removed. However, I am wondering if we should comment them since someone might use them in the future. --- Modules/IO/BioRad/src/itkBioRadImageIO.cxx | 6 +-- Modules/IO/GIPL/src/itkGiplImageIO.cxx | 44 +++++++++---------- .../Siemens/src/itkSiemensVisionImageIO.cxx | 2 +- .../test/itkKmeansModelEstimatorTest.cxx | 6 +-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Modules/IO/BioRad/src/itkBioRadImageIO.cxx b/Modules/IO/BioRad/src/itkBioRadImageIO.cxx index c622cdcb6eb..b9b24646e4a 100644 --- a/Modules/IO/BioRad/src/itkBioRadImageIO.cxx +++ b/Modules/IO/BioRad/src/itkBioRadImageIO.cxx @@ -31,9 +31,9 @@ #include "itkMakeUniqueForOverwrite.h" #define BIORAD_HEADER_LENGTH 76 -#define BIORAD_NOTE_LENGTH 96 -#define BIORAD_NOTE_TEXT_LENGTH 80 -#define BIORAD_RGB_LUT_LENGTH 768 +// #define BIORAD_NOTE_LENGTH 96 +// #define BIORAD_NOTE_LENGTH 80 +// #define BIORAD_RGB_LUT_LENGTH 768 #define BIORAD_FILE_ID_OFFSET 54 #define BIORAD_MAGIC_NUMBER 12345 diff --git a/Modules/IO/GIPL/src/itkGiplImageIO.cxx b/Modules/IO/GIPL/src/itkGiplImageIO.cxx index e3c0da1b838..3dfd17cbb17 100644 --- a/Modules/IO/GIPL/src/itkGiplImageIO.cxx +++ b/Modules/IO/GIPL/src/itkGiplImageIO.cxx @@ -40,34 +40,34 @@ class GiplImageIOInternals #define GIPL_INT 32 #define GIPL_FLOAT 64 #define GIPL_DOUBLE 65 -#define GIPL_C_SHORT 144 -#define GIPL_C_INT 160 -#define GIPL_C_FLOAT 192 -#define GIPL_C_DOUBLE 193 -#define GIPL_SURFACE 200 -#define GIPL_POLYGON 201 +// #define GIPL_C_SHORT 144 +// #define GIPL_C_INT 160 +// #define GIPL_C_FLOAT 192 +// #define GIPL_C_DOUBLE 193 +// #define GIPL_SURFACE 200 +// #define GIPL_POLYGON 201 /* ORIENTATION DEFINITIONS (flag1) */ -#define UNDEFINED 0 -#define UNDEFINED_PROJECTION 1 -#define AP_PROJECTION 2 -#define LATERAL_PROJECTION 3 -#define OBLIQUE_PROJECTION 4 -#define UNDEFINED_TOMO 8 -#define AXIAL 9 -#define CORONAL 10 -#define SAGITTAL 11 -#define OBLIQUE_TOMO 12 +// #define UNDEFINED 0 +// #define UNDEFINED_PROJECTION 1 +// #define AP_PROJECTION 2 +// #define LATERAL_PROJECTION 3 +// #define OBLIQUE_PROJECTION 4 +// #define UNDEFINED_TOMO 8 +// #define AXIAL 9 +// #define CORONAL 10 +// #define SAGITTAL 11 +// #define OBLIQUE_TOMO 12 /* FORMAT DEFINITIONS */ -#define FORMAT_GIPL 0 -#define FORMAT_GIPL_STRING "Gipl" -#define FORMAT_MAYO 1 -#define FORMAT_MAYO_STRING "Mayo" -#define FORMAT_NM_IGE 2 -#define FORMAT_NM_IGE_STRING "Starcam" +// #define FORMAT_GIPL 0 +// #define FORMAT_GIPL_STRING "Gipl" +// #define FORMAT_MAYO 1 +// #define FORMAT_MAYO_STRING "Mayo" +// #define FORMAT_NM_IGE 2 +// #define FORMAT_NM_IGE_STRING "Starcam" #define GIPL_MAGIC_NUMBER 0xefffe9b0 #define GIPL_MAGIC_NUMBER2 0x2ae389b8 diff --git a/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx b/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx index 48bc2761771..5ce05187c89 100644 --- a/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx +++ b/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx @@ -85,7 +85,7 @@ SiemensVisionImageIO::ReadHeader(const char * FileNameToRead) # define DB(x) #endif -#define GE_PROD_STR "SIEMENS" +// #define GE_PROD_STR "SIEMENS" #define TEMPLEN 2048 auto * hdr = new GEImageHeader; if (hdr == nullptr) diff --git a/Modules/Segmentation/Classifiers/test/itkKmeansModelEstimatorTest.cxx b/Modules/Segmentation/Classifiers/test/itkKmeansModelEstimatorTest.cxx index 4eceb00ac31..b9f0583e564 100644 --- a/Modules/Segmentation/Classifiers/test/itkKmeansModelEstimatorTest.cxx +++ b/Modules/Segmentation/Classifiers/test/itkKmeansModelEstimatorTest.cxx @@ -24,9 +24,9 @@ // Data definitions #define IMGWIDTH 16 #define IMGHEIGHT 1 -#define NFRAMES 1 -#define NUMBANDS 2 -#define NDIMENSION 3 +// #define NFRAMES 1 +// #define NUMBANDS 2 +// #define NDIMENSION 3 #define CDBKWIDTH 4 #define CDBKHEIGHT 1