[mapserver-commits] r12149 - trunk/mapserver/mapcache/src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:01:58 -0700 (Fri, 26 Aug 2011)
New Revision: 12149

Modified:
   trunk/mapserver/mapcache/src/image.c
Log:
rework build to not depend on apxs
thomas.bonfort | 2010-11-04 12:49:25 +0100 (Thu, 04 Nov 2010)

Modified: trunk/mapserver/mapcache/src/image.c
===================================================================
--- trunk/mapserver/mapcache/src/image.c	2011-08-26 11:01:54 UTC (rev 12148)
+++ trunk/mapserver/mapcache/src/image.c	2011-08-26 11:01:58 UTC (rev 12149)
@@ -46,9 +46,9 @@
                unsigned int og = optr[1];
                unsigned int ob = optr[2];
                unsigned int oa = optr[3];
-               bptr[0] = (unsigned char)(((or - br)*oa + (br << 8)) >> 8);
-               bptr[1] = (unsigned char)(((og - bg)*oa + (bg << 8)) >> 8);
-               bptr[2] = (unsigned char)(((ob - bb)*oa + (bb << 8)) >> 8);
+               bptr[0] += (unsigned char)(((or - br)*oa) >> 8);
+               bptr[1] += (unsigned char)(((og - bg)*oa) >> 8);
+               bptr[2] += (unsigned char)(((ob - bb)*oa) >> 8);
                bptr[3] = (ba==255)?255:(unsigned char)((oa + ba) - ((oa * ba + 255) >> 8));                        
             }
          }