commit 950654d9fa2face0fdfc207c335d3aea47af5f6e
Author: dsorber <david.sorber@gmail.com>
Date:   Thu May 25 18:05:59 2017 -0400

    Remaking a few changes that seem to have been missed in the merge (?).

diff --git a/software/photo_compress_archiver/packJPG/aricoder.cpp b/software/photo_compress_archiver/packJPG/aricoder.cpp
index dfc18bf..289951e 100644
--- a/software/photo_compress_archiver/packJPG/aricoder.cpp
+++ b/software/photo_compress_archiver/packJPG/aricoder.cpp
@@ -14,7 +14,7 @@ aricoder::aricoder( iostream* stream, StreamMode iomode ) : sptr(stream), mode(i
 {
 	if ( mode == StreamMode::kRead) { // mode is reading / decoding
 		// code buffer has to be filled before starting decoding
-		for (int i = 0; i < CODER_USE_BITS; i++ )
+		for (uint32_t i = 0; i < CODER_USE_BITS; i++ )
 			ccode = ( ccode << 1 ) | read_bit();
 	} // mode is writing / encoding otherwise
 }
@@ -453,7 +453,7 @@ int model_s::convert_symbol_to_int(uint32_t count, symbol *s)
 
 
 	// go through the totals table, search the symbol that matches the count
-	int c;
+	uint32_t c;
 	for (c = 1; c < totals.size(); c++) {
 		if (count >= totals[c]) {
 			break;
diff --git a/software/photo_compress_archiver/packJPG/bitops.cpp b/software/photo_compress_archiver/packJPG/bitops.cpp
index 01b9154..dbc7b04 100644
--- a/software/photo_compress_archiver/packJPG/bitops.cpp
+++ b/software/photo_compress_archiver/packJPG/bitops.cpp
@@ -8,7 +8,7 @@ reading and writing of arrays
 #include <algorithm>
 #include <array>
 #include <cstdio>
-#include <stdlib.h>
+#include <cstdlib>
 #include <vector>
 
 #if defined(_WIN32) || defined(WIN32)