graphicprimitivehelper2d.cxx (49c58f9b) | graphicprimitivehelper2d.cxx (05639988) |
---|---|
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 --- 745 unchanged lines hidden (view full) --- 754 755 if(aMetaFileRealSize.getWidth() > aMetaFilePrefSize.getWidth() 756 || aMetaFileRealSize.getHeight() > aMetaFilePrefSize.getHeight()) 757 { 758 // clipping needed. Embed to MaskPrimitive2D. Create childs and mask polygon 759 basegfx::B2DPolygon aMaskPolygon(basegfx::tools::createUnitPolygon()); 760 aMaskPolygon.transform(rTransform); 761 | 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 --- 745 unchanged lines hidden (view full) --- 754 755 if(aMetaFileRealSize.getWidth() > aMetaFilePrefSize.getWidth() 756 || aMetaFileRealSize.getHeight() > aMetaFilePrefSize.getHeight()) 757 { 758 // clipping needed. Embed to MaskPrimitive2D. Create childs and mask polygon 759 basegfx::B2DPolygon aMaskPolygon(basegfx::tools::createUnitPolygon()); 760 aMaskPolygon.transform(rTransform); 761 |
762 aRetval[0] = new MaskPrimitive2D( | 762 // #124073# the clde below was compiler-dependent. Normally, 763 // a compiler will 764 // - alloc mem 765 // - ececute the constructor 766 // - do the assignment 767 // but the mac compiler does alloc-assign-constructor, thus 768 // modifying aRetval[0] befure aRetval gets used in the 769 // constructor. This creates an endless loop in the primitive 770 // stack. Thus do it the safe way. 771 // 772 // aRetval[0] = new MaskPrimitive2D( 773 // basegfx::B2DPolyPolygon(aMaskPolygon), 774 // aRetval); 775 MaskPrimitive2D* pMaskPrimitive2D = new MaskPrimitive2D( |
763 basegfx::B2DPolyPolygon(aMaskPolygon), 764 aRetval); | 776 basegfx::B2DPolyPolygon(aMaskPolygon), 777 aRetval); |
778 aRetval[0] = pMaskPrimitive2D; |
|
765 } 766#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE 767 } 768#endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE 769 770 break; 771 } 772 --- 147 unchanged lines hidden --- | 779 } 780#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE 781 } 782#endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE 783 784 break; 785 } 786 --- 147 unchanged lines hidden --- |