Imported Upstream version 2.0.4 into tizen

Change-Id: I41e1133b9528230fec8fcab09527e822ff6a233e

diff --cc CMakeLists.txt
Simple merge

diff --cc jdmerge.c
Simple merge

diff --cc md5/md5hl.c
Simple merge

diff --cc simd/arm/jsimd.c
Simple merge

diff --cc tjbench.c
index 46e0e9d,13a5bde..5688bfc
--- 1/tjbench.c
--- 2/tjbench.c
+++ b/tjbench.c
@@@ -41,16 -42,7 +42,16 @@@
    printf("ERROR in line %d while %s:\n%s\n", __LINE__, op, err); \
    retval = -1;  goto bailout; \
  }
- #define _throwunix(m) { \
 +
 +#if _USE_PRODUCT_TV
- #define _throwunix(m)  _throw(m, strerror(errno))
++#define THROW_UNIX(m) { \
 +      char err_str[256]; \
 +      strerror_r(errno, err_str, 256); \
 +      _throw(m, err_str) \
 +}
 +#else
+ #define THROW_UNIX(m)  THROW(m, strerror(errno))
 +#endif
  
  char tjErrorStr[JMSG_LENGTH_MAX] = "\0", tjErrorMsg[JMSG_LENGTH_MAX] = "\0";
  int tjErrorLine = -1, tjErrorCode = -1;

diff --cc tjunittest.c
index c543196,da7c6ff..4e1eb61
--- 1/tjunittest.c
--- 2/tjunittest.c
+++ b/tjunittest.c
@@@ -347,14 -348,8 +348,14 @@@ static void writeJPEG(unsigned char *jp
    FILE *file = fopen(filename, "wb");
  
    if (!file || fwrite(jpegBuf, jpegSize, 1, file) != 1) {
 +#if _USE_PRODUCT_TV
 +    char err_str[256];
 +    strerror_r(errno, err_str, 256);
 +    printf("ERROR: Could not write to %s.\n%s\n", filename, err_str);
 +#else
      printf("ERROR: Could not write to %s.\n%s\n", filename, strerror(errno));
-     bailout()
 +#endif
+     BAILOUT()
    }
  
  bailout: