libvisual-plugins/repos/extra-x86_64/02_64-bit_JESS_fix.patch

   1 diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c
   2 --- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c       2006-02-06 05:47:26.000000000 +1100
   3 +++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c   2007-07-04 18:12:58.000000000 +1000
   4 @@ -282,7 +282,7 @@
   5
   6  void render_deformation(JessPrivate *priv, int defmode)
   7  {
   8 -       uint32_t bmax;
   9 +       intptr_t bmax;
  10         uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i;
  11         uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux;
  12
  13 @@ -294,7 +294,7 @@
  14                 tab2 = priv->table2;
  15                 tab3 = priv->table3;
  16                 tab4 = priv->table4;
  17 -               bmax = priv->resx * priv->resy + (uint32_t) priv->pixel;
  18 +               bmax = priv->resx * priv->resy + (intptr_t) priv->pixel;
  19
  20                 switch(defmode)
  21                 {
  22 @@ -352,7 +352,7 @@
  23                 }
  24                 for (i = 0; i < priv->resy * priv->resx; i++)
  25                 {
  26 -                       aux  =  (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer);
  27 +                       aux  =  (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer);
  28                         *(pix++) = *(aux++) ;
  29                         *(pix++) = *(aux++);
  30                         *(pix++) = *(aux);
  31 @@ -373,7 +373,8 @@
  32         /* j'ai mis pixel par defaut... */
  33
  34         uint8_t *pix = priv->pixel;
  35 -       uint32_t bmax,pitch_4;
  36 +       intptr_t bmax;
  37 +       uint32_t pitch_4;
  38
  39         pix = priv->pixel;
  40         if (priv->pixel == NULL)
  41 @@ -387,7 +388,7 @@
  42         if (priv->video == 8)
  43         {
  44                 if (visual_cpu_get_mmx ()) {
  45 -                       bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel;
  46 +                       bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel;
  47  #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
  48                         __asm __volatile
  49                                 ("\n\t pxor %%mm6, %%mm6"
  50 @@ -423,7 +424,7 @@
  51         else
  52         {
  53                 pitch_4 = priv->pitch+4;
  54 -               bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel;
  55 +               bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel;
  56
  57                 if (visual_cpu_get_mmx ()) {
  58  #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)