From 35e3bd6011469f80baa797396457f995851b5abf Mon Sep 17 00:00:00 2001 From: RĂ¼diger Timm Date: Thu, 5 Jul 2007 07:54:06 +0000 Subject: INTEGRATION: CWS aquavcl01 (1.7.22); FILE MERGED 2007/06/21 09:00:07 pl 1.7.22.1: #i78704# add a new pixelformat, minor cosmetics --- basebmp/inc/basebmp/metafunctions.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'basebmp') diff --git a/basebmp/inc/basebmp/metafunctions.hxx b/basebmp/inc/basebmp/metafunctions.hxx index 8d64fc066543..5c94ff3b4327 100644 --- a/basebmp/inc/basebmp/metafunctions.hxx +++ b/basebmp/inc/basebmp/metafunctions.hxx @@ -4,9 +4,9 @@ * * $RCSfile: metafunctions.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: thb $ $Date: 2006-07-13 12:03:25 $ + * last change: $Author: rt $ $Date: 2007-07-05 08:54:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -183,7 +183,7 @@ struct ifBothScalarIntegral //-------------------------------------------------------------- /// Count number of trailing zeros -template< int val > struct numberOfTrailingZeros +template< unsigned int val > struct numberOfTrailingZeros { enum { next = val >> 1 }; enum { value = vigra::IfBool< (val & 1) == 0, @@ -199,7 +199,7 @@ template<> struct numberOfTrailingZeros<0> //-------------------------------------------------------------- /// Count number of one bits -template< int val > struct bitcount +template< unsigned int val > struct bitcount { enum { next = val >> 1 }; enum { value = bitcount::value + (val & 1) }; -- cgit