jpeglib-boolean.patch

   1 --- xbmc-12.3-Frodo/xbmc/guilib/JpegIO.cpp~     2013-12-12 22:47:49.000000000 +0100
   2 +++ xbmc-12.3-Frodo/xbmc/guilib/JpegIO.cpp      2014-01-03 18:43:06.138467273 +0100
   3 @@ -341,7 +341,7 @@
   4    else
   5    {
   6      jpeg_save_markers (&m_cinfo, JPEG_APP0 + 1, 0xFFFF);
   7 -    jpeg_read_header(&m_cinfo, true);
   8 +    jpeg_read_header(&m_cinfo, TRUE);
   9
  10      /*  libjpeg can scale the image for us if it is too big. It must be in the format
  11      num/denom, where (for our purposes) that is [1-8]/8 where 8/8 is the unscaled image.
  12 --- xbmc-12.3-Frodo/xbmc/guilib/JpegIO.h~       2014-01-03 11:07:38.000000000 +0100
  13 +++ xbmc-12.3-Frodo/xbmc/guilib/JpegIO.h        2014-01-03 11:08:16.622039556 +0100
  14 @@ -26,6 +26,8 @@
  15  #pragma comment(lib, "turbojpeg-static.lib")
  16  #endif
  17
  18 +#undef TRUE
  19 +#undef FALSE
  20  #include <jpeglib.h>
  21  #include "utils/StdString.h"
  22
  23 --- xbmc-12.3-Frodo/lib/cximage-6.0/CxImage/ximajpg.cpp~        2013-12-12 22:47:49.000000000 +0100
  24 +++ xbmc-12.3-Frodo/lib/cximage-6.0/CxImage/ximajpg.cpp 2014-01-03 11:52:50.862020197 +0100
  25 @@ -10,7 +10,7 @@
  26  #if CXIMAGE_SUPPORT_JPG
  27
  28  #ifdef _LINUX
  29 -#include <jmorecfg.h>
  30 +//#include <jmorecfg.h>
  31  #else
  32  #include "../jpeg/jmorecfg.h"
  33  #endif
  34 @@ -659,7 +659,7 @@
  35         if ((GetCodecOption(CXIMAGE_FORMAT_JPG) & ENCODE_SMOOTHING) != 0)
  36                 cinfo.smoothing_factor = m_nSmoothing;
  37
  38 -       jpeg_set_quality(&cinfo, GetJpegQuality(), (GetCodecOption(CXIMAGE_FORMAT_JPG) & ENCODE_BASELINE) != 0);
  39 +       jpeg_set_quality(&cinfo, GetJpegQuality(), (boolean)((GetCodecOption(CXIMAGE_FORMAT_JPG) & ENCODE_BASELINE) != 0));
  40
  41  //#ifdef C_PROGRESSIVE_SUPPORTED
  42         if ((GetCodecOption(CXIMAGE_FORMAT_JPG) & ENCODE_PROGRESSIVE) != 0)
  43 --- xbmc-12.3-Frodo/lib/cximage-6.0/CxImage/ximajpg.h~  2014-01-03 11:51:37.000000000 +0100
  44 +++ xbmc-12.3-Frodo/lib/cximage-6.0/CxImage/ximajpg.h   2014-01-03 18:05:40.095150198 +0100
  45 @@ -29,6 +29,8 @@
  46
  47  extern "C" {
  48  #ifdef _LINUX
  49 +#undef TRUE
  50 +#undef FALSE
  51   #include <jpeglib.h>
  52   #include <jerror.h>
  53  #else