Skip to content

Commit

Permalink
Merge with packJPG v2.5k completed
Browse files Browse the repository at this point in the history
- Overlooked some packJPG message/comment updates
- Solves issue #33
  • Loading branch information
schnaader committed Apr 5, 2016
1 parent 2264a2c commit bb372df
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions contrib/packjpg/packjpg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -259,15 +259,14 @@ packJPG logo and icon are designed by Michael Kaufmann.
Contact
~~~~~~~
The official home of packJPG:
http://www.elektronik.htw-aalen.de/packjpg/
The official developer blog for packJPG:
http://packjpg.encode.ru/
For questions and bug reports:
packjpg (at) htw-aalen.de
packjpg (at) matthiasstirner.com
____________________________________
packJPG by Matthias Stirner, 01/2014
packJPG by Matthias Stirner, 01/2016
*/

#include <stdio.h>
Expand Down Expand Up @@ -693,15 +692,15 @@ INTERN unsigned char orig_set[ 8 ] = { 0 }; // store array for settings
----------------------------------------------- */

INTERN const unsigned char appversion = 25;
INTERN const char* subversion = "j";
INTERN const char* subversion = "k";
INTERN const char* apptitle = "packJPG";
INTERN const char* appname = "packjpg";
INTERN const char* versiondate = "01/15/2014";
INTERN const char* versiondate = "01/22/2016";
INTERN const char* author = "Matthias Stirner / Se";
#if !defined(BUILD_LIB)
INTERN const char* website = "http://www.elektronik.htw-aalen.de/packjpg/";
INTERN const char* copyright = "2006-2014 HTW Aalen University & Matthias Stirner";
INTERN const char* email = "packjpg (at) htw-aalen.de";
INTERN const char* website = "http://packjpg.encode.ru/";
INTERN const char* copyright = "2006-2016 HTW Aalen University & Matthias Stirner";
INTERN const char* email = "packjpg (at) matthiasstirner.com";
INTERN const char* pjg_ext = "pjg";
INTERN const char* jpg_ext = "jpg";
#endif
Expand Down

0 comments on commit bb372df

Please sign in to comment.