bitmapex.cxx (ba5b0517) bitmapex.cxx (37ab0f2d)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 429 unchanged lines hidden (view full) ---

438{
439 sal_Bool bRet = sal_False;
440
441 if( !!aBitmap )
442 {
443 bRet = aBitmap.Scale( rScaleX, rScaleY, nScaleFlag );
444
445 if( bRet && ( eTransparent == TRANSPARENT_BITMAP ) && !!aMask )
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 429 unchanged lines hidden (view full) ---

438{
439 sal_Bool bRet = sal_False;
440
441 if( !!aBitmap )
442 {
443 bRet = aBitmap.Scale( rScaleX, rScaleY, nScaleFlag );
444
445 if( bRet && ( eTransparent == TRANSPARENT_BITMAP ) && !!aMask )
446 aMask.Scale( rScaleX, rScaleY, BMP_SCALE_FAST );
446 {
447 aMask.Scale( rScaleX, rScaleY, nScaleFlag );
448 }
447
448 aBitmapSize = aBitmap.GetSizePixel();
449
450 DBG_ASSERT( !aMask || aBitmap.GetSizePixel() == aMask.GetSizePixel(),
451 "BitmapEx::Scale(): size mismatch for bitmap and alpha mask." );
452 }
453
454 return bRet;

--- 463 unchanged lines hidden --- 		449
450 aBitmapSize = aBitmap.GetSizePixel();
451
452 DBG_ASSERT( !aMask || aBitmap.GetSizePixel() == aMask.GetSizePixel(),
453 "BitmapEx::Scale(): size mismatch for bitmap and alpha mask." );
454 }
455
456 return bRet;

--- 463 unchanged lines hidden ---