Fix: Windows build — strings.h and stricmp compatibility

README.md

@@ -75,6 +75,18 @@ $ cmake ../
 
 For Xcode, use command line switch `-G Xcode`. On Windows, CMake should automatically figure out installed version of Visual Studio and generate corresponding project files.
 
+Mac build instructions, after running the above:
+```
+$ make .
+$ ./source/app/gpr_tools/gpr_tools
+```
+
+Linux build instructions, after running the above:
+```
+$ make 
+$ ./source/app/gpr_tools/gpr_tools
+```
+
 ## Using gpr_tools
 
 Some example commands are shown below:

source/app/common/argument_parser/argument_parser.cpp

@@ -56,10 +56,9 @@ void argument_parser::set_options()
 
 int argument_parser::parse(int argc, char *argv [], const char* application_text, const char* prefix_text)
 {
-    application_path = argv[0];
     argument_count = argc;
 
-    for (int i = 0; i < argc; i++)
+    for (int i = 0; i < argument_count; i++)
         arguments[i] = argv[i];
 
     set_options();

source/app/gpr_tools/main_c.c

@@ -17,13 +17,18 @@
  */
 
 #include <stdio.h>
+#ifndef _WIN32
+#include <strings.h>
+#endif
 #include <string.h>
 #include <stdbool.h>
 
 #include "gpr.h"
 
 #if defined __GNUC__
 #define stricmp strcasecmp
+#elif defined _WIN32
+#define stricmp _stricmp
 #else
 #endif // if defined __GNUC__
 
@@ -297,6 +302,8 @@ int dng_convert_main(const char*  input_file_path, unsigned int input_width, uns
             write_buffer_to_file = false;
 #if GPR_JPEG_AVAILABLE
             tje_encode_to_file( output_file_path, rgb_buffer.width, rgb_buffer.height, 3, rgb_buffer.buffer );
+#elif defined _WIN32
+#define stricmp _stricmp
 #else
             printf("JPG writing capability is disabled. You could still write to a PPM file");
 #endif

source/lib/common/private/gpr_buffer.c

@@ -34,22 +34,23 @@ int read_from_file(gpr_buffer* buffer, const char* file_path, gpr_malloc malloc_
     }
 
     fseek (fIN, 0, SEEK_END);
-    buffer->size = (int32_t) ftell(fIN);
+    buffer->size = (size_t) ftell(fIN);
     rewind (fIN);
 
     buffer->buffer = malloc_function(buffer->size);
 
     if ( buffer->buffer == NULL)
     {
         fputs ("Memory error", stderr);
+        fclose(fIN);
         return -1;
     }
 
-    long result = fread(buffer->buffer, 1, buffer->size, fIN);
-    if (result != buffer->size)
+    if (fread(buffer->buffer, 1, buffer->size, fIN) != buffer->size)
     {
         free_function(buffer->buffer);
         fputs ("Reading error", stderr);
+        fclose(fIN);
         return -1;
     }
 
@@ -73,6 +74,7 @@ int write_to_file(const gpr_buffer* buffer, const char* file_path)
     if( bytes_written != buffer->size ) {
         fputs("Could not write bytes \n", stderr);
         perror("fwrite()");
+        fclose(fOUT);
         return -2;
     }
 

source/lib/common/private/log.c

@@ -23,7 +23,7 @@
 
 TIMER LogTimer;
 
-bool LogInit()
+bool LogInit(void)
 {
     InitTimer(&LogTimer);
 
@@ -54,7 +54,7 @@ int LogPrint(const char* format, ... )
 }
 #endif // LogPrint
 
-bool LogUninit()
+bool LogUninit(void)
 {
     return true;
 }

source/lib/common/private/log.h

@@ -25,13 +25,13 @@
 extern "C" {
 #endif
 
-    bool LogInit();
+    bool LogInit(void);
 
     #ifndef LogPrint
     int  LogPrint(const char* format, ... );
     #endif
 
-    bool LogUninit();
+    bool LogUninit(void);
 
     #define TIMESTAMP(x, y) TIMESTAMP_##y(x)
 

source/lib/dng_sdk/dng_lossless_jpeg.cpp

@@ -1670,7 +1670,7 @@ inline void dng_lossless_decoder::HuffExtend (int32 &x, int32 s)
 
 	if (x < (0x08000 >> (16 - s)))
 		{
-		x += (-1 << s) + 1;
+		x += -(1 << s) + 1;
 		}
 
 	}

source/lib/dng_sdk/dng_misc_opcodes.h

@@ -106,28 +106,28 @@ class dng_area_spec
 
 		/// The first plane.
 
-		const uint32 Plane () const
+		uint32 Plane () const
 			{
 			return fPlane;
 			}
 
 		/// The total number of planes.
 
-		const uint32 Planes () const
+		uint32 Planes () const
 			{
 			return fPlanes;
 			}
 
 		/// The row pitch (i.e., stride). A pitch of 1 means all rows.
 
-		const uint32 RowPitch () const
+		uint32 RowPitch () const
 			{
 			return fRowPitch;
 			}
 
 		/// The column pitch (i.e., stride). A pitch of 1 means all columns.
 
-		const uint32 ColPitch () const
+		uint32 ColPitch () const
 			{
 			return fColPitch;
 			}

source/lib/dng_sdk/dng_negative.cpp

@@ -2716,7 +2716,7 @@ void dng_negative::SetFujiMosaic6x6 (uint32 phase)
 	info.fCFAPattern [5] [4] = color2;
 	info.fCFAPattern [5] [5] = color1;
 
-	DNG_REQUIRE (phase >= 0 && phase < patSize * patSize,
+	DNG_REQUIRE (phase < patSize * patSize,
 				 "Bad phase in SetFujiMosaic6x6.");
 
 	if (phase > 0)

source/lib/dng_sdk/dng_resample.h

@@ -95,7 +95,7 @@ class dng_resample_coords
 			return fCoords->Buffer_int32 () + (index - fOrigin);
 			}
 
-		const int32 Pixel (int32 index) const
+		int32 Pixel (int32 index) const
 			{
 			return Coords (index) [0] >> kResampleSubsampleBits;
 			}

source/lib/expat_lib/internal.h

@@ -34,6 +34,12 @@
 #define PTRFASTCALL __attribute__((regparm(3)))
 #endif
 
+#if defined(__GNUC__) && __GNUC__ >= 7 || defined(__clang__) && __clang_major__ >= 10
+#define FALL_THROUGH __attribute__ ((fallthrough))
+#else
+#define FALL_THROUGH ((void)0)
+#endif
+
 /* Using __fastcall seems to have an unexpected negative effect under
    MS VC++, especially for function pointers, so we won't use it for
    now on that platform. It may be reconsidered for a future release

source/lib/expat_lib/xmlparse.c

@@ -1502,6 +1502,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
       errorCode = XML_ERROR_NO_MEMORY;
       return XML_STATUS_ERROR;
     }
+    FALL_THROUGH;
   default:
     ps_parsing = XML_PARSING;
   }
@@ -1528,6 +1529,7 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
       case XML_INITIALIZED:
       case XML_PARSING:
         ps_parsing = XML_FINISHED;
+        FALL_THROUGH;
         /* fall through */
       default:
         return XML_STATUS_OK;
@@ -1564,7 +1566,8 @@ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal)
           ps_parsing = XML_FINISHED;
           return XML_STATUS_OK;
         }
-      /* fall through */
+        FALL_THROUGH;
+        /* fall through */
       default:
         result = XML_STATUS_OK;
       }
@@ -1628,6 +1631,7 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal)
       errorCode = XML_ERROR_NO_MEMORY;
       return XML_STATUS_ERROR;
     }
+    FALL_THROUGH;
   default:
     ps_parsing = XML_PARSING;
   }
@@ -2370,7 +2374,6 @@ doContent(XML_Parser parser,
         break;
       }
     case XML_TOK_START_TAG_NO_ATTS:
-      /* fall through */
     case XML_TOK_START_TAG_WITH_ATTS:
       {
         TAG *tag;
@@ -2439,7 +2442,6 @@ doContent(XML_Parser parser,
         break;
       }
     case XML_TOK_EMPTY_ELEMENT_NO_ATTS:
-      /* fall through */
     case XML_TOK_EMPTY_ELEMENT_WITH_ATTS:
       {
         const char *rawName = s + enc->minBytesPerChar;
@@ -3895,6 +3897,7 @@ doProlog(XML_Parser parser,
         handleDefault = XML_FALSE;
         goto alreadyChecked;
       }
+      FALL_THROUGH;
       /* fall through */
     case XML_ROLE_ENTITY_PUBLIC_ID:
       if (!XmlIsPublicId(enc, s, next, eventPP))
@@ -4197,6 +4200,7 @@ doProlog(XML_Parser parser,
           return XML_ERROR_NO_MEMORY;
         declEntity->publicId = NULL;
       }
+      FALL_THROUGH;
       /* fall through */
 #endif /* XML_DTD */
     case XML_ROLE_ENTITY_SYSTEM_ID:
@@ -4977,6 +4981,7 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
       break;
     case XML_TOK_TRAILING_CR:
       next = ptr + enc->minBytesPerChar;
+      FALL_THROUGH;
       /* fall through */
     case XML_TOK_ATTRIBUTE_VALUE_S:
     case XML_TOK_DATA_NEWLINE:
@@ -5181,6 +5186,7 @@ storeEntityValue(XML_Parser parser,
       break;
     case XML_TOK_TRAILING_CR:
       next = entityTextPtr + enc->minBytesPerChar;
+      FALL_THROUGH;
       /* fall through */
     case XML_TOK_DATA_NEWLINE:
       if (pool->end == pool->ptr && !poolGrow(pool)) {