[xiph-commits] r8005 - experimental/derf/theora-exp/lib

[tterribe at motherfish-iii.xiph.org]

Author: tterribe
Date: 2004-10-14 23:55:05 -0700 (Thu, 14 Oct 2004)
New Revision: 8005

Modified:
   experimental/derf/theora-exp/lib/decode.c
Log:
Commit minor indexing fixes in the out-of-loop post-processing code.
Not sure why these weren't committed before.


Modified: experimental/derf/theora-exp/lib/decode.c
===================================================================
--- experimental/derf/theora-exp/lib/decode.c	2004-10-15 02:34:38 UTC (rev 8004)
+++ experimental/derf/theora-exp/lib/decode.c	2004-10-15 06:55:05 UTC (rev 8005)
@@ -1516,7 +1516,7 @@
     dst+=_ystride;
     psrc=src;
     src=nsrc;
-    nsrc+=_ystride&-((by<7)|!(_b&8));
+    nsrc+=_ystride&-(!(_b&8)|by<7);
   }
 }
 
@@ -1551,7 +1551,7 @@
       int var;
       qi=frag->qi;
       var=*variance;
-      b=(x<=0)|(x+8>=iplane->width)<<1|(y<=0)<<2|(y+8>=iplane->height);
+      b=(x<=0)|(x+8>=iplane->width)<<1|(y<=0)<<2|(y+8>=iplane->height)<<3;
       if(strong&&var>sthresh){
         oc_dering_block(idata+x,iplane->ystride,b,
          _dec->pp_dc_scale[qi],_dec->pp_sharp_mod[qi],1);