Merge with packJPG v2.5k, packMP3 v1.0g

- Code already was up-to-date, except frealloc in packmp3.cpp
- Version numbers and messages updated
- Solves issue #33

README.md

@@ -52,8 +52,8 @@ Thanks for support, help and comments:
 
 Legal stuff
 -----------
-- packJPG v2.5j (https://github.com/packjpg/packJPG) by Matthias Stirner is used for compression/decompression of JPG files.
-- packMP3 v1.0f by Matthias Stirner (http://packjpg.encode.ru/?page_id=19) by Matthias Stirner is used for compression/decompression of MP3 files.
+- packJPG v2.5k (https://github.com/packjpg/packJPG) by Matthias Stirner is used for compression/decompression of JPG files.
+- packMP3 v1.0g by Matthias Stirner (http://packjpg.encode.ru/?page_id=19) by Matthias Stirner is used for compression/decompression of MP3 files.
 - bZip2 1.0.6 (http://www.bzip.org) by Julian Seward is used for compression/decompression of bZip2 streams.
 - zLib 1.2.8 (http://www.zlib.net) by Jean-loup Gailly and Mark Adler is used for compression/decompression of zLib streams.
 - GifLib 4.1.4 (http://sourceforge.net/projects/giflib) is used for compression/decompression of GIF files. The GIFLIB distribution is Copyright (c) 1997 Eric S. Raymond

contrib/packjpg/packjpg.cpp

@@ -1,5 +1,5 @@
 /*
-packJPG v2.5j (01/15/2014)
+packJPG v2.5k (01/22/2016)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 packJPG is a compression program specially designed for further
@@ -235,7 +235,11 @@ v2.5i (12/26/13) (public)
 v2.5j (01/15/14) (public)
  - various source code optimizations (using cppcheck)
 
+v2.5k (01/22/16) (public)
+ - Updated contact info
+ - fixed a minor bug
 
+ 
 Acknowledgements
 ~~~~~~~~~~~~~~~~
 

contrib/packmp3/packmp3.cpp

@@ -35,7 +35,7 @@
 
 // special realloc with guaranteed free() of previous memory
 static inline void* frealloc( void* ptr, size_t size ) {
-	void* n_ptr = realloc( ptr, size );
+	void* n_ptr = realloc( ptr, (size) ? size : 1 );
 	if ( n_ptr == NULL ) free( ptr );
 	return n_ptr;
 }
@@ -310,15 +310,15 @@ INTERN int  action     = A_COMPRESS;// what to do with MP3/PMP files
 	----------------------------------------------- */
 
 INTERN const unsigned char appversion = 10;
-INTERN const char*  subversion   = "f";
+INTERN const char*  subversion   = "g";
 INTERN const char*  apptitle     = "packMP3";
 INTERN const char*  appname      = "packMP3";
-INTERN const char*  versiondate  = "11/21/2014";
+INTERN const char*  versiondate  = "01/22/2016";
 INTERN const char*  author       = "Matthias Stirner";
 #if !defined( BUILD_LIB )
 INTERN const char*  website      = "http://packjpg.encode.ru/";
-INTERN const char*  email        = "packjpg@htw-aalen.de";
-INTERN const char*	copyright    = "2010-2014 Ratisbon University & Matthias Stirner";
+INTERN const char*  email        = "packjpg (at) matthiasstirner.com";
+INTERN const char*	copyright    = "2010-2016 Ratisbon University & Matthias Stirner";
 INTERN const char*  pmp_ext      = "pmp";
 INTERN const char*  mp3_ext      = "mp3";
 #endif

readme.txt

@@ -228,8 +228,8 @@ Thanks for support, help and comments:
 
 8. Legal stuff
 --------------
-packJPG v2.5j (https://github.com/packjpg/packJPG) by Matthias Stirner is used for compression/decompression of JPG files.
-packMP3 v1.0f by Matthias Stirner (http://packjpg.encode.ru/?page_id=19) by Matthias Stirner is used for compression/decompression of MP3 files.
+packJPG v2.5k (https://github.com/packjpg/packJPG) by Matthias Stirner is used for compression/decompression of JPG files.
+packMP3 v1.0g by Matthias Stirner (http://packjpg.encode.ru/?page_id=19) by Matthias Stirner is used for compression/decompression of MP3 files.
 bZip2 1.0.6 (http://www.bzip.org) by Julian Seward is used for compression/decompression of bZip2 streams.
 zLib 1.2.8 (http://www.zlib.net) by Jean-loup Gailly and Mark Adler is used for compression/decompression of zLib streams.
 GifLib 4.1.4 (http://sourceforge.net/projects/giflib) is used for compression/decompression of GIF files.