applied_patches/0780-slideshow-colorspace-fix.diff

   1 --- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx      2008-07-28 23:08:34.000000000 +0200
   2 +++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx      2008-07-28 23:31:16.000000000 +0200
   3 @@ -569,10 +569,10 @@
   4          static const OGLFormat lcl_RGB24[] =
   5          {
   6              // 24 bit RGB
   7 +            {3, GL_BGR, GL_UNSIGNED_BYTE},
   8              {3, GL_RGB, GL_UNSIGNED_BYTE},
   9 -//            {3, GL_BGR, GL_UNSIGNED_BYTE},
  10 -            {3, GL_RGB, GL_UNSIGNED_BYTE},
  11 - //           {3, GL_BGR, GL_UNSIGNED_BYTE}
  12 +            {3, GL_BGR, GL_UNSIGNED_BYTE},
  13 +            {3, GL_RGB, GL_UNSIGNED_BYTE}
  14          };
  15
  16  #if defined(GL_VERSION_1_2) && defined(GLU_VERSION_1_3)
  17 @@ -580,37 +580,37 @@
  18          static const OGLFormat lcl_RGB16[] =
  19          {
  20              // 16 bit RGB
  21 -            {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
  22              {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV},
  23              {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5},
  24 -            {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV}
  25 +            {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV},
  26 +            {3, GL_RGB, GL_UNSIGNED_SHORT_5_6_5}
  27          };
  28
  29          static const OGLFormat lcl_ARGB16_4[] =
  30          {
  31              // 16 bit ARGB
  32 -            {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4},
  33 -//            {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4},
  34 - //           {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV},
  35 -            {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV}
  36 +            {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV},
  37 +            {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV},
  38 +            {4, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4},
  39 +            {4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4}
  40          };
  41
  42          static const OGLFormat lcl_ARGB16_5[] =
  43          {
  44              // 16 bit ARGB
  45 -            {4, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1},
  46 - //           {4, GL_BGRA, GL_UNSIGNED_SHORT_5_5_5_1},
  47 -  //          {4, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV},
  48 -            {4, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV}
  49 +            {4, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV},
  50 +            {4, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV},
  51 +            {4, GL_BGRA, GL_UNSIGNED_SHORT_5_5_5_1},
  52 +            {4, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1}
  53          };
  54
  55          static const OGLFormat lcl_ARGB32[] =
  56          {
  57              // 32 bit ARGB
  58 -            {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8},
  59 -//            {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8},
  60 -  //          {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV},
  61 -            {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV}
  62 +            {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV},
  63 +            {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV},
  64 +            {4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8},
  65 +            {4, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8}
  66          };
  67
  68          const uno::Sequence<sal_Int8> aComponentTags(